diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-01-02 17:54:38 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-01-02 17:54:38 +0400 |
| commit | 82e5a81fd2da31c69c6be5d5fcde5ac314aa2756 (patch) | |
| tree | 2a1b24767038bd76d2c4192f0a14c483050698ac | |
| parent | 13248688ed6fd0d8da2958ffb8dc90d68d4ebc59 (diff) | |
| parent | 0da2a28bdce53961098c422be86d735972eca31f (diff) | |
| download | mariadb-git-82e5a81fd2da31c69c6be5d5fcde5ac314aa2756.tar.gz | |
Merge mysql.com:/d2/hf/common/my41-common
into mysql.com:/d2/hf/common/my50-common
libmysqld/lib_sql.cc:
merging
| -rw-r--r-- | libmysqld/lib_sql.cc | 4 |
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, |