diff options
author | Alexander Nozdrin <alik@sun.com> | 2009-10-28 10:48:53 +0300 |
---|---|---|
committer | Alexander Nozdrin <alik@sun.com> | 2009-10-28 10:48:53 +0300 |
commit | 55b8f07a9922f26cc64dbeac2f1cb78519621f16 (patch) | |
tree | 21d09b868d7678bd05f100fc769943acc09a9bea /include/mysql_com.h | |
parent | afcb7b8597593ef54f88e9974ecd0b55b5483ef4 (diff) | |
parent | cd6e15989044e5d4a708a6ee191bcd3c13dc0071 (diff) | |
download | mariadb-git-55b8f07a9922f26cc64dbeac2f1cb78519621f16.tar.gz |
Automerge from mysql-next-mr.
Diffstat (limited to 'include/mysql_com.h')
-rw-r--r-- | include/mysql_com.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index 236e17ccb94..4ffcd658d7b 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -27,6 +27,8 @@ #define NAME_LEN (NAME_CHAR_LEN*SYSTEM_CHARSET_MBMAXLEN) #define USERNAME_LENGTH (USERNAME_CHAR_LENGTH*SYSTEM_CHARSET_MBMAXLEN) +#define MYSQL_AUTODETECT_CHARSET_NAME "auto" + #define SERVER_VERSION_LENGTH 60 #define SQLSTATE_LENGTH 5 |