Commit be29dd43 authored by unknown's avatar unknown
Browse files

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


include/mysql_com.h:
  Auto merged
parents 3ee0ef40 9c955438

include/mysql_com.h

+4 −4
Original line number Diff line number Diff line
@@ -141,11 +141,11 @@ 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 (((ulong) 1) << 16)   /* Enable/disable multi-stmt support */

#define CLIENT_MULTI_RESULTS    (((ulong) 1) << 17)  /* Enable/disable multi-results */

#define CLIENT_MULTI_STATEMENTS (1UL << 16) /* Enable/disable multi-stmt support */

#define CLIENT_MULTI_RESULTS    (1UL << 17) /* Enable/disable multi-results */



#define CLIENT_SSL_VERIFY_SERVER_CERT	(((ulong) 1) << 30)

#define CLIENT_REMEMBER_OPTIONS	(((ulong) 1) << 31)

#define CLIENT_SSL_VERIFY_SERVER_CERT (1UL << 30)

#define CLIENT_REMEMBER_OPTIONS (1UL << 31)



#define SERVER_STATUS_IN_TRANS     1	/* Transaction has started */

#define SERVER_STATUS_AUTOCOMMIT   2	/* Server in auto_commit mode */