Auto-merge from mysql-5.1-bugteam.

This commit is contained in:
Dmitry Shulga 2010-09-07 14:49:47 +07:00
commit 000c50afe6
4 changed files with 110 additions and 4 deletions

View file

@ -297,7 +297,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
{