bk commit into 5.1 tree (msvensson:1.2552)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson.  When msvensson does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-22 16:30:00+01:00, msvensson@stripped +2 -0
  Install status variables with different keys to ensure they are output
  in consistent order

  mysql-test/suite/ndb/r/ndb_basic.result@stripped, 2008-02-22 16:29:56+01:00, msvensson@stripped +2 -2
    Update result file to reflect the new consistent order of status variable output

  sql/ha_ndbcluster.cc@stripped, 2008-02-22 16:29:56+01:00, msvensson@stripped +4 -4
    Install status variables with different keys to ensure they are output
    in consistent order

diff -Nrup a/mysql-test/suite/ndb/r/ndb_basic.result b/mysql-test/suite/ndb/r/ndb_basic.result
--- a/mysql-test/suite/ndb/r/ndb_basic.result	2008-02-13 19:02:31 +01:00
+++ b/mysql-test/suite/ndb/r/ndb_basic.result	2008-02-22 16:29:56 +01:00
@@ -9,8 +9,6 @@ attr3 VARCHAR(10)
 drop table t1;
 SHOW GLOBAL STATUS LIKE 'ndb%';
 Variable_name	Value
-Ndb_conflict_fn_max	#
-Ndb_conflict_fn_old	#
 Ndb_cluster_node_id	#
 Ndb_config_from_host	#
 Ndb_config_from_port	#
@@ -18,6 +16,8 @@ Ndb_number_of_data_nodes	#
 Ndb_number_of_ready_data_nodes	#
 Ndb_connect_count	#
 Ndb_execute_count	#
+Ndb_conflict_fn_max	#
+Ndb_conflict_fn_old	#
 SHOW GLOBAL VARIABLES LIKE 'ndb%';
 Variable_name	Value
 ndb_autoincrement_prefetch_sz	#
diff -Nrup a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
--- a/sql/ha_ndbcluster.cc	2008-02-20 13:30:12 +01:00
+++ b/sql/ha_ndbcluster.cc	2008-02-22 16:29:56 +01:00
@@ -229,8 +229,8 @@ SHOW_VAR ndb_status_variables[]= {
 };
 
 SHOW_VAR ndb_status_conflict_variables[]= {
-  {"conflict_fn_max",     (char*) &g_ndb_status_conflict_fn_max, SHOW_LONG},
-  {"conflict_fn_old",     (char*) &g_ndb_status_conflict_fn_old, SHOW_LONG},
+  {"fn_max",     (char*) &g_ndb_status_conflict_fn_max, SHOW_LONG},
+  {"fn_old",     (char*) &g_ndb_status_conflict_fn_old, SHOW_LONG},
   {NullS, NullS, SHOW_LONG}
 };
 
@@ -12333,8 +12333,8 @@ static int show_ndb_vars(THD *thd, SHOW_
 }
 
 SHOW_VAR ndb_status_variables_export[]= {
-  {"Ndb", (char*) &show_ndb_vars,                 SHOW_FUNC},
-  {"Ndb", (char*) &ndb_status_conflict_variables, SHOW_ARRAY},
+  {"Ndb",          (char*) &show_ndb_vars,                 SHOW_FUNC},
+  {"Ndb_conflict", (char*) &ndb_status_conflict_variables, SHOW_ARRAY},
   {NullS, NullS, SHOW_LONG}
 };