Merge mysql.com:/d2/hf/common/my41-common

into mysql.com:/d2/hf/common/my50-common

Merge mysql.com:/d2/hf/common/my41-common
into mysql.com:/d2/hf/common/my50-common
429b82be · holyfoot/hf@mysql.com/hfmain.(none) · 726a51bc · 56155d83 · 429b82be
Commit 429b82be authored Jan 02, 2007 by holyfoot/hf@mysql.com/hfmain.(none)
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

libmysqld/lib_sql.cc libmysqld/lib_sql.cc +4 -0

No files found.
--- 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,