diff options
Diffstat (limited to 'include/mysql_com.h')
| -rw-r--r-- | include/mysql_com.h | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index 28627e38..a56c3f48 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -41,27 +41,6 @@ #define MYSQL50_TABLE_NAME_PREFIX_LENGTH (sizeof(MYSQL50_TABLE_NAME_PREFIX)-1) #define SAFE_NAME_LEN (NAME_LEN + MYSQL50_TABLE_NAME_PREFIX_LENGTH) -/* - MDEV-4088 - - MySQL (and MariaDB 5.x before the fix) was using the first character of the - server version string (as sent in the first handshake protocol packet) to - decide on the replication event formats. And for 10.x the first character - is "1", which the slave thought comes from some ancient 1.x version - (ignoring the fact that the first ever MySQL version was 3.x). - - To support replication to these old clients, we fake the version in the - first handshake protocol packet to start from "5.5.5-" (for example, - it might be "5.5.5-10.0.1-MariaDB-debug-log". - - On the client side we remove this fake version prefix to restore the - correct server version. The version "5.5.5" did not support - pluggable authentication, so any version starting from "5.5.5-" and - claiming to support pluggable auth, must be using this fake prefix. -*/ -/* this version must be the one that *does not* support pluggable auth */ -#define RPL_VERSION_HACK "5.5.5-" - #define SERVER_VERSION_LENGTH 60 #define SQLSTATE_LENGTH 5 #define LIST_PROCESS_HOST_LEN 64 @@ -739,7 +718,7 @@ void scramble(char *to, const char *message, const char *password); my_bool check_scramble(const unsigned char *reply, const char *message, const unsigned char *hash_stage2); void get_salt_from_password(unsigned char *res, const char *password); -char *octet2hex(char *to, const char *str, size_t len); +char *octet2hex(char *to, const unsigned char *str, size_t len); /* end of password.c */ |