diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-04-23 10:34:02 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-04-23 10:34:02 +0300 |
| commit | dfab963712a20fb0bd3ab6ee1bd7f46bea77594f (patch) | |
| tree | ed8412c2b74c595bbc2400cba3f215bd2962fe7e /client/mysql.cc | |
| parent | ebbd2668bd8c660d6f7124a06e8a9fdbb4621c59 (diff) | |
| parent | be53c6b7426fec97e50d5fb0b7a5304503fa44fe (diff) | |
| download | mariadb-git-dfab963712a20fb0bd3ab6ee1bd7f46bea77594f.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
Auto merged
client/mysql.cc:
Auto merged
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 44257095c3a..239e624a691 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) @@ -2329,6 +2317,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 { |