summaryrefslogtreecommitdiff
path: root/libmysqld/lib_sql.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-05-20 14:57:29 +0200
committerSergei Golubchik <sergii@pisem.net>2012-05-20 14:57:29 +0200
commit7f6f53a8df10c76f93848c8d06bc5af71051c525 (patch)
tree9a539823cdf05f53574fdf91941b3a242025acba /libmysqld/lib_sql.cc
parent0e7e724d6b36b2f5b8a0604171adb750d7c82c9c (diff)
parent280fcf08085e43b5359ec79c0e34166e51b3ebd8 (diff)
downloadmariadb-git-7f6f53a8df10c76f93848c8d06bc5af71051c525.tar.gz
5.2 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);
}