bzr commit into mysql-5.6-next-mr branch (magne.mahre:3022) Bug#46495

[Magne Mahre]

#At file:///data/z/mysql-next-4284/ based on revid:jon.hauglid@stripped

 3022 Magne Mahre	2009-12-10
      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)

    modified:
      sql/sql_parse.cc
=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2009-12-09 14:25:48 +0000
+++ b/sql/sql_parse.cc	2009-12-10 09:30:22 +0000
@@ -6568,7 +6568,7 @@ bool reload_acl_and_cache(THD *thd, ulon
   }
 #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


Attachment: [text/bzr-bundle] bzr/[e-mail]