summaryrefslogtreecommitdiff
path: root/include/mysql_com.h
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-10-28 10:55:44 +0300
committerAlexander Nozdrin <alik@sun.com>2009-10-28 10:55:44 +0300
commit22fe8e10e297c40bc88104fb6a13e5183238850e (patch)
tree76a0977cebe3775f61ae3281cc608601eb883243 /include/mysql_com.h
parenta4068d17fdf56ee79e4d538d47799ca0eeb67de3 (diff)
parentcd6e15989044e5d4a708a6ee191bcd3c13dc0071 (diff)
downloadmariadb-git-22fe8e10e297c40bc88104fb6a13e5183238850e.tar.gz
Merge from mysql-next-mr.
Diffstat (limited to 'include/mysql_com.h')
-rw-r--r--include/mysql_com.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h
index 82e230fc3fd..84400adbdf7 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