diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-10-22 13:03:41 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-10-22 13:03:41 +0200 |
| commit | 9d2e2d753323a934604d25144b9d1ecaf34b47d8 (patch) | |
| tree | 051a721f7ea77c2278d09323e36088abe22aa66a /client | |
| parent | d11af09865299033d5eef64531704f6ab8af5304 (diff) | |
| parent | 2eb3c5e5420a724945a4cba914df25aa1e3744ce (diff) | |
| download | mariadb-git-9d2e2d753323a934604d25144b9d1ecaf34b47d8.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 1c344c7e54c..f581bfcafae 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1065,8 +1065,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); @@ -1078,7 +1077,7 @@ static ulong start_timer(void); static void end_timer(ulong start_time,char *buff); static void mysql_end_timer(ulong start_time,char *buff); static void nice_time(double sec,char *buff,bool part_second); -extern "C" sig_handler mysql_end(int sig); +extern "C" sig_handler mysql_end(int sig) __attribute__ ((noreturn)); extern "C" sig_handler handle_sigint(int sig); #if defined(HAVE_TERMIOS_H) && defined(GWINSZ_IN_SYS_IOCTL) static sig_handler window_resize(int sig); |