diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-03-27 19:26:28 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-03-27 19:26:28 +0200 |
| commit | a634875c37af0d3886460d191663333e90e2680d (patch) | |
| tree | 7d39f1f8fd8cb036ec7dd77f45a7a1eae36d95df /sql-common | |
| parent | 87bc0da719f3538a4f520ec2e8c14d84992a7dac (diff) | |
| parent | f7acb850c29dc06219da2a51d2da0a55d389df60 (diff) | |
| download | mariadb-git-a634875c37af0d3886460d191663333e90e2680d.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug24121/my50-bug24121
into pilot.blaudden:/home/msvensson/mysql/bug24121/my51-bug24121
client/mysqltest.c:
Auto merged
sql-common/client.c:
Auto merged
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 12a2483e54d..16fd20209b2 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -3022,7 +3022,7 @@ mysql_options(MYSQL *mysql,enum mysql_option option, const char *arg) mysql->reconnect= *(my_bool *) arg; break; case MYSQL_OPT_SSL_VERIFY_SERVER_CERT: - if (!arg || test(*(uint*) arg)) + if (*(my_bool*) arg) mysql->options.client_flag|= CLIENT_SSL_VERIFY_SERVER_CERT; else mysql->options.client_flag&= ~CLIENT_SSL_VERIFY_SERVER_CERT; |