diff options
| author | unknown <geert@kriem.kemuri.org> | 2005-04-29 14:46:53 +0200 |
|---|---|---|
| committer | unknown <geert@kriem.kemuri.org> | 2005-04-29 14:46:53 +0200 |
| commit | a34cb7932d914db76dd21fd28988cff7fa6279c9 (patch) | |
| tree | 17e0d7dc5d8359528d97e5a697fdbe661e1ecf58 /client | |
| parent | 8bb6c4d4d5ca047c63a6453114a60d305ed8cc5b (diff) | |
| parent | 17e6c8f292d0273ef26d0c3deeaa259e5d0d8db9 (diff) | |
| download | mariadb-git-a34cb7932d914db76dd21fd28988cff7fa6279c9.tar.gz | |
Merge gvanderkelen@bk-internal.mysql.com:/home/bk/mysql-5.0
into kriem.kemuri.org:/home/geert/MySQL/mysql-5.0
client/mysql.cc:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 5e87a6d420a..c3a5da430ac 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -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; |