summaryrefslogtreecommitdiff
path: root/include/mysql_com.h
diff options
context:
space:
mode:
authoriggy@rolltop.ignatz42.dyndns.org <>2006-08-28 20:41:22 -0400
committeriggy@rolltop.ignatz42.dyndns.org <>2006-08-28 20:41:22 -0400
commit76bf7c81ae04b435d542c6f29335e786c730bbde (patch)
tree9323c1a51b2c0bf1c2b571c5097463914e9b8290 /include/mysql_com.h
parentd847e46c1a0436c5a17346e92be514e313803926 (diff)
parentbfe86ca4484fc0c9cabfc34d3ff027f3487e8d4a (diff)
downloadmariadb-git-76bf7c81ae04b435d542c6f29335e786c730bbde.tar.gz
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_21527
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-new-maint_21527
Diffstat (limited to 'include/mysql_com.h')
-rw-r--r--include/mysql_com.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h
index 196930fcb3f..b7c58337fc3 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -138,8 +138,10 @@ enum enum_server_command
#define CLIENT_TRANSACTIONS 8192 /* Client knows about transactions */
#define CLIENT_RESERVED 16384 /* Old flag for 4.1 protocol */
#define CLIENT_SECURE_CONNECTION 32768 /* New 4.1 authentication */
-#define CLIENT_MULTI_STATEMENTS 65536 /* Enable/disable multi-stmt support */
-#define CLIENT_MULTI_RESULTS 131072 /* Enable/disable multi-results */
+#define CLIENT_MULTI_STATEMENTS (((ulong) 1) << 16) /* Enable/disable multi-stmt support */
+#define CLIENT_MULTI_RESULTS (((ulong) 1) << 17) /* Enable/disable multi-results */
+
+#define CLIENT_SSL_VERIFY_SERVER_CERT (((ulong) 1) << 30)
#define CLIENT_REMEMBER_OPTIONS (((ulong) 1) << 31)
#define SERVER_STATUS_IN_TRANS 1 /* Transaction has started */