1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge 5.1 => 5.5

Browse Source
This commit is contained in:
Tor Didriksen 2012-11-01 17:33:55 +01:00
commit 0b034dd21f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmysql/libmysql.c
View File

@ -4218,7 +4218,7 @@ int STDCALL mysql_stmt_fetch_column(MYSQL_STMT *stmt, MYSQL_BIND *my_bind,
if ((int) stmt->state < (int) MYSQL_STMT_FETCH_DONE) if ((int) stmt->state < (int) MYSQL_STMT_FETCH_DONE)
{ {
set_stmt_error(stmt, CR_NO_DATA, unknown_sqlstate, NULL); set_stmt_error(stmt, CR_NO_DATA, unknown_sqlstate, NULL);
return 1; DBUG_RETURN(1);
} }
if (column >= stmt->field_count) if (column >= stmt->field_count)
{ {

1
tests/mysql_client_test.c
View File

@ -15887,6 +15887,7 @@ static void test_bug27876()
rc= mysql_query(mysql, "set names default"); rc= mysql_query(mysql, "set names default");
myquery(rc); myquery(rc);
DBUG_VOID_RETURN;
} }