List:Commits« Previous MessageNext Message »
From:Jon Olav Hauglid Date:March 7 2013 11:54am
Subject:bzr push into mysql-trunk branch (jon.hauglid:5242 to 5243)
View as plain text  
 5243 Jon Olav Hauglid	2013-03-07 [merge]
      Merge from mysql-5.6 to mysql-trunk

    modified:
      sql/sql_class.cc
 5242 Annamalai Gurusami	2013-03-07 [merge]
      Null merge from mysql-5.6 to mysql-5.7

=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	revid:annamalai.gurusami@stripped
+++ b/sql/sql_class.cc	revid:jon.hauglid@stripped
@@ -1588,6 +1588,10 @@ THD::~THD()
 
   clear_next_event_pos();
 
+  /* Ensure that no one is using THD */
+  mysql_mutex_lock(&LOCK_thd_data);
+  mysql_mutex_unlock(&LOCK_thd_data);
+
   DBUG_PRINT("info", ("freeing security context"));
   main_security_ctx.destroy();
   my_free(db);

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (jon.hauglid:5242 to 5243) Jon Olav Hauglid3 Apr