diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-11 19:30:59 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-11 19:30:59 +0200 |
| commit | 61ed0ebe7388d8302f2de7144de41da32bf085ba (patch) | |
| tree | 8b47861aeeef1db8fcbf8d0a558043aab93187a8 /sql-common | |
| parent | 48be80cd95c9121d2730ebcd1df2a1a37fe73f3d (diff) | |
| parent | 7b55b59b5792d87dedd946487769bc2b1dc36833 (diff) | |
| download | mariadb-git-61ed0ebe7388d8302f2de7144de41da32bf085ba.tar.gz | |
5.1 merge
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 d9444a7d976..ce88dbbbf52 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -2945,6 +2945,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; + if (pkt_end >= end + SCRAMBLE_LENGTH - SCRAMBLE_LENGTH_323 + 1) { /* |