mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
merging fix
This commit is contained in:
@ -250,8 +250,6 @@ 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)))
|
||||||
{
|
{
|
||||||
stmt->result= *data;
|
|
||||||
my_free((char *) data, MYF(0));
|
|
||||||
set_stmt_errmsg(stmt, stmt->mysql->net.last_error,
|
set_stmt_errmsg(stmt, stmt->mysql->net.last_error,
|
||||||
stmt->mysql->net.last_errno, stmt->mysql->net.sqlstate);
|
stmt->mysql->net.last_errno, stmt->mysql->net.sqlstate);
|
||||||
return 1;
|
return 1;
|
||||||
|
Reference in New Issue
Block a user