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

MDEV-14448: Ctrl-C should not exit client

Browse Source 
Undo any Windows behaviour changes.
This commit is contained in:
Vicențiu Ciorbaru
2024-01-23 16:24:27 +02:00
parent 15bd7e0b89
commit 27459b413d
1 changed files with 4 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
client/mysql.cc
View File

@@ -89,7 +89,6 @@ extern "C" {
#undef bcmp // Fix problem with new readline #undef bcmp // Fix problem with new readline
#if defined(__WIN__) #if defined(__WIN__)
#include <conio.h> #include <conio.h>
#include <windows.h>
#else #else
# ifdef __APPLE__ # ifdef __APPLE__
# include <editline/readline.h> # include <editline/readline.h>
@@ -1079,29 +1078,6 @@ static sig_handler window_resize(int sig);
static void end_in_sig_handler(int sig); static void end_in_sig_handler(int sig);
static bool kill_query(const char *reason); static bool kill_query(const char *reason);
#ifdef _WIN32
static BOOL WINAPI ctrl_handler_windows(DWORD fdwCtrlType)
{
switch (fdwCtrlType)
{
// Handle the CTRL-C signal.
case CTRL_C_EVENT:
case CTRL_BREAK_EVENT:
handle_sigint(SIGINT);
return TRUE; // this means that the signal is handled
case CTRL_CLOSE_EVENT:
case CTRL_LOGOFF_EVENT:
case CTRL_SHUTDOWN_EVENT:
kill_query("Terminate");
end_in_sig_handler(SIGINT + 1);
aborted= 1;
}
// This means to pass the signal to the next handler. This allows
// my_cgets and the internal ReadConsole call to exit and gracefully
// abort the program.
return FALSE;
}
#endif
const char DELIMITER_NAME[]= "delimiter"; const char DELIMITER_NAME[]= "delimiter";
const uint DELIMITER_NAME_LEN= sizeof(DELIMITER_NAME) - 1; const uint DELIMITER_NAME_LEN= sizeof(DELIMITER_NAME) - 1;
inline bool is_delimiter_command(char *name, ulong len) inline bool is_delimiter_command(char *name, ulong len)
@@ -1234,12 +1210,11 @@ int main(int argc,char *argv[])
if (!status.batch) if (!status.batch)
ignore_errors=1; // Don't abort monitor ignore_errors=1; // Don't abort monitor
#ifndef _WIN32 if (opt_sigint_ignore)
signal(SIGINT, handle_sigint); // Catch SIGINT to clean up signal(SIGINT, SIG_IGN);
else
signal(SIGINT, handle_sigint); // Catch SIGINT to clean up
signal(SIGQUIT, mysql_end); // Catch SIGQUIT to clean up signal(SIGQUIT, mysql_end); // Catch SIGQUIT to clean up
#else
SetConsoleCtrlHandler(ctrl_handler_windows, TRUE);
#endif
#if defined(HAVE_TERMIOS_H) && defined(GWINSZ_IN_SYS_IOCTL) #if defined(HAVE_TERMIOS_H) && defined(GWINSZ_IN_SYS_IOCTL)
/* Readline will call this if it installs a handler */ /* Readline will call this if it installs a handler */
@@ -1471,9 +1446,6 @@ bool kill_query(const char *reason)
*/ */
sig_handler handle_sigint(int sig) sig_handler handle_sigint(int sig)
{ {
if (opt_sigint_ignore)
return;
/* /*
On Unix only, if no query is being executed just clear the prompt, On Unix only, if no query is being executed just clear the prompt,
don't exit. On Windows we exit. don't exit. On Windows we exit.