diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-09-28 10:15:32 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-09-28 10:15:32 -0400 |
| commit | 98715089c1944791d4d1b7d7cdd18eac302925e3 (patch) | |
| tree | 367dcd20ddf83120466fad39d53096cf09d07694 /include/mysql_com.h | |
| parent | 2d48a1f2a3c3539a977839b94a9d3fe703666753 (diff) | |
| parent | 96bc9f80794b305f6f7636213187472eb81a9045 (diff) | |
| download | mariadb-git-98715089c1944791d4d1b7d7cdd18eac302925e3.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
include/mysql_com.h:
Auto merged
mysql-test/include/have_ndb.inc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/share/errmsg.txt:
Auto merged
support-files/mysql.spec.sh:
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 af3b8535ee2..c646fc9d610 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 */ |