database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge branch '5.5' into 10.1

Browse Source
This commit is contained in:
Oleksandr Byelkin
2019-10-30 14:47:35 +01:00
parent 708d46158b 9277b6ec1c
commit d671f506b0
3 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
client/mysql.cc
View File

@@ -1401,21 +1401,12 @@ sig_handler handle_sigint(int sig)
char kill_buffer[40];
MYSQL *kill_mysql= NULL;
/* Terminate if we already tried interrupting. */
if (interrupted_query == 2)
/* terminate if no query being executed, or we already tried interrupting */
if (!executing_query || (interrupted_query == 2))
{
tee_fprintf(stdout, "Ctrl-C -- exit!\n");
goto err;
}
/* If no query being executed, don't exit. */
if (!executing_query)
{
tee_fprintf(stdout, "Ctrl-C\n");
rl_on_new_line(); // Regenerate the prompt on a newline
rl_replace_line("", 0); // Clear the previous text
rl_redisplay();
return;
}
kill_mysql= mysql_init(kill_mysql);
if (!do_connect(kill_mysql,current_host, current_user, opt_password, "", 0))