4438 jonas oreland 2011-06-07
ndb - fix tux upgrade with ndb_mgmd not having index-stat-options
modified:
storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
4437 jonas oreland 2011-06-01
ndb - remove another windows breaks solaris feture from autotest
modified:
storage/ndb/test/run-test/atrt-gather-result.sh
=== modified file 'storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp 2011-05-31 08:28:58 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp 2011-06-07 06:34:14 +0000
@@ -229,18 +229,30 @@ Dbtux::execREAD_CONFIG_REQ(Signal* signa
ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_TUX_ATTRIBUTE, &nAttribute));
ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_TUX_SCAN_OP, &nScanOp));
ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DB_BATCH_SIZE, &nScanBatch));
- ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DB_INDEX_STAT_AUTO_UPDATE,
- &nStatAutoUpdate));
- ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DB_INDEX_STAT_SAVE_SIZE,
- &nStatSaveSize));
- ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DB_INDEX_STAT_SAVE_SCALE,
- &nStatSaveScale));
- ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DB_INDEX_STAT_TRIGGER_PCT,
- &nStatTriggerPct));
- ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DB_INDEX_STAT_TRIGGER_SCALE,
- &nStatTriggerScale));
- ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DB_INDEX_STAT_UPDATE_DELAY,
- &nStatUpdateDelay));
+
+ nStatAutoUpdate = 0;
+ ndb_mgm_get_int_parameter(p, CFG_DB_INDEX_STAT_AUTO_UPDATE,
+ &nStatAutoUpdate);
+
+ nStatSaveSize = 32768;
+ ndb_mgm_get_int_parameter(p, CFG_DB_INDEX_STAT_SAVE_SIZE,
+ &nStatSaveSize);
+
+ nStatSaveScale = 100;
+ ndb_mgm_get_int_parameter(p, CFG_DB_INDEX_STAT_SAVE_SCALE,
+ &nStatSaveScale);
+
+ nStatTriggerPct = 100;
+ ndb_mgm_get_int_parameter(p, CFG_DB_INDEX_STAT_TRIGGER_PCT,
+ &nStatTriggerPct);
+
+ nStatTriggerScale = 100;
+ ndb_mgm_get_int_parameter(p, CFG_DB_INDEX_STAT_TRIGGER_SCALE,
+ &nStatTriggerScale);
+
+ nStatUpdateDelay = 60;
+ ndb_mgm_get_int_parameter(p, CFG_DB_INDEX_STAT_UPDATE_DELAY,
+ &nStatUpdateDelay);
const Uint32 nDescPage = (nIndex * DescHeadSize + nAttribute * KeyTypeSize + nAttribute * AttributeHeaderSize + DescPageSize - 1) / DescPageSize;
const Uint32 nScanBoundWords = nScanOp * ScanBoundSegmentSize * 4;
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.1-telco-7.0 branch (jonas:4437 to 4438) | jonas oreland | 7 Jun |
