diff options
author | Sergei Golubchik <sergii@pisem.net> | 2012-05-17 12:12:33 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2012-05-17 12:12:33 +0200 |
commit | 0a8c9b98f60bb1a21c7e67a1bb47166f0acfeddb (patch) | |
tree | 7e682617fcbdab399d2eafccb6a4800dfdc71e51 /libmysqld | |
parent | 97ae1682f185be05276b172919e47fd86e9fd953 (diff) | |
parent | df905524b218de07dddf5fa394af96edcc4ca483 (diff) | |
download | mariadb-git-0a8c9b98f60bb1a21c7e67a1bb47166f0acfeddb.tar.gz |
merge with mysql-5.1.63
Diffstat (limited to 'libmysqld')
-rw-r--r-- | libmysqld/lib_sql.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 83a984763e5..fda059a37f0 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -344,6 +344,8 @@ static int emb_stmt_execute(MYSQL_STMT *stmt) set_stmt_errmsg(stmt, net); DBUG_RETURN(1); } + else if (stmt->mysql->status == MYSQL_STATUS_GET_RESULT) + stmt->mysql->status= MYSQL_STATUS_STATEMENT_GET_RESULT; DBUG_RETURN(0); } |