summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authormonty@narttu.mysql.fi <>2003-07-04 03:18:15 +0300
committermonty@narttu.mysql.fi <>2003-07-04 03:18:15 +0300
commitf3af0d7ce423d3b28de463c430f4ff4bef8b925e (patch)
treeeaf3cc9d9913bdfe213c549f3890aa25f565ca8b /client
parent3f4f339f15748a348d085da9c3d17658d01b4af3 (diff)
downloadmariadb-git-f3af0d7ce423d3b28de463c430f4ff4bef8b925e.tar.gz
Status query on killed mysql connection results in segmentation fault (Bug #738)
Added MAX_PASSWORD_LENGTH. This increased master-slave passwords to 32 bytes (Bug #766) Fixed server crash on purge master logs or show master logs when binlog is off. (Bug #733)
Diffstat (limited to 'client')
-rw-r--r--client/mysql.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index 81f4b19f7c6..4fe832a790e 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -2329,7 +2329,8 @@ com_status(String *buffer __attribute__((unused)),
(void) mysql_fetch_row(result); // Read eof
}
#ifdef HAVE_OPENSSL
- if (mysql.net.vio->ssl_ && SSL_get_cipher(mysql.net.vio->ssl_))
+ if (mysql.net.vio && mysql.net.vio->ssl_ &&
+ SSL_get_cipher(mysql.net.vio->ssl_))
tee_fprintf(stdout, "SSL:\t\t\tCipher in use is %s\n",
SSL_get_cipher(mysql.net.vio->ssl_));
else