mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Bug#26243 mysql command line crash after control-c
- Backported the 5.1 DBUG to 5.0. - Avoid memory cleanup race on Windows client for CTRL-C
This commit is contained in:
@ -9570,8 +9570,6 @@ static void print_sel_tree(PARAM *param, SEL_TREE *tree, key_map *tree_map,
|
||||
int idx;
|
||||
char buff[1024];
|
||||
DBUG_ENTER("print_sel_tree");
|
||||
if (! _db_on_)
|
||||
DBUG_VOID_RETURN;
|
||||
|
||||
String tmp(buff,sizeof(buff),&my_charset_bin);
|
||||
tmp.length(0);
|
||||
@ -9601,8 +9599,6 @@ static void print_ror_scans_arr(TABLE *table, const char *msg,
|
||||
struct st_ror_scan_info **end)
|
||||
{
|
||||
DBUG_ENTER("print_ror_scans");
|
||||
if (! _db_on_)
|
||||
DBUG_VOID_RETURN;
|
||||
|
||||
char buff[1024];
|
||||
String tmp(buff,sizeof(buff),&my_charset_bin);
|
||||
@ -9665,7 +9661,7 @@ static void print_quick(QUICK_SELECT_I *quick, const key_map *needed_reg)
|
||||
{
|
||||
char buf[MAX_KEY/8+1];
|
||||
DBUG_ENTER("print_quick");
|
||||
if (! _db_on_ || !quick)
|
||||
if (!quick)
|
||||
DBUG_VOID_RETURN;
|
||||
DBUG_LOCK_FILE;
|
||||
|
||||
|
Reference in New Issue
Block a user