database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge gvanderkelen@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into kriem.kemuri.org:/home/geert/MySQL/mysql-5.0


client/mysql.cc:
  Auto merged
This commit is contained in:
unknown
2005-04-29 14:46:53 +02:00
parent 8bb6c4d4d5 17e6c8f292
commit a34cb7932d
87 changed files with 3614 additions and 1463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client/mysql.cc
View File

@ -713,8 +713,16 @@ static void usage(int version)
#ifdef __NETWARE__
#define printf consoleprintf
#endif
printf("%s Ver %s Distrib %s, for %s (%s)\n",
my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);
#if defined(USE_LIBEDIT_INTERFACE)
const char* readline= "";
#else
const char* readline= "readline";
#endif
printf("%s Ver %s Distrib %s, for %s (%s) using %s %s\n",
my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE,
readline, rl_library_version);
if (version)
return;
printf("\
@ -1333,7 +1341,7 @@ static void initialize_readline (char *name)
setlocale(LC_ALL,""); /* so as libedit use isprint */
#endif
rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
rl_completion_entry_function= (CPFunction*)&no_completion;
rl_completion_entry_function= (Function*)&no_completion;
#else
rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
rl_completion_entry_function= (Function*)&no_completion;