diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-09 23:27:52 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-09 23:27:52 +0200 |
| commit | c50ee6c23dbeb090963580754bec2f0a96ac0557 (patch) | |
| tree | 76a55ce574f812b620a93a6831f3345f43c72c40 /sql-common | |
| parent | da7eca021bbcd0d199a05543f58fae99e34646a1 (diff) | |
| download | mariadb-git-c50ee6c23dbeb090963580754bec2f0a96ac0557.tar.gz | |
MDEV-4088 Replication 10.0 -> 5.5 fails
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 64010919fe3..e48cdac369e 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -3416,6 +3416,12 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, strmov(mysql->server_version,(char*) net->read_pos+1); mysql->port=port; + /* remove the rpl hack from the version string */ + if (mysql->server_capabilities & CLIENT_PLUGIN_AUTH && + strncmp(mysql->server_version, RPL_VERSION_HACK, + sizeof(RPL_VERSION_HACK) - 1) == 0) + mysql->server_version+= sizeof(RPL_VERSION_HACK) - 1; + if (pkt_end >= end + SCRAMBLE_LENGTH - SCRAMBLE_LENGTH_323 + 1) { /* |