Skip to content

M
MariaDB
Commit 429b82be authored by holyfoot/hf@mysql.com/hfmain.(none)'s avatar holyfoot/hf@mysql.com/hfmain.(none)
Browse files
Options

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

into  mysql.com:/d2/hf/common/my50-common
parents 726a51bc 56155d83
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
libmysqld/lib_sql.cc
View file @ 429b82be
...@@ -306,7 +306,11 @@ int emb_read_binary_rows(MYSQL_STMT *stmt) ...@@ -306,7 +306,11 @@ 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)))
{
set_stmt_errmsg(stmt, stmt->mysql->net.last_error,
stmt->mysql->net.last_errno, stmt->mysql->net.sqlstate);
return 1; return 1;
}
stmt->result= *data; stmt->result= *data;
my_free((char *) data, MYF(0)); my_free((char *) data, MYF(0));
set_stmt_errmsg(stmt, stmt->mysql->net.last_error, set_stmt_errmsg(stmt, stmt->mysql->net.last_error,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7