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

Minor cleanups

Browse Source 
- Remove impossible test in test_quick_select
- Ensure that is_fatal_error is set if we run out of stack space
This commit is contained in:
Monty 2016-08-22 10:19:07 +03:00
parent b51109693e
commit a5051cd3b2
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/opt_range.cc
View File

@ -3015,8 +3015,6 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use,
scan_time= read_time= DBL_MAX; scan_time= read_time= DBL_MAX;
if (limit < records) if (limit < records)
read_time= (double) records + scan_time + 1; // Force to use index read_time= (double) records + scan_time + 1; // Force to use index
else if (read_time <= 2.0 && !force_quick_range)
DBUG_RETURN(0); /* No need for quick select */
possible_keys.clear_all(); possible_keys.clear_all();
@ -3285,7 +3283,6 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use,
thd->no_errors=0; thd->no_errors=0;
} }
DBUG_EXECUTE("info", print_quick(quick, &needed_reg);); DBUG_EXECUTE("info", print_quick(quick, &needed_reg););
/* /*

1
sql/sql_parse.cc
View File

@ -6181,6 +6181,7 @@ bool check_stack_overrun(THD *thd, long margin,
if ((stack_used=used_stack(thd->thread_stack,(char*) &stack_used)) >= if ((stack_used=used_stack(thd->thread_stack,(char*) &stack_used)) >=
(long) (my_thread_stack_size - margin)) (long) (my_thread_stack_size - margin))
{ {
thd->is_fatal_error= 1;
/* /*
Do not use stack for the message buffer to ensure correct Do not use stack for the message buffer to ensure correct
behaviour in cases we have close to no stack left. behaviour in cases we have close to no stack left.