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 | 48c15f0fb0a21c775398e34357f6425501a27914 (patch) | |
| tree | 21d09b868d7678bd05f100fc769943acc09a9bea /include | |
| parent | 804e9d30ca57dfcfb2c9772afe3cef3d5fd48633 (diff) | |
| parent | 273a0a4f97ea07620675cba1f61e84dd83c21a2f (diff) | |
| download | mariadb-git-48c15f0fb0a21c775398e34357f6425501a27914.tar.gz | |
Automerge from mysql-next-mr.
Diffstat (limited to 'include')
| -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 |