mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-21 15:55:53 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge mysql.com:/d2/hf/common/my50-common

Browse source 
into  mysql.com:/d2/hf/common/my51-common


libmysqld/lib_sql.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
This commit is contained in:
unknown 2007-01-02 17:55:18 +04:00
commit 3c9be16912
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libmysqld/lib_sql.cc
View file

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