From 0da2a28bdce53961098c422be86d735972eca31f Mon Sep 17 00:00:00 2001 From: unknown <holyfoot/hf@mysql.com/hfmain.(none)> Date: Tue, 2 Jan 2007 17:51:32 +0400 Subject: [PATCH] merging fix --- libmysqld/lib_sql.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index a6e81cee78c..825e5e507ad 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -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; -- 2.30.9