diff options
| author | tsmith@maint2.mysql.com <> | 2006-09-13 09:03:52 +0200 |
|---|---|---|
| committer | tsmith@maint2.mysql.com <> | 2006-09-13 09:03:52 +0200 |
| commit | 6a31ec2cadb56ca70acffc30a706fbcae614181f (patch) | |
| tree | f08cbab5b66362c84b62621037950058412d7f9b /include/mysql_com.h | |
| parent | a1c4a48b7e2bc72526019b78c31291c1072565c3 (diff) | |
| parent | e38f04a09f3c5fbc261273cb50bbf06434830fa3 (diff) | |
| download | mariadb-git-6a31ec2cadb56ca70acffc30a706fbcae614181f.tar.gz | |
Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50
into maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/51
Diffstat (limited to 'include/mysql_com.h')
| -rw-r--r-- | include/mysql_com.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index f1c48112467..d0bf1b1fec0 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -26,6 +26,9 @@ #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 @@ -33,7 +36,7 @@ MySQL standard format: user_name_part@host_name_part\0 */ -#define USER_HOST_BUFF_SIZE HOSTNAME_LENGTH + USERNAME_LENGTH + 2 +#define USER_HOST_BUFF_SIZE HOSTNAME_LENGTH + USERNAME_BYTE_LENGTH + 2 #define LOCAL_HOST "localhost" #define LOCAL_HOST_NAMEDPIPE "." |