Commit 0c417889 authored by unknown's avatar unknown

mysql.cc has to support older readline to compile on FreeBSD :((

parent c6ce7b3f
...@@ -1070,9 +1070,13 @@ static void initialize_readline (char *name) ...@@ -1070,9 +1070,13 @@ static void initialize_readline (char *name)
rl_readline_name = name; rl_readline_name = name;
/* Tell the completer that we want a crack first. */ /* Tell the completer that we want a crack first. */
/* rl_attempted_completion_function = (CPPFunction *)mysql_completion;*/ #if RL_READLINE_VERSION > 0x0400
rl_attempted_completion_function = &new_mysql_completion; rl_attempted_completion_function = &new_mysql_completion;
rl_completion_entry_function= &no_completion; rl_completion_entry_function= &no_completion;
#else
rl_attempted_completion_function =(CPPFunction *)new_mysql_completion;
rl_completion_entry_function= (Function *)no_completion;
#endif
} }
/* /*
...@@ -1087,7 +1091,11 @@ static char **new_mysql_completion (const char *text, ...@@ -1087,7 +1091,11 @@ static char **new_mysql_completion (const char *text,
int end __attribute__((unused))) int end __attribute__((unused)))
{ {
if (!status.batch && !quick) if (!status.batch && !quick)
#if RL_READLINE_VERSION > 0x0400
return rl_completion_matches(text, new_command_generator); return rl_completion_matches(text, new_command_generator);
#else
return completion_matches((char *)text, (CPFunction *)new_command_generator);
#endif
else else
return (char**) 0; return (char**) 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment