summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDmitry Shulga <Dmitry.Shulga@Sun.COM>2010-09-07 14:18:01 +0700
committerDmitry Shulga <Dmitry.Shulga@Sun.COM>2010-09-07 14:18:01 +0700
commit14dbc7e4e6e18c44dff136313dd85f94f8ae0118 (patch)
treedc3f19abb33beae12725faec85458b8ee8cfe28b /include
parent24fc7ca4c8899c71a4a6572987d7567e17eefcec (diff)
downloadmariadb-git-14dbc7e4e6e18c44dff136313dd85f94f8ae0118.tar.gz
Fixed bug #47485 - mysql_store_result returns a not NULL result set
for a prepared statement.
Diffstat (limited to 'include')
-rw-r--r--include/mysql.h3
-rw-r--r--include/mysql.h.pp3
2 files changed, 4 insertions, 2 deletions
diff --git a/include/mysql.h b/include/mysql.h
index dcf3e167e6a..699bd1f1b7f 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -224,7 +224,8 @@ struct st_mysql_options {
enum mysql_status
{
- MYSQL_STATUS_READY,MYSQL_STATUS_GET_RESULT,MYSQL_STATUS_USE_RESULT
+ MYSQL_STATUS_READY, MYSQL_STATUS_GET_RESULT, MYSQL_STATUS_USE_RESULT,
+ MYSQL_STATUS_STATEMENT_GET_RESULT
};
enum mysql_protocol_type
diff --git a/include/mysql.h.pp b/include/mysql.h.pp
index 0a397863022..ceb4b2d591c 100644
--- a/include/mysql.h.pp
+++ b/include/mysql.h.pp
@@ -293,7 +293,8 @@ struct st_mysql_options {
};
enum mysql_status
{
- MYSQL_STATUS_READY,MYSQL_STATUS_GET_RESULT,MYSQL_STATUS_USE_RESULT
+ MYSQL_STATUS_READY, MYSQL_STATUS_GET_RESULT, MYSQL_STATUS_USE_RESULT,
+ MYSQL_STATUS_STATEMENT_GET_RESULT
};
enum mysql_protocol_type
{