diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-09-28 10:09:57 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-09-28 10:09:57 -0400 |
| commit | ec5553872881fd8f4185d38d87749e78baea2c95 (patch) | |
| tree | e5c1299c00e68e2e94b5b09c04f004c8cb389c4b /include | |
| parent | d165736b8d091dcb173cd80b357197845f41cbf0 (diff) | |
| parent | c316933e602dbd8144e13254bc517f4e108032c3 (diff) | |
| download | mariadb-git-ec5553872881fd8f4185d38d87749e78baea2c95.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
include/mysql_com.h:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.h:
Auto merged
mysql-test/r/ctype_utf8.result:
Manual merge.
mysql-test/t/ctype_utf8.test:
Manual merge.
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql_com.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index e58d41fad1c..1bbb3cf1737 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -26,9 +26,6 @@ #define USERNAME_LENGTH 16 #define SERVER_VERSION_LENGTH 60 #define SQLSTATE_LENGTH 5 -#define SYSTEM_CHARSET_MBMAXLEN 3 -#define NAME_BYTE_LEN NAME_LEN*SYSTEM_CHARSET_MBMAXLEN -#define USERNAME_BYTE_LENGTH USERNAME_LENGTH*SYSTEM_CHARSET_MBMAXLEN /* USER_HOST_BUFF_SIZE -- length of string buffer, that is enough to contain @@ -36,7 +33,7 @@ MySQL standard format: user_name_part@host_name_part\0 */ -#define USER_HOST_BUFF_SIZE HOSTNAME_LENGTH + USERNAME_BYTE_LENGTH + 2 +#define USER_HOST_BUFF_SIZE HOSTNAME_LENGTH + USERNAME_LENGTH + 2 #define LOCAL_HOST "localhost" #define LOCAL_HOST_NAMEDPIPE "." |