diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-01-02 17:55:18 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-01-02 17:55:18 +0400 |
| commit | 3c9be16912052a9360d6f990920e5e930107f452 (patch) | |
| tree | d1e6d9c62cddd176ded9de7a1408c3607df2df0c /libmysqld | |
| parent | cbff25d04ae0d72c2a42d78aea33764d0818808e (diff) | |
| parent | 1c48d72376245094d7a49eb647111a0658c9b37d (diff) | |
| download | mariadb-git-3c9be16912052a9360d6f990920e5e930107f452.tar.gz | |
Merge mysql.com:/d2/hf/common/my50-common
into mysql.com:/d2/hf/common/my51-common
libmysqld/lib_sql.cc:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
Diffstat (limited to 'libmysqld')
| -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 b339cb5521b..da7a490d686 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, |