summaryrefslogtreecommitdiff
path: root/include/mysql_com.h
diff options
context:
space:
mode:
authorgluh@mysql.com/eagle.(none) <>2007-04-03 16:13:27 +0500
committergluh@mysql.com/eagle.(none) <>2007-04-03 16:13:27 +0500
commit2d47f0cb1b235f65fc0df2ee88306238aa592d01 (patch)
tree43cf3af5e63ac68035fb4a0461b4e0e7da5d00bb /include/mysql_com.h
parent89dec159d13344c81ee0c2f2455d0cd12004fa0f (diff)
downloadmariadb-git-2d47f0cb1b235f65fc0df2ee88306238aa592d01.tar.gz
Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
Diffstat (limited to 'include/mysql_com.h')
-rw-r--r--include/mysql_com.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h
index e2ab9601f5f..2223dbad6ab 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -20,9 +20,13 @@
#ifndef _mysql_com_h
#define _mysql_com_h
-#define NAME_LEN 64 /* Field/table name length */
#define HOSTNAME_LENGTH 60
-#define USERNAME_LENGTH 16
+#define SYSTEM_CHARSET_MBMAXLEN 3
+#define NAME_CHAR_LEN 64 /* Field/table name length */
+#define USERNAME_CHAR_LENGTH 16
+#define NAME_LEN (NAME_CHAR_LEN*SYSTEM_CHARSET_MBMAXLEN)
+#define USERNAME_LENGTH (USERNAME_CHAR_LENGTH*SYSTEM_CHARSET_MBMAXLEN)
+
#define SERVER_VERSION_LENGTH 60
#define SQLSTATE_LENGTH 5