diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-10-17 10:18:17 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-10-17 10:18:17 +0200 |
| commit | df5f25fa7a2c9f43f0506b2ef98dc00033a5c557 (patch) | |
| tree | a817540a283821a9badd4e704ca79b7c57d1d1e0 /client | |
| parent | b036b6b59464524d7dd54a4c9a75b5ee8a14dbe0 (diff) | |
| parent | 1da916c37e5107b27297fc9e22c3da7772bb097d (diff) | |
| download | mariadb-git-df5f25fa7a2c9f43f0506b2ef98dc00033a5c557.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 2a56caf23ef..3521896c3b1 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1067,8 +1067,7 @@ static void fix_history(String *final_command); static COMMANDS *find_command(char *name); static COMMANDS *find_command(char cmd_name); -static bool add_line(String &buffer, char *line, ulong line_length, - char *in_string, bool *ml_comment, bool truncated); +static bool add_line(String &, char *, ulong, char *, bool *, bool); static void remove_cntrl(String &buffer); static void print_table_data(MYSQL_RES *result); static void print_table_data_html(MYSQL_RES *result); |