diff options
Diffstat (limited to 'databases/mariadb55-client/patches/patch-client_mysql.cc')
| -rw-r--r-- | databases/mariadb55-client/patches/patch-client_mysql.cc | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/databases/mariadb55-client/patches/patch-client_mysql.cc b/databases/mariadb55-client/patches/patch-client_mysql.cc index 0f929e87dfd..71c4552a74d 100644 --- a/databases/mariadb55-client/patches/patch-client_mysql.cc +++ b/databases/mariadb55-client/patches/patch-client_mysql.cc @@ -1,4 +1,4 @@ -$NetBSD: patch-client_mysql.cc,v 1.1 2015/04/16 20:20:15 ryoon Exp $ +$NetBSD: patch-client_mysql.cc,v 1.2 2015/05/07 12:45:29 fhajny Exp $ --- client/mysql.cc.orig 2015-02-13 12:07:00.000000000 +0000 +++ client/mysql.cc @@ -11,3 +11,24 @@ $NetBSD: patch-client_mysql.cc,v 1.1 2015/04/16 20:20:15 ryoon Exp $ #define HAVE_READLINE #define USE_POPEN #endif +@@ -2640,7 +2640,11 @@ static void initialize_readline (char *n + rl_completion_entry_function= &no_completion; + rl_add_defun("magic-space", (Function*)&fake_magic_space, -1); + #else ++# if defined(USE_READLINE_V6) ++ rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion; ++# else + rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion; ++# endif + rl_completion_entry_function= &no_completion; + #endif + } +@@ -2657,7 +2661,7 @@ static char **new_mysql_completion(const + int end __attribute__((unused))) + { + if (!status.batch && !quick) +-#if defined(USE_NEW_READLINE_INTERFACE) ++#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_READLINE_V6) + return rl_completion_matches(text, new_command_generator); + #else + return completion_matches((char *)text, (CPFunction *)new_command_generator); |