summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <holyfoot/hf@mysql.com/hfmain.(none)>2007-01-02 17:53:55 +0400
committerunknown <holyfoot/hf@mysql.com/hfmain.(none)>2007-01-02 17:53:55 +0400
commitc79aeba1bd66c03b70ade63d5e1879d5ae552676 (patch)
tree0a9f58ee48a7b56ebbf3ef654a485ea1b779678c
parent8b8f1890fbb931eb7592b736d369cb242a8ac43c (diff)
downloadmariadb-git-c79aeba1bd66c03b70ade63d5e1879d5ae552676.tar.gz
merging fix
-rw-r--r--libmysqld/lib_sql.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 825e5e507ad..f5e88190cac 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -250,8 +250,6 @@ int emb_read_binary_rows(MYSQL_STMT *stmt)
MYSQL_DATA *data;
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,
stmt->mysql->net.last_errno, stmt->mysql->net.sqlstate);
return 1;