bzr push into mysql-5.1-telco-6.3 branch (jonas:3125 to 3126)

[Jonas Oreland]

 3126 Jonas Oreland	2009-10-21
      ndb - "fix" for race in offline alter

    modified:
      sql/ha_ndbcluster.cc
 3125 Jonas Oreland	2009-10-21
      ndb - delay drop-table so that it's alone in epoch
        so that stupid handler doesnt drop events
        (which it does wo/ checking if there is data...)

    modified:
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2009-10-15 16:54:54 +0000
+++ b/sql/ha_ndbcluster.cc	2009-10-21 14:06:50 +0000
@@ -10184,10 +10184,22 @@ int ndbcluster_rename_share(THD *thd, ND
     event_data= (Ndb_event_data *) share->op->getCustomData();
   if (event_data && event_data->table)
   {
-    event_data->table->s->db.str= share->db;
-    event_data->table->s->db.length= strlen(share->db);
-    event_data->table->s->table_name.str= share->table_name;
-    event_data->table->s->table_name.length= strlen(share->table_name);
+    if (!IS_TMP_PREFIX(share->table_name))
+    {
+      event_data->table->s->db.str= share->db;
+      event_data->table->s->db.length= strlen(share->db);
+      event_data->table->s->table_name.str= share->table_name;
+      event_data->table->s->table_name.length= strlen(share->table_name);
+    }
+    else
+    {
+      /**
+       * we don't rename the table->s here 
+       *   that is used by injector
+       *   as we don't know if all events has been processed
+       * This will be dropped anyway
+       */
+    }
   }
   /* else rename will be handled when the ALTER event comes */
   share->old_names= old_key;


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