diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-02-10 16:26:18 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-02-10 16:26:18 +0200 |
| commit | 29f898bb64349f46bde6c61badaf47bccd1183c1 (patch) | |
| tree | f9108e587b2ac0b9dfd93033e9da1dabda493155 /client/mysql.cc | |
| parent | 46f91045f8e87434f84b2b268f29f54adcb344eb (diff) | |
| parent | fab053ccf84ccb537999615da8f962d03ef5da76 (diff) | |
| download | mariadb-git-29f898bb64349f46bde6c61badaf47bccd1183c1.tar.gz | |
merged 5.0-bugteam -> 5.1-bugteam
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index be157f52d08..65512e695b8 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -2270,8 +2270,10 @@ extern "C" char **new_mysql_completion (const char *text, int start, int end); if not. */ -#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_LIBEDIT_INTERFACE) +#if defined(USE_NEW_READLINE_INTERFACE) extern "C" char *no_completion(const char*,int) +#elif defined(USE_LIBEDIT_INTERFACE) +extern "C" int no_completion(const char*,int) #else extern "C" char *no_completion() #endif |