From: magnus.blaudd
Date: November 21 2011 7:58am
Subject: bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:4338 to 4339)
List-Archive: http://lists.mysql.com/commits/142049
Message-Id: <201111210758.pAL7wbJd029235@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4339 magnus.blaudd@stripped	2011-11-21 [merge]
      Merge 7.0 -> 7.1

    modified:
      sql/ha_ndbcluster_binlog.cc
 4338 jonas oreland	2011-11-19 [merge]
      ndb - merge 70 to 71

    modified:
      mysql-test/suite/ndb/r/ndb_index_stat.result
      mysql-test/suite/ndb/t/ndb_index_stat.test
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
      storage/ndb/src/kernel/blocks/trix/Trix.cpp
=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2011-11-10 14:23:53 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2011-11-21 07:55:43 +0000
@@ -3215,6 +3215,7 @@ ndb_binlog_thread_handle_schema_event_po
         }
         if (share)
         {
+          pthread_mutex_lock(&share->mutex);
           if (share->op)
           {
             Ndb_event_data *event_data= (Ndb_event_data *) share->op->getCustomData();
@@ -3228,6 +3229,7 @@ ndb_binlog_thread_handle_schema_event_po
             share->op= 0;
             free_share(&share);
           }
+          pthread_mutex_unlock(&share->mutex);
           free_share(&share);
         }
 
@@ -3292,7 +3294,7 @@ ndb_binlog_thread_handle_schema_event_po
           DBUG_PRINT("info", ("Detected frm change of table %s.%s",
                               schema->db, schema->name));
           log_query= 1;
-          build_table_filename(key, FN_LEN-1, schema->db, schema->name, NullS, 0);
+          build_table_filename(key, sizeof(key)-1, schema->db, schema->name, NullS, 0);
           /*
             If the there is no local table shadowing the altered table and 
             it has an frm that is different than the one on disk then 
@@ -5054,8 +5056,8 @@ ndbcluster_check_if_local_table(const ch
   char ndb_file[FN_REFLEN + 1];
 
   DBUG_ENTER("ndbcluster_check_if_local_table");
-  build_table_filename(key, FN_LEN-1, dbname, tabname, reg_ext, 0);
-  build_table_filename(ndb_file, FN_LEN-1, dbname, tabname, ha_ndb_ext, 0);
+  build_table_filename(key, sizeof(key)-1, dbname, tabname, reg_ext, 0);
+  build_table_filename(ndb_file, sizeof(ndb_file)-1, dbname, tabname, ha_ndb_ext, 0);
   /* Check that any defined table is an ndb table */
   DBUG_PRINT("info", ("Looking for file %s and %s", key, ndb_file));
   if ((! my_access(key, F_OK)) && my_access(ndb_file, F_OK))

No bundle (reason: useless for push emails).