database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge bk-internal.mysql.com:/users/rburnett/bug10245

Browse Source 
into bk-internal.mysql.com:/users/rburnett/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
This commit is contained in:
unknown
2005-05-06 15:21:30 +02:00
parent 4576776010 09ca059e4a
commit 0430cdb7c5
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/mysql.cc
View File

@ -710,9 +710,15 @@ static void usage(int version)
const char* readline= "readline"; const char* readline= "readline";
#endif #endif
#ifdef HAVE_READLINE
printf("%s Ver %s Distrib %s, for %s (%s) using %s %s\n", printf("%s Ver %s Distrib %s, for %s (%s) using %s %s\n",
my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE, my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE,
readline, rl_library_version); readline, rl_library_version);
#else
printf("%s Ver %s Distrib %s, for %s (%s)", my_progname, VER,
MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);
#endif
if (version) if (version)
return; return;
printf("\ printf("\