bzr push into mysql-5.5-cluster branch (magnus.blaudd:3349 to 3350)

[magnus.blaudd]

 3350 magnus.blaudd@stripped	2011-06-01
      ndb
       - revert commenting of DBUG_ASSERT

    modified:
      sql/ha_ndbcluster_binlog.cc
 3349 Martin Skold	2011-05-30 [merge]
      WL3749: MySQL Cluster: On-line DDL, new handler interface: Code from 5.1 adapted to 5.5 changes

    modified:
      include/my_base.h
      mysql-test/include/ndb_have_online_alter.inc
      mysql-test/r/ctype_utf8mb4.result
      mysql-test/suite/innodb/r/innodb-index.result
      mysql-test/suite/innodb/r/innodb.result
      mysql-test/suite/innodb/t/innodb-index.test
      mysql-test/suite/innodb/t/innodb.test
      mysql-test/suite/ndb/r/ndb_alter_table.result
      mysql-test/suite/ndb/r/ndb_alter_table3.result
      mysql-test/suite/ndb/r/ndb_alter_table_online.result
      mysql-test/suite/ndb/r/ndb_dd_restore_compat.result
      mysql-test/suite/ndb/r/ndb_gis.result
      mysql-test/suite/ndb/r/ndb_global_schema_lock_error.result
      mysql-test/suite/ndb/r/ndb_short_sigs.result
      mysql-test/suite/ndb/t/disabled.def
      mysql-test/suite/ndb/t/ndb_alter_table_online2.test
      mysql-test/suite/ndb_binlog/r/ndb_binlog_basic.result
      mysql-test/suite/ndb_binlog/r/ndb_binlog_ddl_multi.result
      mysql-test/suite/ndb_binlog/r/ndb_binlog_log_bin.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_add_column.result
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_glue.h
      sql/handler.cc
      sql/handler.h
      sql/lex.h
      sql/log.cc
      sql/sql_admin.cc
      sql/sql_base.cc
      sql/sql_base.h
      sql/sql_bitmap.h
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_partition.cc
      sql/sql_partition.h
      sql/sql_show.cc
      sql/sql_table.cc
      sql/sql_truncate.cc
      sql/sql_yacc.yy
      sql/table.cc
      sql/table.h
      sql/unireg.cc
      storage/csv/ha_tina.cc
=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2011-05-30 21:13:02 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2011-06-01 06:37:15 +0000
@@ -2056,7 +2056,7 @@ end:
         {
           sql_print_error("NDB %s: distributing %s timed out. Ignoring...",
                           type_str, ndb_schema_object->key);
-          // DBUG_ASSERT(false);
+          DBUG_ASSERT(false);
           break;
         }
         if (opt_ndb_extra_logging)

No bundle (reason: useless for push emails).