diff options
author | holyfoot/hf@mysql.com/hfmain.(none) <> | 2007-01-02 17:53:55 +0400 |
---|---|---|
committer | holyfoot/hf@mysql.com/hfmain.(none) <> | 2007-01-02 17:53:55 +0400 |
commit | e7130631cbc7ab68cac3429dfa1680849b29dc7b (patch) | |
tree | 0a9f58ee48a7b56ebbf3ef654a485ea1b779678c /libmysqld | |
parent | 56155d83e7c6d917fcf3cb2bb8c1b7c4cf40b1b2 (diff) | |
download | mariadb-git-e7130631cbc7ab68cac3429dfa1680849b29dc7b.tar.gz |
merging fix
Diffstat (limited to 'libmysqld')
-rw-r--r-- | libmysqld/lib_sql.cc | 2 |
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; |