1
0
mirror of https://github.com/MariaDB/server.git synced 2025-06-12 01:53:02 +03:00

merge 5.1 => 5.5

This commit is contained in:
Tor Didriksen
2012-11-01 17:33:55 +01:00
2 changed files with 2 additions and 1 deletions

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)
{
set_stmt_error(stmt, CR_NO_DATA, unknown_sqlstate, NULL);
return 1;
DBUG_RETURN(1);
}
if (column >= stmt->field_count)
{