summaryrefslogtreecommitdiff
path: root/include/mysql.h
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2010-10-06 11:58:31 +0300
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2010-10-06 11:58:31 +0300
commit6f9839d9658a8716bc2c994bfa6515e0adf170bf (patch)
tree49d1176a81db477cda5ba7ee683ffb2538da0c2e /include/mysql.h
parentbd09e49843b83bb96bd64b20ce049f940ca4cc68 (diff)
parent19a7cf49cc259765cad56c2d82b1db01d49370d7 (diff)
downloadmariadb-git-6f9839d9658a8716bc2c994bfa6515e0adf170bf.tar.gz
merge of 5.1-bugteam into 5.1-security
Diffstat (limited to 'include/mysql.h')
-rw-r--r--include/mysql.h3
1 files changed, 2 insertions, 1 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