diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-17 21:24:29 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-17 21:24:29 +0200 |
| commit | 97e640b9ae83e07b444fceede6b0524256c7a3cc (patch) | |
| tree | 8f48fbfaf88ea7895ce59fd3ac2fbe6184334387 /include/mysql_com.h | |
| parent | 2f6a2494a5eb2cf3ab06fbedd2584eca85d90230 (diff) | |
| parent | c7973615e723b13c6457b494b72be2fac35bfd18 (diff) | |
| download | mariadb-git-97e640b9ae83e07b444fceede6b0524256c7a3cc.tar.gz | |
5.5 merge
Diffstat (limited to 'include/mysql_com.h')
| -rw-r--r-- | include/mysql_com.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index d8d9d78c6a9..d638806b320 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -27,6 +27,8 @@ #define USERNAME_CHAR_LENGTH 128 #define NAME_LEN (NAME_CHAR_LEN*SYSTEM_CHARSET_MBMAXLEN) #define USERNAME_LENGTH (USERNAME_CHAR_LENGTH*SYSTEM_CHARSET_MBMAXLEN) +#define DEFINER_CHAR_LENGTH (USERNAME_CHAR_LENGTH + HOSTNAME_LENGTH + 1) +#define DEFINER_LENGTH (USERNAME_LENGTH + HOSTNAME_LENGTH + 1) #define MYSQL_AUTODETECT_CHARSET_NAME "auto" @@ -52,12 +54,8 @@ pluggable authentication, so any version starting from "5.5.5-" and claiming to support pluggable auth, must be using this fake prefix. */ -#ifdef EMBEDDED_LIBRARY -#define RPL_VERSION_HACK "" -#else /* this version must be the one that *does not* support pluggable auth */ #define RPL_VERSION_HACK "5.5.5-" -#endif #define SERVER_VERSION_LENGTH 60 #define SQLSTATE_LENGTH 5 |