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

Correction of fix for bug #12280 "Triggers: crash if flush tables".

Browse Source 
We should not assume that "thd" argument of reload_acl_and_cache() is
non-zero. Failure to do so will cause server to crash when one sends
SIGHUP to it.
This commit is contained in:
dlenev@mysql.com 2005-08-24 23:44:42 +04:00
parent f34398ba65
commit 2a880905c4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_parse.cc
View File

@ -6517,7 +6517,7 @@ void add_join_natural(TABLE_LIST *a, TABLE_LIST *b, List<String> *using_fields)
SYNOPSIS SYNOPSIS
reload_acl_and_cache() reload_acl_and_cache()
thd Thread handler thd Thread handler (can be NULL!)
options What should be reset/reloaded (tables, privileges, options What should be reset/reloaded (tables, privileges,
slave...) slave...)
tables Tables to flush (if any) tables Tables to flush (if any)
@ -6539,7 +6539,7 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables,
select_errors=0; /* Write if more errors */ select_errors=0; /* Write if more errors */
bool tmp_write_to_binlog= 1; bool tmp_write_to_binlog= 1;
if (thd->in_sub_stmt) if (thd && thd->in_sub_stmt)
{ {
my_error(ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG, MYF(0), "FLUSH"); my_error(ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG, MYF(0), "FLUSH");
return 1; return 1;