bzr commit into mysql-5.1 branch (kgeorge:2760) Bug#38370

[Georgi Kodinov]

#At file:///home/kgeorge/mysql/bzr/B37348-5.1-5.1.29-rc/

 2760 Georgi Kodinov	2008-10-03
      Bug #38370: The test ndb.ndb_index_ordered fails with the community features on
      
      The problem was caused by a wrong merge. Fixed by enabling the correct ndb variables
      initialization.
modified:
  mysql-test/suite/ndb/t/disabled.def
  sql/mysqld.cc

per-file messages:
  mysql-test/suite/ndb/t/disabled.def
    Bug #38370: remove disabled test case
  sql/mysqld.cc
    Bug #38370: corrected a wrong merge to have all the NDB variables intiialized
    correctly
=== modified file 'mysql-test/suite/ndb/t/disabled.def'
--- a/mysql-test/suite/ndb/t/disabled.def	2008-07-25 10:32:05 +0000
+++ b/mysql-test/suite/ndb/t/disabled.def	2008-10-03 10:10:09 +0000
@@ -12,6 +12,5 @@
 partition_03ndb          : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table
 
 ndb_partition_error2	 : HF is not sure if the test can work as internded on all the platforms
-ndb_index_ordered        : Bug#38370 The test ndb.ndb_index_ordered fails with the community features on
 
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2008-10-01 12:24:35 +0000
+++ b/sql/mysqld.cc	2008-10-03 10:10:09 +0000
@@ -7535,13 +7535,13 @@ static void mysql_init_variables(void)
     have_community_features = SHOW_OPTION_YES;
 #else
     have_community_features = SHOW_OPTION_NO;
+#endif
   global_system_variables.ndb_index_stat_enable=FALSE;
   max_system_variables.ndb_index_stat_enable=TRUE;
   global_system_variables.ndb_index_stat_cache_entries=32;
   max_system_variables.ndb_index_stat_cache_entries=~0L;
   global_system_variables.ndb_index_stat_update_freq=20;
   max_system_variables.ndb_index_stat_update_freq=~0L;
-#endif
 #ifdef HAVE_OPENSSL
   have_ssl=SHOW_OPTION_YES;
 #else