database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merging fix

Browse Source
This commit is contained in:
unknown
2007-01-02 17:51:32 +04:00
parent 4a12418583
commit 8b8f1890fb
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libmysqld/lib_sql.cc
View File

@ -250,10 +250,10 @@ int emb_read_binary_rows(MYSQL_STMT *stmt)
MYSQL_DATA *data; MYSQL_DATA *data;
if (!(data= emb_read_rows(stmt->mysql, 0, 0))) if (!(data= emb_read_rows(stmt->mysql, 0, 0)))
{ {
strmake(stmt->sqlstate, stmt->mysql->net.sqlstate, sizeof(stmt->sqlstate)); stmt->result= *data;
strmake(stmt->last_error, stmt->mysql->net.last_error, my_free((char *) data, MYF(0));
sizeof(stmt->last_error)); set_stmt_errmsg(stmt, stmt->mysql->net.last_error,
stmt->last_errno= stmt->mysql->net.last_errno; stmt->mysql->net.last_errno, stmt->mysql->net.sqlstate);
return 1; return 1;
} }
return 0; return 0;