diff options
| author | hf@deer.mysql.r18.ru <> | 2003-01-20 18:59:45 +0400 |
|---|---|---|
| committer | hf@deer.mysql.r18.ru <> | 2003-01-20 18:59:45 +0400 |
| commit | 389680e04e059cf78d3d7c929cb35c20064381fa (patch) | |
| tree | 26bff9a8e2da794ce9796009e2fbd0d050252445 /include/mysql_com.h | |
| parent | 1f6b6156773ae42f45cb2552cecbf52ef6964e23 (diff) | |
| parent | d14db3961d7f6839dd211ed3c136ddd8c709778c (diff) | |
| download | mariadb-git-389680e04e059cf78d3d7c929cb35c20064381fa.tar.gz | |
Conflicts resolving
Diffstat (limited to 'include/mysql_com.h')
| -rw-r--r-- | include/mysql_com.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index 64cf31d59b4..2e8c3f265b8 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -106,10 +106,12 @@ enum enum_server_command #define CLIENT_TRANSACTIONS 8192 /* Client knows about transactions */ #define CLIENT_PROTOCOL_41 16384 /* New 4.1 protocol */ #define CLIENT_SECURE_CONNECTION 32768 /* New 4.1 authentication */ +#define CLIENT_MULTI_QUERIES 65536 /* Enable/disable multi query support */ #define SERVER_STATUS_IN_TRANS 1 /* Transaction has started */ #define SERVER_STATUS_AUTOCOMMIT 2 /* Server in auto_commit mode */ #define SERVER_STATUS_MORE_RESULTS 4 /* More results on server */ +#define SERVER_MORE_RESULTS_EXISTS 8 /* Multi query - next query exists */ #define MYSQL_ERRMSG_SIZE 200 #define NET_READ_TIMEOUT 30 /* Timeout on read */ |