diff options
| author | msvensson@neptunus.(none) <> | 2005-04-27 12:56:01 +0200 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2005-04-27 12:56:01 +0200 |
| commit | 203cdde955258cc5451bbc87cdc9d4566976e9d4 (patch) | |
| tree | 922f8cbd12ff26fed829ed3fbe11e44e2ea2923f /client | |
| parent | 2627475a8687209fc272c71bafeca9e20e151208 (diff) | |
| parent | 6b84489a018fc01fcdba002669b209101e987101 (diff) | |
| download | mariadb-git-203cdde955258cc5451bbc87cdc9d4566976e9d4.tar.gz | |
Merge from 4.1 to 5.0
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 4eed4349b45..5282f74453d 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -703,8 +703,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("\ @@ -1323,7 +1331,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; |