Commit | Line | Data |
---|---|---|
4664501d FF |
1 | diff -u -r ../mariadb-10.1.22/client/mysql.cc ./client/mysql.cc |
2 | --- ../mariadb-10.1.22/client/mysql.cc 2017-03-11 20:08:54.000000000 +0100 | |
3 | +++ ./client/mysql.cc 2017-04-07 03:12:08.091397345 +0200 | |
4 | @@ -2676,9 +2676,9 @@ | |
5 | #ifdef HAVE_LOCALE_H | |
6 | setlocale(LC_ALL,""); /* so as libedit use isprint */ | |
7 | #endif | |
8 | - rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion; | |
9 | - rl_completion_entry_function= &no_completion; | |
10 | - rl_add_defun("magic-space", (Function*)&fake_magic_space, -1); | |
11 | + rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion; | |
12 | + rl_completion_entry_function= (rl_compentry_func_t*)&no_completion; | |
13 | + rl_add_defun("magic-space", (rl_command_func_t*)&fake_magic_space, -1); | |
14 | #else | |
15 | rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion; | |
16 | rl_completion_entry_function= &no_completion; | |
17 | @@ -2700,7 +2700,7 @@ | |
18 | #if defined(USE_NEW_READLINE_INTERFACE) | |
19 | return rl_completion_matches(text, new_command_generator); | |
20 | #else | |
21 | - return completion_matches((char *)text, (CPFunction *)new_command_generator); | |
22 | + return completion_matches((char *)text, (rl_compentry_func_t *)new_command_generator); | |
23 | #endif | |
24 | else | |
25 | return (char**) 0; |