1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "MDEV-14448: Ctrl-C should not exit the client"

Browse Source 
This reverts commit 396313d301b3567aeadd04ae6a9322da2adc0a8b.
This commit is contained in:
Sergei Golubchik 2019-10-30 14:38:18 +01:00
parent afb4878703
commit 9277b6ec1c
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client/mysql.cc
View File

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