diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-04-27 12:56:01 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-04-27 12:56:01 +0200 |
| commit | 0e29519b2b4f06f2e37b59c7e9359331c15e83a4 (patch) | |
| tree | 922f8cbd12ff26fed829ed3fbe11e44e2ea2923f /client | |
| parent | 49b448ae5a91ed9c0dde57ecd1de724bf517d904 (diff) | |
| parent | 78f89a729a962f7a88869a3d5e50ca493391b2a4 (diff) | |
| download | mariadb-git-0e29519b2b4f06f2e37b59c7e9359331c15e83a4.tar.gz | |
Merge from 4.1 to 5.0
client/mysql.cc:
Auto merged
include/my_pthread.h:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/examples/ha_archive.h:
Auto merged
BUILD/SETUP.sh:
Manual merge of conflicts
-DBIG_TABLES removed set by configure using --with-big-tables
configure.in:
manual merge
mysql-test/r/archive.result:
Manual merge
mysql-test/t/archive.test:
Manual merge
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; |