diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-04 11:35:10 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-04 11:35:10 +0200 |
| commit | 87a452f6d5839f9702d41d00137350fe9a38a774 (patch) | |
| tree | 03c9915b730fc88c5f2ff3c06b82d9be98286b77 /sql-common | |
| parent | e70ce465b7f4daf7124f442c95425ad66b92b527 (diff) | |
| download | mariadb-git-87a452f6d5839f9702d41d00137350fe9a38a774.tar.gz | |
MDEV-4088 Replication 10.0 -> 5.5 fails
update 5.1 to replicate from 10.0 and
to show the server version (as of 10.0) correctly
sql-common/client.c:
mdev:4088
sql/slave.cc:
use the version number, not just the first character of the version string
(we want 10 > 4 not "10" < "4").
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 53642b65be7..a1f3909c023 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -2264,6 +2264,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, see RPL_VERSION_HACK comment */ + 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; + /* Part 2: format and send client info to the server for access check */ |