summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authormsvensson@pilot.blaudden <>2007-03-29 13:37:40 +0200
committermsvensson@pilot.blaudden <>2007-03-29 13:37:40 +0200
commit7cf072247451449d55746947e8ec30452e363f64 (patch)
tree0aafa9bdf36cd99361b75de2c3aaaf6d7410a878 /sql-common
parenteac521a9f67d760aec92cca3bda952ea9a4009c8 (diff)
parentad649e3c2c95122cbea4e77e53764236cb307b8c (diff)
downloadmariadb-git-7cf072247451449d55746947e8ec30452e363f64.tar.gz
Merge pilot.blaudden:/home/msvensson/mysql/bug24121/my50-bug24121
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to 'sql-common')
-rw-r--r--sql-common/client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index 1acaaea9a79..3342db4bcfe 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;