diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-09-28 07:26:45 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-09-28 07:26:45 -0400 |
| commit | be29dd430e35e12b86cf0a44d62d9ca32387e955 (patch) | |
| tree | d05f8f5ef3d9fb6d5d6756795e97ef88c7d8855f /include/mysql_com.h | |
| parent | 3ee0ef4089b933fa8674b04e1fbd0cf8200d43ed (diff) | |
| parent | 9c95543828d235776141da75be5c5d734dcfb6a3 (diff) | |
| download | mariadb-git-be29dd430e35e12b86cf0a44d62d9ca32387e955.tar.gz | |
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
Diffstat (limited to 'include/mysql_com.h')
| -rw-r--r-- | include/mysql_com.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index d0bf1b1fec0..0010565a405 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -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 */ |