diff options
| author | unknown <monty@tik.mysql.fi> | 2002-04-22 23:36:34 +0300 |
|---|---|---|
| committer | unknown <monty@tik.mysql.fi> | 2002-04-22 23:36:34 +0300 |
| commit | 238ea9dfd417667e81b76508ddd182f682c265af (patch) | |
| tree | 2d4a28547b1155c925db237f6e4cf79b0b3f8861 /client/mysql.cc | |
| parent | 03e5b55faba987629d16db8582d847e03ca2d12f (diff) | |
| download | mariadb-git-238ea9dfd417667e81b76508ddd182f682c265af.tar.gz | |
Removed some old Makefiles to avoid name conflict on Mac OS X
Changed in client library character-set-dir -> character-sets-dir
Docs/manual.texi:
Snmall update to ALTER TABLE and MyISAM tables
client/mysql.cc:
Moved SSL info to 'status'
libmysql/libmysql.c:
Fixed character-set-dir -> character-sets-dir
sql/sql_string.cc:
Small optimization
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index c9b80ebb2f8..2a09abc13b8 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -354,18 +354,6 @@ int main(int argc,char *argv[]) mysql_thread_id(&mysql),mysql_get_server_info(&mysql)); put_info((char*) glob_buffer.ptr(),INFO_INFO); -#ifdef HAVE_OPENSSL - if (mysql.net.vio->ssl_ && SSL_get_cipher(mysql.net.vio->ssl_)) - { - sprintf((char*) glob_buffer.ptr(), - "SSL cipher in use is %s\n", SSL_get_cipher(mysql.net.vio->ssl_)); - put_info((char*) glob_buffer.ptr(),INFO_INFO); - } - else - put_info("SSL is not in use\n",INFO_INFO); -#endif /* HAVE_OPENSSL */ - - #ifdef HAVE_READLINE initialize_readline(my_progname); if (!status.batch && !quick && !opt_html && !opt_xml) @@ -2324,6 +2312,13 @@ com_status(String *buffer __attribute__((unused)), tee_fprintf(stdout, "Current user:\t\t%s\n",cur[1]); (void) mysql_fetch_row(result); // Read eof } +#ifdef HAVE_OPENSSL + if (mysql.net.vio->ssl_ && SSL_get_cipher(mysql.net.vio->ssl_)) + tee_fprintf("SSL cipher in use is %s\n", + SSL_get_cipher(mysql.net.vio->ssl_)); + else +#endif /* HAVE_OPENSSL */ + tee_puts("SSL is not in use\n", stdout); } else { |