diff options
| author | Dmitry Shulga <Dmitry.Shulga@Sun.COM> | 2010-09-07 14:49:47 +0700 |
|---|---|---|
| committer | Dmitry Shulga <Dmitry.Shulga@Sun.COM> | 2010-09-07 14:49:47 +0700 |
| commit | 000c50afe6c2918d48384b691fbab1d865fee77a (patch) | |
| tree | 13e2fa2dab8126ba7103855f85741127f7059707 /include | |
| parent | 88f91315c4611efddb2e5f4fbade3d571347e369 (diff) | |
| parent | d2d4fdb23f6b38ff6718a35120043627582ee836 (diff) | |
| download | mariadb-git-000c50afe6c2918d48384b691fbab1d865fee77a.tar.gz | |
Auto-merge from mysql-5.1-bugteam.
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql.h | 3 | ||||
| -rw-r--r-- | include/mysql.h.pp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/mysql.h b/include/mysql.h index dc6e4eb19a6..fdb29124d68 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -208,7 +208,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 531062aee80..c7bc5c294ce 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -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 { |