diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-04-24 15:23:32 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-04-24 15:23:32 +0300 |
| commit | a56d1215f52b8d6ed9428b358034f439e03cbf5b (patch) | |
| tree | 79b32cfbee538d0d4db28eeb309cb763f4772623 /client/mysql.cc | |
| parent | d12b458c55e928ad72f3d4bcbba594ebb7f3884c (diff) | |
| download | mariadb-git-a56d1215f52b8d6ed9428b358034f439e03cbf5b.tar.gz | |
Fixed syntax error in mysql.cc
Docs/glibc-2.2.5.patch:
Updated patch for glibc
Docs/manual.texi:
Updated 'MySQL server gone away' section
client/mysql.cc:
Fixed syntax error from last change
mysys/my_thr_init.c:
Changed EXTRA_DEBUG to EXTRA_DBUG_THREADS
sql-bench/limits/mysql.cfg:
Update to 4.0.2
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 239e624a691..24abefedda3 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (C) 2000-2002 MySQL AB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -685,7 +685,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), break; case 'p': if (argument == disabled_my_option) - opt_password= ""; + opt_password= (char*) ""; else { if (argument) @@ -2319,7 +2319,7 @@ com_status(String *buffer __attribute__((unused)), } #ifdef HAVE_OPENSSL if (mysql.net.vio->ssl_ && SSL_get_cipher(mysql.net.vio->ssl_)) - tee_fprintf("SSL cipher in use is %s\n", + tee_fprintf(stdout, "SSL cipher in use is %s\n", SSL_get_cipher(mysql.net.vio->ssl_)); else #endif /* HAVE_OPENSSL */ |