From d371a8026541bbc75b85d366fc633b679185ddb6 Mon Sep 17 00:00:00 2001
From: unknown <pekka@orca.ndb.mysql.com>
Date: Wed, 13 Sep 2006 12:27:48 +0200
Subject: [PATCH] ndb - bug#21191: ndb index stats OFF by default
mysql-test/r/ndb_index_ordered.result:
ndb_index_stat_enable default = OFF
remove other ndb_index_stat% from mysqld options (too many)
sql/mysqld.cc:
ndb_index_stat_enable default = OFF
remove other ndb_index_stat% from mysqld options (too many)
---
mysql-test/r/ndb_index_ordered.result | 4 ++--
sql/mysqld.cc | 15 +--------------
2 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/mysql-test/r/ndb_index_ordered.result b/mysql-test/r/ndb_index_ordered.result
index b4871180706..3b8415b9267 100644
--- a/mysql-test/r/ndb_index_ordered.result
+++ b/mysql-test/r/ndb_index_ordered.result
@@ -663,7 +663,7 @@ set autocommit=1;
show session variables like 'ndb_index_stat_%';
Variable_name Value
ndb_index_stat_cache_entries 32
-ndb_index_stat_enable ON
+ndb_index_stat_enable OFF
ndb_index_stat_update_freq 20
set ndb_index_stat_enable = off;
show session variables like 'ndb_index_stat_%';
@@ -794,5 +794,5 @@ set ndb_index_stat_update_freq = @@global.ndb_index_stat_update_freq;
show session variables like 'ndb_index_stat_%';
Variable_name Value
ndb_index_stat_cache_entries 32
-ndb_index_stat_enable ON
+ndb_index_stat_enable OFF
ndb_index_stat_update_freq 20
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 86a7a0a3b58..715b4c9a218 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -4693,7 +4693,6 @@ enum options_mysqld
OPT_NDB_MGMD, OPT_NDB_NODEID,
OPT_NDB_DISTRIBUTION,
OPT_NDB_INDEX_STAT_ENABLE,
- OPT_NDB_INDEX_STAT_CACHE_ENTRIES, OPT_NDB_INDEX_STAT_UPDATE_FREQ,
OPT_NDB_EXTRA_LOGGING,
OPT_NDB_REPORT_THRESH_BINLOG_EPOCH_SLIP,
OPT_NDB_REPORT_THRESH_BINLOG_MEM_USAGE,
@@ -5397,19 +5396,7 @@ Disable with --skip-ndbcluster (will save memory).",
"Use ndb index statistics in query optimization.",
(gptr*) &global_system_variables.ndb_index_stat_enable,
(gptr*) &max_system_variables.ndb_index_stat_enable,
- 0, GET_BOOL, OPT_ARG, 1, 0, 1, 0, 0, 0},
- {"ndb-index-stat-cache-entries", OPT_NDB_INDEX_STAT_CACHE_ENTRIES,
- "Number of start/end keys to store in statistics memory cache."
- " Zero means no cache and forces query of db nodes always.",
- (gptr*) &global_system_variables.ndb_index_stat_cache_entries,
- (gptr*) &max_system_variables.ndb_index_stat_cache_entries,
- 0, GET_ULONG, OPT_ARG, 32, 0, ~0L, 0, 0, 0},
- {"ndb-index-stat-update-freq", OPT_NDB_INDEX_STAT_UPDATE_FREQ,
- "How often, in the long run, to query db nodes instead of statistics cache."
- " For example 20 means every 20th time.",
- (gptr*) &global_system_variables.ndb_index_stat_update_freq,
- (gptr*) &max_system_variables.ndb_index_stat_update_freq,
- 0, GET_ULONG, OPT_ARG, 20, 0, ~0L, 0, 0, 0},
+ 0, GET_BOOL, OPT_ARG, 0, 0, 1, 0, 0, 0},
#endif
{"ndb-use-copying-alter-table",
OPT_NDB_USE_COPYING_ALTER_TABLE,