summaryrefslogtreecommitdiff
path: root/libmysqld/lib_sql.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-05-18 14:23:05 +0200
committerSergei Golubchik <sergii@pisem.net>2012-05-18 14:23:05 +0200
commit280fcf08085e43b5359ec79c0e34166e51b3ebd8 (patch)
tree0180226f5648752d1d5bc2b7dd23e7cecf3253b1 /libmysqld/lib_sql.cc
parent5a47413934a0ba0aeb91224f1010bb70bd9b1e8a (diff)
parent57f824b0990b0a8708665a4a9ede245ce6064539 (diff)
downloadmariadb-git-280fcf08085e43b5359ec79c0e34166e51b3ebd8.tar.gz
5.1 merge
Diffstat (limited to 'libmysqld/lib_sql.cc')
-rw-r--r--libmysqld/lib_sql.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 226d49b5154..59f3aff9609 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -343,6 +343,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);
}