mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merging fix

Browse source
This commit is contained in:
holyfoot/hf@mysql.com/hfmain.(none) 2007-01-02 17:51:32 +04:00
parent 998167acce
commit 56155d83e7
1 changed files with 4 additions and 4 deletions
Show stats 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;
if (!(data= emb_read_rows(stmt->mysql, 0, 0)))
{
strmake(stmt->sqlstate, stmt->mysql->net.sqlstate, sizeof(stmt->sqlstate));
strmake(stmt->last_error, stmt->mysql->net.last_error,
sizeof(stmt->last_error));
stmt->last_errno= stmt->mysql->net.last_errno;
stmt->result= *data;
my_free((char *) data, MYF(0));
set_stmt_errmsg(stmt, stmt->mysql->net.last_error,
stmt->mysql->net.last_errno, stmt->mysql->net.sqlstate);
return 1;
}
return 0;