bzr push into mysql-5.1-telco-7.0 branch (frazer.clement:4465 to 4466)

[Frazer Clement]

 4466 Frazer Clement	2011-06-17
      WL5353 Primary Cluster Conflict Resolution
        Fix bug in refactoring patch - violation count is now 64bit.

    modified:
      sql/ha_ndbcluster.cc
 4465 Martin Skold	2011-06-17
      Moved multi server tests to new test case, ndb_alter_table_online_multi

    added:
      mysql-test/suite/ndb/r/ndb_alter_table_online_multi.result
      mysql-test/suite/ndb/t/ndb_alter_table_online_multi.test
    modified:
      mysql-test/suite/ndb/r/ndb_alter_table_online.result
      mysql-test/suite/ndb/t/ndb_alter_table_online.test
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-06-17 09:13:52 +0000
+++ b/sql/ha_ndbcluster.cc	2011-06-17 17:20:22 +0000
@@ -601,9 +601,9 @@ SHOW_VAR ndb_status_variables_dynamic[]=
 };
 
 SHOW_VAR ndb_status_conflict_variables[]= {
-  {"fn_max",       (char*) &g_ndb_slave_state.total_violation_count[CFT_NDB_MAX], SHOW_LONG},
-  {"fn_old",       (char*) &g_ndb_slave_state.total_violation_count[CFT_NDB_OLD], SHOW_LONG},
-  {"fn_max_del_win", (char*) &g_ndb_slave_state.total_violation_count[CFT_NDB_MAX_DEL_WIN], SHOW_LONG},
+  {"fn_max",       (char*) &g_ndb_slave_state.total_violation_count[CFT_NDB_MAX], SHOW_LONGLONG},
+  {"fn_old",       (char*) &g_ndb_slave_state.total_violation_count[CFT_NDB_OLD], SHOW_LONGLONG},
+  {"fn_max_del_win", (char*) &g_ndb_slave_state.total_violation_count[CFT_NDB_MAX_DEL_WIN], SHOW_LONGLONG},
   {NullS, NullS, SHOW_LONG}
 };
 

No bundle (reason: useless for push emails).