List:Commits« Previous MessageNext Message »
From:Tomas Ulin Date:October 2 2008 10:56am
Subject:bzr commit into mysql-5.1 branch (tomas.ulin:2680)
View as plain text  
#At file:///home/tomas/mysql_src/cge-6.2-global-schema-lock/

 2680 Tomas Ulin	2008-10-02
      ndb global schema lock cont'd
modified:
  sql/sql_table.cc

=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2008-10-02 06:39:01 +0000
+++ b/sql/sql_table.cc	2008-10-02 08:56:22 +0000
@@ -6618,7 +6618,8 @@ view_err:
   }
 
   Ha_global_schema_lock_guard global_schema_lock_guard(thd);
-  if (table_type == DB_TYPE_NDBCLUSTER)
+  if (table_type == DB_TYPE_NDBCLUSTER ||
+      (create_info->db_type && create_info->db_type->db_type ==
DB_TYPE_NDBCLUSTER))
   {
     /*
       To avoid deadlock in this situation
Thread
• bzr commit into mysql-5.1 branch (tomas.ulin:2680) Tomas Ulin2 Oct