diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-07-04 03:18:15 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-07-04 03:18:15 +0300 |
| commit | 2d5d754c8c28ca087f44f479e0fca614789b42e5 (patch) | |
| tree | eaf3cc9d9913bdfe213c549f3890aa25f565ca8b /client/mysql.cc | |
| parent | db5283b30667c9d427228069314f53d38c4ef8f1 (diff) | |
| download | mariadb-git-2d5d754c8c28ca087f44f479e0fca614789b42e5.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)
client/mysql.cc:
status query on killed mysql connection results in segmentation fault (Bug #738)
configure.in:
Portability fix for Unixware
include/my_global.h:
Removed wrong patch from previous changeset
sql/mysql_priv.h:
Added MAX_PASSWORD_LENGTH. This increased master-slave passwords to 32 bytes
sql/slave.h:
Optimized structure
sql/sql_repl.cc:
Memory overrun safety fixes (not critical)
Fixed server crash on purge master logs or show master logs when binlog is off. (Bug #733)
sql/sql_repl.h:
Fixed to use right define
strings/strmake.c:
Fixed comment
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 3 |
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 |