diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-05-28 15:39:56 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-05-28 15:39:56 +0200 |
| commit | a0fd7382bc1e4a8ba0affd27d3034f445a4bb453 (patch) | |
| tree | c8b4b1dabddbc47829a890d74025f7889e692425 /sql-common | |
| parent | 08ce9bfe057b6cd31e7fbca4e4e9e48edde242fb (diff) | |
| parent | ee2b7db3f88f6882022a8aa71b30043ed8b40792 (diff) | |
| download | mariadb-git-a0fd7382bc1e4a8ba0affd27d3034f445a4bb453.tar.gz | |
Merge 10.0-base -> 10.0
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 920f2de0ca0..b00f1c5dc66 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -3468,8 +3468,11 @@ 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 && + /* + 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; |