summaryrefslogtreecommitdiff
path: root/libmysqld/lib_sql.cc
diff options
context:
space:
mode:
authorunknown <holyfoot/hf@mysql.com/hfmain.(none)>2007-01-02 17:54:38 +0400
committerunknown <holyfoot/hf@mysql.com/hfmain.(none)>2007-01-02 17:54:38 +0400
commit1c48d72376245094d7a49eb647111a0658c9b37d (patch)
tree2a1b24767038bd76d2c4192f0a14c483050698ac /libmysqld/lib_sql.cc
parent6de3acece297e93c05281395232522fe8a60257b (diff)
parent8b8f1890fbb931eb7592b736d369cb242a8ac43c (diff)
downloadmariadb-git-1c48d72376245094d7a49eb647111a0658c9b37d.tar.gz
Merge mysql.com:/d2/hf/common/my41-common
into mysql.com:/d2/hf/common/my50-common libmysqld/lib_sql.cc: merging
Diffstat (limited to 'libmysqld/lib_sql.cc')
-rw-r--r--libmysqld/lib_sql.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 1006ee61923..6be3b92c8f8 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -306,7 +306,11 @@ int emb_read_binary_rows(MYSQL_STMT *stmt)
{
MYSQL_DATA *data;
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;
+ }
stmt->result= *data;
my_free((char *) data, MYF(0));
set_stmt_errmsg(stmt, stmt->mysql->net.last_error,