into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
merge
- implement read ahead during disk data scan
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
maximum read ahead
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
maximum read ahead should not be larger than page buffer size
maximum aslo set to 32 pages
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
read ahead for disk data scan
storage/ndb/src/kernel/blocks/pgman.cpp:
set higher max_io_waits for read ahead
round off upwards in page_buffer size
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
add null callback to be used for read ahead (no callback needed)
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
add null callback to be used for read ahead (no callback needed)
storage/ndb/src/ndbapi/TransporterFacade.cpp:
remove the debug trace, not needed any more
storage/ndb/test/tools/hugoFill.cpp:
allow setting database in hugoFill
Improve buddy high order allocation
Make removeCommonArea O(1) instead of O(N)
Add limit to left/right search
storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
Add info to buddy module test about
1) loops being made in buddy
2) how much was allocated
storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
1) make removeCommonArea o(1) - as list is (after fix) double linked anyway
2) set page_state = ZFREE_COMMON insertCommonArea and ~ZFREE_COMMON in removeCommonArea
3) add max loops in search left/right
4) add more debug info
into poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
mysql-test/ndb/ndb_config_2_node.ini:
Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
manual merge
- add odirect option for lcp+backup+redo log to lower CPU/kswapd usage
- writing odirect removes need for kernel write buffers avoiding kswapd to kick in
mysql-test/ndb/ndb_config_2_node.ini:
run mysql-test-run using ODirect
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
add new config parameter to choose ODirect
storage/ndb/include/ndb_global.h.in:
specify alignment needed for odirect
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
read odirect config param
open LCP and Backup datafiles with odirect if specified
insert empty padding record if odirect is used
allocate buffers aligned to be able to use odirect
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
odirect and padding options
storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp:
add empty_record in file format
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
read odirect config and allocate aligned
storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp:
correct debug printouts
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
read odirect config param and align buffers
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
read odirect config param and align buffers
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
read config params and open redo log files with odirect if set
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
aligned writing for odirect
correct odirect open options with test+fallback if odirect fails
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
align + odirect check
storage/ndb/src/kernel/blocks/restore.cpp:
restor block to ignore new lcp padding empty_record
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
alligend log buffer allocation for odirect
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
alligend log buffer allocation for odirect
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
new config param for odirect, default false
storage/ndb/tools/restore/Restore.cpp:
ndb_restore to skip empty_record alignment padding in backup file
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
add new configuration parameter TimeBetweenWatchDogCheckInitial
storage/ndb/include/portlib/NdbTick.h:
enable timing code
storage/ndb/src/common/portlib/NdbTick.c:
enable timing code
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
read watchdog timeout to set it after malloc
storage/ndb/src/kernel/vm/Configuration.cpp:
read initial watchdog timeout and set it in the beginning
storage/ndb/src/kernel/vm/Configuration.hpp:
read initial watchdog timeout and set it in the beginning
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
introduce new state for "action" malloc of memory
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
introduce new state for "action" malloc of memory
storage/ndb/src/kernel/vm/WatchDog.cpp:
rewrite watchdog to check every 100ms for being stuch, but keep shutdown after 3 * interval
for "action" == 9 (malloc) keep old behavior and only output every interval
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
add new configuration parameter TimeBetweenWatchDogCheckInitial
storage/ndb/src/kernel/blocks/pgman.cpp:
a) in one case pl_queue.remove(ptr) was not followed
by state &= ~ Page_entry::ONQUEUE.
b) when collecting initial hot entries have to remove
from queue if somehow got there.
b) is easy to get with large buffer cache (256M).
a) or b) is probably cause of bug#20612.
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
storage/ndb/src/common/transporter/Packer.cpp:
Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
manual merge
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
manual merge
storage/ndb/test/run-test/daily-basic-tests.txt:
manual merge
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
storage/ndb/src/kernel/vm/WatchDog.cpp:
Auto merged
storage/ndb/test/include/NdbRestarter.hpp:
manual merge
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
manual merge
storage/ndb/test/ndbapi/testNodeRestart.cpp:
manual merge
storage/ndb/src/kernel/blocks/pgman.cpp:
Under heavy insert PGMAN can run out of page entries
even when set to 100 times page cache entries.
In this use pattern the extra entries remain idle
on LIRS stack. Only ONSTACK is set. There is not
enough activity to free them the normal way.
A study of PGMAN / DBTUP behaviour is needed.
This patch adds new sublist SL_IDLE. When page entry
pool is empty, an idle entry is released from SL_IDLE
front if there is any. Otherwise, we still crash.
The factor above is set from 100 to 10 (still high).
storage/ndb/src/kernel/blocks/pgman.hpp:
Under heavy insert PGMAN can run out of page entries
even when set to 100 times page cache entries.
In this use pattern the extra entries remain idle
on LIRS stack. Only ONSTACK is set. There is not
enough activity to free them the normal way.
A study of PGMAN / DBTUP behaviour is needed.
This patch adds new sublist SL_IDLE. When page entry
pool is empty, an idle entry is released from SL_IDLE
front if there is any. Otherwise, we still crash.
The factor above is set from 100 to 10 (still high).
- change to scan in tup and disk order (if applicable)
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
tup scan for backup also, not only lcp
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
choose disk order scan for disktables during backup
+ move bug workaround for 27776 from tup to lqh
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
add missing jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
move bug workaround for 27776 from tup to lqh
storage/ndb/src/kernel/blocks/pgman.cpp:
missing jamEntry
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
storage/ndb/src/common/transporter/Packer.cpp:
Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
merge
storage/ndb/test/run-test/daily-basic-tests.txt:
merge
disable "disable expand check" as it does not solve problems anyway
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
disable "disable expand check" as it does not solve problems anyway
remove LCP files when dropping table
storage/ndb/include/kernel/signaldata/FsOpenReq.hpp:
add tup as user (for fsremove)
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
add remove LCP stuff
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
add remove LCP stuff
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
remove each LCP file regardless if present or not
set null bits on delete+insert
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
set null bits on delete+insert
storage/ndb/test/ndbapi/testBasic.cpp:
set null bits on delete+insert
20535
storage/ndb/test/run-test/daily-basic-tests.txt:
testcase
fix commit triggers with DD but not using DD
storage/ndb/include/kernel/signaldata/TupCommit.hpp:
add diskpage
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
add diskpage
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
pass disk/nodisk down detachedtrigger-path
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
use TUPCOMMIT req for signaling diskpage back and forth
so that I can init pointers (VM_TRACE) when from LQH
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
remove niclude
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
only derefence disk pointer if needed
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Fix forceVarPart also for ordered indexes
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Add new table flag
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
set null ref in case of force var part
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
add varref also for force var part
storage/ndb/test/src/NDBT_Tables.cpp:
"randomly" set forcevart on NDBT tables
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
When running nodes return AllocNodeIdRef::NodeFailureHandlingNotCompleted error during applying the node id for restarting nodes, it should try again.
storage/ndb/src/ndbapi/ndberror.c:
change AllocNodeIdRef::NodeFailureHandlingNotCompleted error from permanent error to temporary error
sql/ha_ndbcluster.cc:
WL#1190 preparatory work needed for compatability with future online add column
- make forcing of var part reference into ndb storage default, may be overridden by table setting ROW_FORMAT=FIXED
mysql-test/r/ndb_row_format.result:
New BitKeeper file ``mysql-test/r/ndb_row_format.result''
mysql-test/t/ndb_row_format.test:
New BitKeeper file ``mysql-test/t/ndb_row_format.test''
clean up varsize
by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
clean up varsize
by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
clean up varsize
by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
clean up varsize
by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
clean up varsize
by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
clean up varsize
by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
clean up varsize
by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
clean up varsize
by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
clean up varsize
by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp:
clean up varsize
by putting varpart ref "inside" fixpart instead of "optionally" at the end
into ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca
storage/ndb/test/include/HugoOperations.hpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/test/src/HugoOperations.cpp:
Auto merged
storage/ndb/test/ndbapi/testBasic.cpp:
SCCS merged
