diff options
| author | Georgi Kodinov <kgeorge@mysql.com> | 2008-10-03 13:10:09 +0300 |
|---|---|---|
| committer | Georgi Kodinov <kgeorge@mysql.com> | 2008-10-03 13:10:09 +0300 |
| commit | 2ab558dec6b89f460cf6e84e58345a847388e992 (patch) | |
| tree | 6fdd8f91a6e7e2d9e4de148b28725bc12f1a73bd /sql/mysqld.cc | |
| parent | e7763d5d98efa88b74c4156a8da043f76c2aaf1e (diff) | |
| download | mariadb-git-2ab558dec6b89f460cf6e84e58345a847388e992.tar.gz | |
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.
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
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index dcf1ee0188a..208ded65805 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -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 |