Commit f3bc2406 authored by Magne Mahre's avatar Magne Mahre

Bug #46495 Crash in reload_acl_and_cache on SIGHUP

      
An assert in reload_acl_and_cache didn't account for the
case when the function is called with a NULL thd.  A
null thd is used whenever the function is called from the
SIGHUP signal handler.

Backported from 6.0-codebase  (revid: 2617.69.35)
parent f1293672
......@@ -6568,7 +6568,7 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables,
}
#endif /*HAVE_QUERY_CACHE*/
DBUG_ASSERT(thd->locked_tables_mode || !thd->mdl_context.has_locks());
DBUG_ASSERT(!thd || thd->locked_tables_mode || !thd->mdl_context.has_locks());
/*
Note that if REFRESH_READ_LOCK bit is set then REFRESH_TABLES is set too
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment