Commit 44520da5 authored by unknown's avatar unknown
Browse files

Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb 

into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug21191


sql/mysqld.cc:
  Auto merged
parents e1f52e72 3fcee2a4

mysql-test/r/ndb_index_ordered.result

+2 −2
Original line number Diff line number Diff line
@@ -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

sql/mysqld.cc

+2 −15
Original line number Diff line number Diff line
@@ -4704,7 +4704,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,
@@ -5414,19 +5413,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,
@@ -7055,7 +7042,7 @@ static void mysql_init_variables(void) 
#endif

#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE

  have_ndbcluster=SHOW_OPTION_DISABLED;

  global_system_variables.ndb_index_stat_enable=TRUE;

  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;

storage/ndb/test/ndbapi/Makefile.am

+4 −1
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ testPartitioning \ 
testBitfield \

DbCreate DbAsyncGenerator \

testSRBank \

test_event_merge

test_event_merge \

testIndexStat



EXTRA_PROGRAMS = \

 test_event \
@@ -87,6 +88,7 @@ DbAsyncGenerator_SOURCES = bench/mainAsyncGenerator.cpp bench/asyncGenerator.cpp 
testSRBank_SOURCES = testSRBank.cpp

test_event_merge_SOURCES = test_event_merge.cpp

test_event_multi_table_SOURCES = test_event_multi_table.cpp

testIndexStat_SOURCES = testIndexStat.cpp



INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/include/kernel
@@ -168,3 +170,4 @@ testScan.dsp: Makefile \ 
	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(testScan_SOURCES)

	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)

storage/ndb/test/ndbapi/testIndexStat.cpp

0 → 100644
+1406 −0

File added.

Preview size limit exceeded, changes collapsed.