summaryrefslogtreecommitdiff
path: root/include/mysql_com.h
diff options
context:
space:
mode:
authorgluh@gluh.(none) <>2006-09-28 14:09:31 +0500
committergluh@gluh.(none) <>2006-09-28 14:09:31 +0500
commitb7e59b7085b3d782c06fb1a5cf8b1f639699c33d (patch)
tree73252a3a983ef93143ce19885f926adef37d149d /include/mysql_com.h
parent5e2f69d1ddda97c2de3d4c9cb52282e81cb518c1 (diff)
parent4aaf7e34ff45f084234b007b68fb4e0f892ca625 (diff)
downloadmariadb-git-b7e59b7085b3d782c06fb1a5cf8b1f639699c33d.tar.gz
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
into mysql.com:/home/gluh/MySQL/Merge/5.1
Diffstat (limited to 'include/mysql_com.h')
-rw-r--r--include/mysql_com.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h
index af3b8535ee2..a290feb9686 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 "."