bzr push into mysql-5.5-cluster-alter branch (Martin.Skold:3358 to 3359)

[Martin Skold]

 3359 Martin Skold	2011-06-23
      Setting uninitialized value, detected by valgrind

    modified:
      sql/sql_table.cc
 3358 Martin Skold	2011-06-22
      Removed printout of error message since it depends on binlog position

    modified:
      mysql-test/suite/ndb_rpl/r/ndb_rpl_basic.result
      mysql-test/suite/ndb_rpl/t/ndb_rpl_basic.test
=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2011-06-16 13:24:00 +0000
+++ b/sql/sql_table.cc	2011-06-23 10:29:27 +0000
@@ -6621,6 +6621,7 @@ bool mysql_alter_table(THD *thd,char *ne
   handlerton *old_db_type, *new_db_type, *save_old_db_type;
 #ifndef MCP_WL3749
   bool need_copy_table= TRUE;
+  alter_info->change_level= ALTER_TABLE_METADATA_ONLY;
 #else
   enum_alter_table_change_level need_copy_table= ALTER_TABLE_METADATA_ONLY;
 #endif
@@ -7055,7 +7056,7 @@ bool mysql_alter_table(THD *thd,char *ne
     goto err;
 #ifdef MCP_WL3749
   if (need_copy_table == ALTER_TABLE_METADATA_ONLY)
-    need_copy_table= alter_info->change_levels;
+    need_copy_table= alter_info->change_level;
 #endif
   set_table_default_charset(thd, create_info, db);
 

No bundle (reason: useless for push emails).