into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
mysql-test/r/view.result:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
Auto merged
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
Auto merged
configure.in:
manual merge
sql/ha_ndbcluster.cc:
manual merge
sql/share/errmsg.txt:
manual merge
storage/ndb/src/mgmsrv/Services.cpp:
manual merge
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
merge
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/51-work
support-files/mysql.spec.sh:
Auto merged
storage/ndb/include/util/SocketServer.hpp:
Auto merged
storage/ndb/src/common/transporter/Transporter.cpp:
Auto merged
storage/ndb/src/common/util/SocketServer.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/51-jonas
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
- the replica info was not stored in byte order indepentent format
- backup/restore still compatible 5.0->5.1
- but patch makes previous 5.1 versions completely incompatible
1) relax version check for restore block since no changes has happend since 5.1.6
and improve error message on check failure
2) improve lcp/backup max write size...
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
Increase max write size to 256k (currently not configurable...)
storage/ndb/src/kernel/blocks/restore.cpp:
Relax version check for restore block since no changes has happend since 5.1.6
storage/ndb/src/kernel/blocks/restore.hpp:
Relax version check for restore block since no changes has happend since 5.1.6
client/mysql.cc:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/t/rpl_relayrotate.test:
Auto merged
mysys/mf_keycache.c:
Auto merged
BitKeeper/deleted/.del-innodb_unsafe_binlog-master.opt~9cbe1bb3d8696c5b:
Auto merged
mysql-test/t/rpl_stm_until.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/unireg.h:
Auto merged
storage/ndb/src/kernel/SimBlockList.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
Auto merged
Fix various abort cases (mainly MM but also 1 DD)
that has been found running dbt2
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
Fix abort case
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
Set page dirty even if in cache
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Fix abort case
storage/ndb/test/ndbapi/testBasic.cpp:
Add new testcases for various abort cases
storage/ndb/test/run-test/daily-basic-tests.txt:
Add autotest of various abort cases
bug#19141, bug#18575
Maek sure global dict lock is taken during create/drop file/filegroup
storage/ndb/include/kernel/signaldata/DropFilegroup.hpp:
Fix error code
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Fix c_blockState lock for createdrop file/filegroup
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Fix not master for create/drop file
A-insert/B-insert/A-rollback/B-rollback leads to node crash, as bits in tuple header gets incorrectly assigned in second insert
this also likely fixes bug 18589 and explains 18808
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
remove debug printout
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Make sure that alloc bit is set if insert and first_op
storage/ndb/test/ndbapi/testBasic.cpp:
testcase for bug#19245
storage/ndb/test/run-test/daily-basic-tests.txt:
testcase for bug#19245
fix bug#19244, dd page got locked in page cache
likely fix bug 18780
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
Fix so that insert/delete on DD does not lock page forever in memory
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
Set page to dirty when aborting prealloc
fix memory corruption in event-api
maybe bug fix for 18621, 19154, 19172, 19174
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Make sure that nasty c++ features arent run on Gci_container as it's supposed to be POD!
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
Make sure that nasty c++ features arent run on Gci_container as it's supposed to be POD!
- added compatability with 5.0
- added test case for compatability with 5.0 and 5.1
mysql-test/std_data/ndb_backup50/BACKUP-1-0.1.Data:
New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1-0.1.Data''
mysql-test/std_data/ndb_backup50/BACKUP-1-0.2.Data:
New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1-0.2.Data''
mysql-test/std_data/ndb_backup50/BACKUP-1.1.log:
New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1.1.log''
mysql-test/std_data/ndb_backup50/BACKUP-1.2.log:
New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1.2.log''
mysql-test/std_data/ndb_backup51/BACKUP-1-0.1.Data:
New BitKeeper file ``mysql-test/std_data/ndb_backup51/BACKUP-1-0.1.Data''
mysql-test/std_data/ndb_backup51/BACKUP-1-0.2.Data:
New BitKeeper file ``mysql-test/std_data/ndb_backup51/BACKUP-1-0.2.Data''
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
storage/ndb/include/kernel/signaldata/TupFrag.hpp:
Auto merged
storage/ndb/include/util/NdbSqlUtil.hpp:
Auto merged
storage/ndb/src/common/util/NdbSqlUtil.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
Auto merged
mysql-test/r/ndb_bitfield.result:
Merge, will generate new result file manually
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Merge
crash of mysqld due to null tOp in
NdbTransaction::getNdbIndexScanOperation(NdbIndexImpl*,NdbTableImpl*)
storage/ndb/src/ndbapi/NdbTransaction.cpp:
tOp could be null, don't fiddle with it if it is.
Make sure that SUB_GCP_COMPLETE_ACK is sent uncond, failure to do so can lead to problems...
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
retry on O_DIRECT
storage/ndb/src/ndbapi/TransporterFacade.cpp:
Make sure that SUB_GCP_COMPLETE_ACK is sent uncond
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
storage/ndb/src/ndbapi/TransporterFacade.hpp:
Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
merge
Add abort in reception of invalid/inconsistent SUB_GCP_COMPLETE_REP
as proceeding (in release wo/ asserts) make mysqld crash in mysterious ways
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Add abort in reception of invalid/inconsistent SUB_GCP_COMPLETE_REP
as proceeding (in release wo/ asserts) make mysqld crash in mysterious ways
storage/ndb/src/ndbapi/NdbBlob.cpp:
set part id from main table op (may not be complete fix)
storage/ndb/src/ndbapi/NdbOperationSearch.cpp:
log partition id set/get
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
client/mysqltest.c:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
mysql-test/t/disabled.def:
manual merge
Fix 4 replica bug in packLqhKeyReq, problem introduced by opt. nr.
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Fix packLqhKeyReqLab when having full AI in this and appending gci/rowid (used to casue 23+3 = 26 in signal length)
Note: This is a very ineffectice patch, but only for 4 replicas
This will be fixed when sending lqhkeyreq as long signal (or even just attrinfo as long)
BUILD/compile-dist:
fixes for 'make dist' and 'make distcheck'
include yassl in "dist"
Makefile.am:
fixes for 'make dist' and 'make distcheck'
remove double-listing of everything in SUBDIRS and DIST_SUBDIRS
remove @yassl_dir@, it belongs to extra/Makefile.am
specify --basedir for mysql_install_db, in case builddir (where mysql_install_db is)
differs from srcdir (where mysql_fix_privilege_tables.sql is)
config/ac-macros/yassl.m4:
fixes for 'make dist' and 'make distcheck'
create Makefile's only if yassl is used
yassl_dir must not include /
config/ac-macros/zlib.m4:
fixes for 'make dist' and 'make distcheck'
create Makefile only if zlib is used
configure.in:
fixes for 'make dist' and 'make distcheck'
create Makefile only if a feature is enabled
storage engine dirs must not include /
automatically disable readline/libedit/sql-bench if source dir is missing
extra/Makefile.am:
fixes for 'make dist' and 'make distcheck'
remove SUBDIR/DIST_SUBDIR hack
libmysql_r/Makefile.am:
fixes for 'make dist' and 'make distcheck'
when symlinking all files from libmysql/ take into account that
srcdir != builddir
libmysqld/Makefile.am:
fixes for 'make dist' and 'make distcheck'
remove fragile promiscuous search for object files
if .o file is not where we look for it - extract it from the library
mysql-test/ndb/Makefile.am:
fixes for 'make dist' and 'make distcheck'
ndbcluster script is not a "source"
don't forget to cleanup
plugin/Makefile.am:
fixes for 'make dist' and 'make distcheck'
include plugin/fulltext/configure.in template in the distribution
storage/Makefile.am:
fixes for 'make dist' and 'make distcheck'
remove SUBDIRS/DIST_SUBDIRS hack
storage/ndb/Makefile.am:
fixes for 'make dist' and 'make distcheck'
force common.mk.am out of DIST_COMMON (which is otherwise an
auto-generated list of Makefile's sources) because it's listed
indirectly in EXTRA_DIST, and with bk -r get, a file cannot be copied
twice.
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbLinHash.hpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/51-work
libmysql/libmysql.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql-common/client.c:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/include/kernel/signaldata/StopReq.hpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/51-jonas
storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/FailRep.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/StopReq.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/WaitGCP.hpp:
Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
storage/ndb/test/src/NdbRestarts.cpp:
Auto merged
storage/ndb/include/mgmapi/ndb_logevent.h:
merge
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
merge
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
merge
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
merge
storage/ndb/test/run-test/daily-basic-tests.txt:
merge
into mysql.com:/opt/local/work/mysql-5.1-merge
mysql-test/r/loaddata.result:
Auto merged
mysql-test/r/ndb_read_multi_range.result:
Auto merged
mysql-test/t/loaddata.test:
Auto merged
mysql-test/t/ndb_read_multi_range.test:
Auto merged
sql/field.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_load.cc:
Auto merged
storage/ndb/tools/Makefile.am:
Auto merged
This removes a warning about missing DBUG_ENTER while running tests
mysql-test/t/disabled.def:
Disable test rpl_ndb_multi_update3 that randomly fails on Intel64
into mysql.com:/home/my/mysql-5.1
mysql-test/r/ndb_condition_pushdown.result:
Auto merged
mysql-test/t/ndb_condition_pushdown.test:
Auto merged
sql/ha_heap.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/log.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
Added missing DBUG_xxx_RETURN statements
Fixed some usage of not initialized variables (as found by valgrind)
Ensure that we don't remove locked tables used as name locks from open table cache until unlock_table_names() are called.
This was fixed by having drop_locked_name() returning any table used as a name lock so that we can free it in unlock_table_names()
This will allow Tomas to continue with his work to use namelocks to syncronize things.
Note: valgrind still produces a lot of warnings about using not initialized code and shows memory loss errors when running the ndb tests
BitKeeper/etc/ignore:
added mysql-test/r/*.log
client/mysqltest.c:
Change type of variables to get rid of compiler warnings
More debugging
Fix memory leak
mysql-test/mysql-test-run.sh:
Collect warnings about missing DBUG_RETURN statements
mysql-test/r/lock_multi.result:
Add test of new code
mysql-test/r/ndb_condition_pushdown.result:
Drop used tables before test
mysql-test/t/lock_multi.test:
Add test of new code
mysql-test/t/ndb_condition_pushdown.test:
Drop used tables before test
mysql-test/valgrind.supp:
Ignore 'safe' warnings from libz (when used with archive)
sql/event.cc:
More comments
Simplify code
Fixed memory leak found by valgrind
sql/ha_archive.cc:
Remove compiler warnings (Wrong handlerton structure and signed/unsigned comparison)
sql/ha_berkeley.cc:
Fixed compiler warning
sql/ha_blackhole.cc:
Fixed compiler warning
sql/ha_federated.cc:
Fixed compiler warning
sql/ha_heap.cc:
Fixed compiler warning
sql/ha_myisam.cc:
Fixed compiler warning
sql/ha_myisammrg.cc:
Fixed compiler warning
sql/ha_ndbcluster.cc:
Fixed compiler warnings
sql/ha_partition.cc:
Fixed compiler warning
Fixed error noticed by valgrind in ha_partition::rnd_init()
sql/handler.cc:
Fixed compiler warning
sql/handler.h:
Fixed compiler warning
sql/item.cc:
Fixed compiler warning
sql/item_xmlfunc.cc:
Fixed warning from valgrind when calling memcpy with wrong address
sql/lock.cc:
More debugging
sql/log.cc:
Fixed compiler warning
Indentation fixes
sql/log.h:
Fixed compiler warning
sql/mysql_priv.h:
Changed prototype for 'drop_locked_tables'
sql/opt_range.cc:
Indentation fix
sql/password.c:
Removed compiler warnings
sql/set_var.cc:
Fixed compiler warning
sql/slave.cc:
Fixed compiler warning
sql/sp_head.cc:
Fixed compiler warning
sql/sql_acl.cc:
Fixed compiler warning
sql/sql_analyse.cc:
Added missing DBUG_RETURN statements
sql/sql_base.cc:
Removed de-reference of not initialized pointer
More comments
drop_locked_tables() changed to not delete tables used for name locking
Fixed compiler warnings
sql/sql_delete.cc:
Fixed usage of not initialized variable
(deleted could be referenced in some not common error conditions)
sql/sql_parse.cc:
Added missing DBUG_VOID_RETURN
Simplify code
sql/sql_partition.cc:
Fixed usage of wrong variable (noticed by valgrind)
sql/sql_plugin.cc:
Removed compiler warning
sql/sql_show.cc:
Removed compiler warning
sql/sql_table.cc:
Ensure that we don't remove locked tables used as name locks from open table cache until unlock_table_names() are called.
This was fixed by having drop_locked_name() returning any table used as a name lock so that we can free it in unlock_table_names()
This will allow Tomas to continue with his work to use namelocks to syncronize things.
Fixed wrong test of 'table_type' (path_length could otherwise be accessed uninitialized)
Remove compile warnings about not initialized variables.
sql/sql_yacc.yy:
Ensure that no_write_to_binlog is properly initialized
(Was accessed uninitialized by partition code)
sql/table.cc:
Removed valgrind warnings (not fatal)
Removed compiler warnings
sql/tztime.cc:
Removed valgrind warning
storage/ndb/include/ndbapi/NdbIndexStat.hpp:
Removed compiler warning
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
storage/ndb/test/src/NdbBackup.cpp:
Auto merged
storage/ndb/test/src/NdbRestarts.cpp:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
merge
still some compiler warnings
storage/ndb/include/util/OutputStream.hpp:
still some compiler warnings
storage/ndb/include/util/SimpleProperties.hpp:
still some compiler warnings
storage/ndb/src/kernel/vm/Pool.hpp:
still some compiler warnings
- make sure cluster/schema table is always created first
sql/ha_ndbcluster_binlog.cc:
make sure cluster/schema table is always created first
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
corrected bug causing hang in getTable when using blob tables
rewrite/clean up code a bit to avoid a gcc4 compiler bug
storage/ndb/src/kernel/vm/DLFifoList.hpp:
Fix compiler bug
storage/ndb/src/kernel/vm/DLList.hpp:
Fix compiler bug
storage/ndb/src/kernel/vm/SLList.hpp:
Fix compiler bug
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
mysql-test/lib/mtr_timer.pl:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_innodb.cc:
Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/StartPerm.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/TcContinueB.hpp:
Auto merged
storage/ndb/include/mgmapi/ndbd_exit_codes.h:
Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
Auto merged
storage/ndb/src/kernel/vm/TransporterCallback.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
storage/ndb/test/include/NdbRestarter.hpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
storage/ndb/test/ndbapi/testSystemRestart.cpp:
Auto merged
storage/ndb/test/ndbapi/testTimeout.cpp:
Auto merged
storage/ndb/test/run-test/conf-daily-devel-ndbmaster.txt:
Auto merged
storage/ndb/test/run-test/conf-dl145a.txt:
Auto merged
storage/ndb/test/run-test/conf-ndbmaster.txt:
Auto merged
storage/ndb/test/run-test/ndb-autotest.sh:
Auto merged
storage/ndb/test/src/NdbRestarter.cpp:
Auto merged
storage/ndb/test/run-test/conf-shark.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
merge
storage/ndb/src/ndbapi/TransporterFacade.hpp:
merge
storage/ndb/test/run-test/Makefile.am:
merge
storage/ndb/test/run-test/daily-basic-tests.txt:
merge
storage/ndb/tools/desc.cpp:
merge
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
mysql-test/r/ndb_insert.result:
Auto merged
mysql-test/r/ndb_replace.result:
Auto merged
storage/ndb/include/ndbapi/NdbIndexOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Keeping local and do manual merge
sql/ha_ndbcluster.h:
Keeping local and do hand merge
incorrect handling of varsize primary key and charsets in tup-scan
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
put tracenr log in signal log instead...as out file gets very big...
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
PK needs to be normalized before computing hashvalue, otherwise lock-req will not find row,
causing assertion in debug build, and inconsistency in release
put nrtrace in out file instead (debug compiled..)
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
put nrtrace in out file instead (debug compiled..)
Dont put object file in list of SOURCES...causing really weird make dist problem
storage/ndb/src/kernel/vm/Makefile.am:
Dont put object file in list of SOURCES...causing really weird make dist problem
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/ndb_binlog_ddl_multi.test:
Auto merged
sql/rpl_injector.cc:
Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
sql/ha_ndbcluster_binlog.cc:
manual merge
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
+ removed extra binlog events generated by drop table schema ops to produce predictable test cases
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
ndb: dict use define for number of pages in table definition
implement limitation with only on logfile group, since SR is really buggy with several
mysql-test/r/ndb_dd_ddl.result:
Test that only 1 logfile group can be created
mysql-test/r/ndb_dd_dump.result:
Test that only 1 logfile group can be created
mysql-test/t/ndb_dd_ddl.test:
Test that only 1 logfile group can be created
mysql-test/t/ndb_dd_dump.test:
Test that only 1 logfile group can be created
storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp:
New error code for "only one logfile group" limitation
storage/ndb/src/kernel/blocks/lgman.cpp:
New error code for "only one logfile group" limitation
storage/ndb/src/ndbapi/ndberror.c:
New error code for "only one logfile group" limitation
mysql-test/r/rpl_ndb_blob.result:
test case for varsize PK + blob
mysql-test/t/rpl_ndb_blob.test:
test case for varsize PK + blob
storage/ndb/include/ndbapi/NdbBlob.hpp:
table PK in blob part key is fixed-sized so keep extra bytes zero if varsize PK
storage/ndb/src/ndbapi/NdbBlob.cpp:
table PK in blob part key is fixed-sized so keep extra bytes zero if varsize PK
sql/ha_ndbcluster_binlog.cc:
Bug #18106 Ndb: Online add index together with replication may cause mysqld core
- move initialization of Ndb share ndb_values from ndbcluster_binlog_open_table to
ndbcluster_binlog_init_share so that ndbcluster_binlog_open_table can be used for reinitializing
after frm change
- free table share on remote mysqld on online alter (call ndbcluster_binlog_close_table)
- free share before calling ndb_create_table_from_engine to be able to handle trailing share correctly
+ debug printouts
+ extra nulling of some variables
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Bug #18106 Ndb: Online add index together with replication may cause mysqld core
- reinitialize event operation rec attrs after online schema change
storage/ndb/src/kernel/blocks/lgman.cpp:
Fix sync_lsn so that it uses correct logfile group
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Make NdbDictionary wait much longer than 2 minutes
storage/ndb/include/ndbapi/NdbBlob.hpp:
fast fix bug#18075
storage/ndb/include/ndbapi/NdbOperation.hpp:
fast fix bug#18075
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
fast fix bug#18075
storage/ndb/src/ndbapi/NdbBlob.cpp:
fast fix bug#18075
storage/ndb/src/ndbapi/NdbBlobImpl.hpp:
fast fix bug#18075
storage/ndb/src/ndbapi/NdbOperationSearch.cpp:
fast fix bug#18075
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
fast fix bug#18075
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
fast fix bug#18075
storage/ndb/src/ndbapi/ndberror.c:
fast fix bug#18075
storage/ndb/test/ndbapi/testBlobs.cpp:
fast fix bug#18075
handle out of string buffer when creating triggers
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Handle out of string buffer memory, while creating triggers
Make sure that senderData value in communiation with LQH does not get overwritten by incorrect union
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
Fix union, or otherwise values will be over written
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
oops (but did not affect previous patch)
storage/ndb/include/ndbapi/NdbDictionary.hpp:
allow NDB API programs direct access to blob tables via main table or by name (hack)
storage/ndb/src/ndbapi/NdbDictionary.cpp:
allow NDB API programs direct access to blob tables via main table or by name (hack)
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
allow NDB API programs direct access to blob tables via main table or by name (hack)
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
allow NDB API programs direct access to blob tables via main table or by name (hack)
storage/ndb/src/ndbapi/ndberror.c:
allow NDB API programs direct access to blob tables via main table or by name (hack)
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
parse blob table name (temp hack)
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
parse blob table name (temp hack)
storage/ndb/src/ndbapi/DictCache.cpp:
do not put blob tables in ndb api dict cache
main table is cached and blob tables are owned by its blob columns
storage/ndb/src/ndbapi/Ndb.cpp:
do not put blob tables in ndb api dict cache
main table is cached and blob tables are owned by its blob columns
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
do not put blob tables in ndb api dict cache
main table is cached and blob tables are owned by its blob columns
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
do not put blob tables in ndb api dict cache
main table is cached and blob tables are owned by its blob columns
add disk option to various bank tests
storage/ndb/test/include/NDBT_Tables.hpp:
Make create_default_tablespace public
storage/ndb/test/ndbapi/bank/Bank.cpp:
use const char*
storage/ndb/test/ndbapi/bank/Bank.hpp:
add disk option
storage/ndb/test/ndbapi/bank/BankLoad.cpp:
add disk option
storage/ndb/test/ndbapi/bank/bankCreator.cpp:
Add disk option to bankCreator
storage/ndb/test/ndbapi/bank/testBank.cpp:
use const char*
storage/ndb/test/ndbapi/testSRBank.cpp:
Add disk option to testSRBank
storage/ndb/test/src/NDBT_Tables.cpp:
Make create_default_tablespace public
Use shared pool for logfile group/undofiles in lgman
storage/ndb/src/kernel/blocks/lgman.cpp:
Use shared pool for logfile group/undofiles in lgman
storage/ndb/src/kernel/blocks/lgman.hpp:
Use shared pool for logfile group/undofiles in lgman
Use shared pool for tablespaces/datafiles in tsman
storage/ndb/src/kernel/blocks/tsman.cpp:
Use shared pool for tablespaces/datafiles in tsman
storage/ndb/src/kernel/blocks/tsman.hpp:
Use shared pool for tablespaces/datafiles in tsman
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
by-pass dict cache when creating blob event op
does get event using table stored under main event op
in preparation to remove blob tables from dict cache
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
by-pass dict cache when creating blob event op
does get event using table stored under main event op
in preparation to remove blob tables from dict cache
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
by-pass dict cache when creating blob event op
does get event using table stored under main event op
in preparation to remove blob tables from dict cache
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
by-pass dict cache when creating blob event op
does get event using table stored under main event op
in preparation to remove blob tables from dict cache
Make Dbtup::Extent_info use RWPool for dynamic memory
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Use DLCFifoList as noOfElement() is _very_ slow
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
Use DLCFifoList as noOfElement() is _very_ slow
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
remove usage of DLHashTable::release(ptr, key)
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
remove usage of DLHashTable::release(ptr, key)
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Use RWPool for extent_info
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
Use RWPool for extent_info
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Use RWPool for extent_info
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
Use RWPool for extent_info
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
Use RWPool for extent_info
storage/ndb/src/kernel/blocks/lgman.cpp:
Fix assertion when using multiple undo files...
storage/ndb/src/kernel/vm/DLHashTable.hpp:
Add template arg (pool) to DLHashTable
storage/ndb/src/kernel/vm/DLList.hpp:
Add template arg (pool) to DLList
storage/ndb/src/kernel/vm/RWPool.cpp:
Add debug printout
storage/ndb/src/kernel/vm/RWPool.hpp:
Add #ifdef to WOPool
storage/ndb/src/kernel/vm/SLList.hpp:
Add template arg (pool) to SLList
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
Include pools
storage/ndb/src/kernel/vm/WOPool.hpp:
Add #ifdef to WOPool
into perch.ndb.mysql.com:/home/jonas/src/51-ndb
storage/ndb/include/kernel/ndb_limits.h:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
Auto merged
storage/ndb/src/kernel/blocks/lgman.cpp:
Auto merged
storage/ndb/src/kernel/blocks/lgman.hpp:
Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
Auto merged
storage/ndb/src/kernel/SimBlockList.cpp:
merge
configure.in:
Auto merged
client/mysqlimport.c:
Auto merged
include/config-win.h:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/disabled.def:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/field.h:
Auto merged
sql/log_event.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/t/mysqldump.test:
SCCS merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
blob fix 1: cache no tables at create.
previously main table was cached before blob tables were ready.
autoincr fix to avoid caching as side-effect.
also removes some rename fix where createBlobTables had old/new args.
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
blob fix 1: cache no tables at create.
previously main table was cached before blob tables were ready.
autoincr fix to avoid caching as side-effect.
also removes some rename fix where createBlobTables had old/new args.
storage/ndb/src/ndbapi/ndberror.c:
blob fix 1: cache no tables at create.
previously main table was cached before blob tables were ready.
autoincr fix to avoid caching as side-effect.
also removes some rename fix where createBlobTables had old/new args.
convert Dbtup::Page_request and pgman::Page_request to WOPool
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
remove bad method call
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Convert disk records to shared global mem users
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
Convert disk records to shared global mem users
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Convert disk records to shared global mem users
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Make buddy is initialized first
storage/ndb/src/kernel/blocks/pgman.cpp:
Convert disk records to shared global mem users
storage/ndb/src/kernel/blocks/pgman.hpp:
Convert disk records to shared global mem users
storage/ndb/src/kernel/vm/DLFifoList.hpp:
Made pool templ. ag of DLFifoList + cleanup some
storage/ndb/src/kernel/vm/SLFifoList.hpp:
Add a few likely's + format some code
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
Add records types to blocks includes
into mysql.com:/home/my/mysql-5.1
BitKeeper/deleted/.del-innodb_notembedded.test:
Delete: mysql-test/t/innodb_notembedded.test
BitKeeper/deleted/.del-sp_notembedded.test:
Delete: mysql-test/t/sp_notembedded.test
BitKeeper/deleted/.del-subselect_notembedded.test:
Delete: mysql-test/t/subselect_notembedded.test
BitKeeper/deleted/.del-ctype_cp932_notembedded.result:
Delete: mysql-test/r/ctype_cp932_notembedded.result
BitKeeper/deleted/.del-innodb_notembedded.result:
Delete: mysql-test/r/innodb_notembedded.result
BitKeeper/deleted/.del-sp_notembedded.result:
Delete: mysql-test/r/sp_notembedded.result
BitKeeper/deleted/.del-subselect_notembedded.result:
Delete: mysql-test/r/subselect_notembedded.result
configure.in:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/emb_qcache.cc:
Auto merged
libmysqld/embedded_priv.h:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/query_cache_notembedded.result:
Auto merged
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/backup.test:
Auto merged
mysql-test/t/compress.test:
Auto merged
mysql-test/t/delayed.test:
Auto merged
mysql-test/t/handler.test:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/mysql_client_test.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/query_cache_notembedded.test:
Auto merged
mysql-test/t/read_only.test:
Auto merged
mysql-test/t/skip_grants.test:
Auto merged
mysql-test/t/sp-destruct.test:
Auto merged
mysql-test/t/sp-error.test:
Auto merged
mysql-test/t/sp-threads.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/temp_table.test:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
mysql-test/t/wait_timeout.test:
Auto merged
mysys/mf_dirname.c:
Auto merged
sql/field.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.h:
Auto merged
sql/log_event.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/protocol.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_cursor.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/table.h:
Auto merged
sql/tztime.cc:
Auto merged
sql/tztime.h:
Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
tests/mysql_client_test.c:
Auto merged
libmysqld/lib_sql.cc:
Manual merge
mysql-test/extra/binlog_tests/binlog.test:
Manual merge
mysql-test/extra/binlog_tests/ctype_cp932.test:
No changes
mysql-test/r/binlog_stm_binlog.result:
Manual merge
mysql-test/r/binlog_stm_ctype_cp932.result:
No changes
mysql-test/t/innodb.test:
Manual merge
mysql-test/t/view.test:
Manual merge
mysys/my_bitmap.c:
Manual merge
scripts/mysql_fix_privilege_tables.sql:
Manual merge
sql/item.cc:
Manual merge
sql/sql_cache.h:
Manual merge
sql/sql_class.h:
Manual merge
sql/sql_update.cc:
Manual merge
storage/ndb/src/common/transporter/Transporter.cpp:
use sockaddr_in in declarations to guarantee sin_addr alignment
storage/ndb/src/mgmsrv/Services.cpp:
use sockaddr_in in declarations to guarantee sin_addr alignment
into eel.(none):/home/jonas/src/mysql-5.1-new
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
Auto merged
storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp:
merge
fix static log waiter pool
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Clear shared pool to prevent double free at shutdown
storage/ndb/src/kernel/blocks/lgman.cpp:
Update to use WOPool and SLFifoList
storage/ndb/src/kernel/blocks/lgman.hpp:
Use WOPool for log waiters
storage/ndb/src/kernel/blocks/record_types.hpp:
Update record types
storage/ndb/src/kernel/vm/ArrayPool.hpp:
New method
storage/ndb/src/kernel/vm/Makefile.am:
Add WOPool
storage/ndb/src/kernel/vm/Pool.cpp:
New BitKeeper file ``storage/ndb/src/kernel/vm/Pool.cpp''
storage/ndb/src/kernel/vm/Pool.hpp:
New methods
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
remove unused parameters
storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp:
remove unused parameters
storage/ndb/src/kernel/vm/SLFifoList.hpp:
New BitKeeper file ``storage/ndb/src/kernel/vm/SLFifoList.hpp''
storage/ndb/src/kernel/vm/WOPool.cpp:
New BitKeeper file ``storage/ndb/src/kernel/vm/WOPool.cpp''
storage/ndb/src/kernel/vm/WOPool.hpp:
New BitKeeper file ``storage/ndb/src/kernel/vm/WOPool.hpp''
Fix incorrect assumption that sync(lsn) will be in order
keep track of max sync(lsn)
storage/ndb/src/kernel/blocks/lgman.cpp:
Fix incorrect assumption that sync(lsn) will be in order
keep track of max sync(lsn)
storage/ndb/src/kernel/blocks/lgman.hpp:
Fix incorrect assumption that sync(lsn) will be in order
keep track of max sync(lsn)
some more printouts in unit test of buddy
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
Some more printouts
storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp:
Some more util methods
storage/ndb/include/kernel/ndb_limits.h:
remove hardcoded limit
storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp:
Add new format "shared" page to easily migrate from/to superpool
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
Introduce new config parameter for "SharedGlobalMemory",
only user is so far undo log buffer memory
storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp:
Add new format "shared" page to easily migrate from/to superpool
storage/ndb/src/kernel/SimBlockList.cpp:
Fix compiler error
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Add new format "shared" page to easily migrate from/to superpool
storage/ndb/src/kernel/blocks/lgman.cpp:
Add new format "shared" page to easily migrate from/to superpool
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
Add new format "shared" page to easily migrate from/to superpool
storage/ndb/src/kernel/vm/GlobalData.hpp:
Add new format "shared" page to easily migrate from/to superpool
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
Add new format "shared" page to easily migrate from/to superpool
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
Add new format "shared" page to easily migrate from/to superpool
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
better startup printouts
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Introduce new config parameter for "SharedGlobalMemory",
only user is so far undo log buffer memory
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
Fix bug in handling of my.cnf files
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Auto merged
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/ha_ndbcluster_binlog.h:
Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Merge
- add resource limit to buddy allocator
storage/ndb/src/kernel/SimBlockList.cpp:
Add emulator data to args
storage/ndb/src/kernel/blocks/record_types.hpp:
Update record types
storage/ndb/src/kernel/main.cpp:
Add emulator data to args
storage/ndb/src/kernel/vm/Emulator.cpp:
Add emulator data to args
storage/ndb/src/kernel/vm/Emulator.hpp:
Add emulator data to args
storage/ndb/src/kernel/vm/Makefile.am:
Add emulator data to args
storage/ndb/src/kernel/vm/Pool.hpp:
Update
storage/ndb/src/kernel/vm/SimBlockList.hpp:
Add emulator data to args
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
Add emulator data to args
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
use resource_limit in buddy
storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp:
Add emulator data to args
storage/ndb/src/kernel/vm/Pool.cpp:
New BitKeeper file ``storage/ndb/src/kernel/vm/Pool.cpp''
storage/ndb/src/ndbapi/NdbBlob.cpp:
DBUG
storage/ndb/include/ndbapi/Ndb.hpp:
method to set db/schema from table name + format check in internalize_table_name
storage/ndb/include/ndbapi/NdbDictionary.hpp:
method to set db/schema from table name + format check in internalize_table_name
storage/ndb/src/ndbapi/Ndb.cpp:
method to set db/schema from table name + format check in internalize_table_name
sql/ha_ndbcluster_binlog.cc:
set injector_ndb db/schema before calling NDB (may be more cases..). only place to get it is table internal name
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
sync create tabe to undo log, so that undo for other table is not run after SR
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Sync create table in undo log
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
Sync create table in undo log
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb_improved_on-line_discover
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Merge
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
into mysql.com:/home/stewart/Documents/MySQL/5.1/new
storage/ndb/include/util/File.hpp:
Auto merged
storage/ndb/src/common/portlib/NdbConfig.c:
Auto merged
storage/ndb/src/common/util/File.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_select.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
client/mysqlslap.c:
SCCS merged
configure.in:
SCCS merged
libmysql/libmysql.c:
SCCS merged
mysys/my_init.c:
SCCS merged
1. dbug state is now local to a thread
2. new macros: DBUG_EXPLAIN, DBUG_EXPLAIN_INITIAL,
DBUG_SET, DBUG_SET_INITIAL, DBUG_EVALUATE, DBUG_EVALUATE_IF
3. macros are do{}while(0) wrapped
4. incremental modifications to the dbug state (e.g. "+d,info:-t")
5. dbug code cleanup, style fixes
6. _db_on_ and DEBUGGER_ON/OFF removed
7. rest of MySQL code fixed because of 3 (missing ;) and 6
8. dbug manual updated
9. server variable @@debug (global and local) to control dbug from SQL!
a. -#T to print timestamps in the log
BitKeeper/deleted/.del-readme.prof~2f3bae1550a0038d:
Delete: dbug/readme.prof
client/mysqlslap.c:
typo fixed
configure.in:
test for sleep() too
dbug/dbug.c:
thread local dbug settings
DBUG_EXPLAIN,DBUG_EXPLAIN_INITIAL,DBUG_SET,DBUG_SET_INITIAL
style changes to be more in line with MySQL code
cleanup (many mallocs removed)
incremental modification of dbug state (e.g. DBUG_PUSH("+t:-d,info"))
DBUG_SET, _db_explain_
-#T
dbug/monty.doc:
obsolete and duplicate docs removed
dbug/user.r:
new features documented
include/my_dbug.h:
correct do{}while wrapping
thread local dbug settings
DBUG_EXPLAIN,DBUG_EXPLAIN_INITIAL,DBUG_SET,DBUG_SET_INITIAL
DBUG_EVALUATE,DBUG_EVALUATE_IF
libmysql/libmysql.c:
remove _db_on_ and DEBUGGER_ON/OFF
mysys/my_init.c:
missed DBUG_RETURN
mysys/my_thr_init.c:
bugfix - transaction id's are unsigned
mysys/testhash.c:
remove _db_on_ and DEBUGGER_ON/OFF
sql/ha_myisammrg.cc:
missed ;
sql/ha_ndbcluster.cc:
remove _db_on_ and DEBUGGER_ON/OFF
missed ;
sql/ha_ndbcluster_binlog.cc:
remove _db_on_ and DEBUGGER_ON/OFF
missed ;
sql/item_cmpfunc.cc:
missed ;
sql/lock.cc:
missed DBUG_RETURN
sql/log_event.cc:
missed ;
sql/mysqld.cc:
remove _db_on_ and DEBUGGER_ON/OFF
missed ;
DBUG_SET_INITIAL
sql/opt_range.cc:
remove _db_on_ and DEBUGGER_ON/OFF
sql/set_var.cc:
class sys_var_thd_dbug and "debug" server variable
sql/set_var.h:
class sys_var_thd_dbug and "debug" server variable
sql/slave.cc:
missed ;
sql/sql_cache.cc:
missed ;
sql/sql_plugin.cc:
missed ;
sql/sql_select.cc:
remove _db_on_ and DEBUGGER_ON/OFF
storage/heap/hp_test2.c:
remove _db_on_ and DEBUGGER_ON/OFF
storage/myisam/ft_eval.c:
remove _db_on_ and DEBUGGER_ON/OFF
storage/myisam/ft_test1.c:
remove _db_on_ and DEBUGGER_ON/OFF
storage/myisam/mi_open.c:
remove _db_on_ and DEBUGGER_ON/OFF
missed ;
storage/myisam/mi_test1.c:
remove _db_on_ and DEBUGGER_ON/OFF
storage/myisam/mi_test2.c:
remove _db_on_ and DEBUGGER_ON/OFF
storage/myisam/mi_test3.c:
remove _db_on_ and DEBUGGER_ON/OFF
storage/ndb/src/ndbapi/DictCache.cpp:
missed ;
storage/ndb/src/ndbapi/NdbTransaction.cpp:
missed ;
tests/mysql_client_test.c:
remove _db_on_ and DEBUGGER_ON/OFF
into perch.ndb.mysql.com:/home/jonas/src/51-ndb
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/lgman.cpp:
Auto merged
storage/ndb/src/kernel/blocks/pgman.cpp:
Auto merged
storage/ndb/src/kernel/blocks/pgman.hpp:
Auto merged
storage/ndb/src/kernel/blocks/tsman.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
merge
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
Auto merged
storage/ndb/include/ndbapi/ndb_cluster_connection.hpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
Auto merged
Remove old typedef's ArrayFifoList, ArrayList
BitKeeper/deleted/.del-ArrayFifoList.hpp~7036ae04dd7e7bd2:
Delete: storage/ndb/src/kernel/vm/ArrayFifoList.hpp
BitKeeper/deleted/.del-ArrayList.hpp~44695d09b1a02179:
Delete: storage/ndb/src/kernel/vm/ArrayList.hpp
storage/ndb/src/kernel/SimBlockList.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/lgman.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/lgman.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/pgman.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/pgman.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/restore.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/restore.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/suma/SumaInit.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/trix/Trix.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/trix/Trix.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/tsman.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/tsman.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/vm/DLHashTable.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/vm/DLHashTable2.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/vm/SimBlockList.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/record_types.hpp:
New BitKeeper file ``storage/ndb/src/kernel/blocks/record_types.hpp''
storage/ndb/src/kernel/vm/Pool.hpp:
New BitKeeper file ``storage/ndb/src/kernel/vm/Pool.hpp''
storage/ndb/src/kernel/vm/RecordPool.hpp:
New BitKeeper file ``storage/ndb/src/kernel/vm/RecordPool.hpp''
include/config-netware.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
netware/BUILD/compile-AUTOTOOLS:
Auto merged
netware/Makefile.am:
Auto merged
netware/my_manage.h:
Auto merged
netware/mysql_test_run.c:
Auto merged
netware/BUILD/compile-linux-tools:
Auto merged
netware/BUILD/compile-netware-END:
Auto merged
netware/BUILD/mwenv:
Auto merged
netware/BUILD/nwbootstrap:
Auto merged
server-tools/instance-manager/Makefile.am:
Auto merged
sql/log.cc:
Auto merged
sql/log.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
storage/innobase/include/univ.i:
Auto merged
storage/innobase/os/os0thread.c:
Auto merged
storage/myisam/mi_locking.c:
Auto merged
storage/ndb/src/kernel/blocks/Makefile.am:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/Makefile.am:
Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Auto merged
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/ndb_basic.result:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
sql/sql_prepare.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
sql/ha_ndbcluster.cc:
SCCS merged
sql/ha_ndbcluster.h:
SCCS merged
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/51-new
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/51-new
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
BitKeeper/deleted/.del-ndb_load.result:
Delete: mysql-test/r/ndb_load.result
BitKeeper/deleted/.del-ndb_load.test:
Delete: mysql-test/t/ndb_load.test
extra/perror.c:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/ndb_blob.result:
Auto merged
mysql-test/r/sp-code.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
mysql-test/t/sp-destruct.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
Auto merged
storage/ndb/src/kernel/main.cpp:
Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
Auto merged
storage/ndb/src/kernel/vm/Configuration.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
Auto merged
storage/ndb/tools/delete_all.cpp:
Auto merged
mysql-test/t/disabled.def:
Manual merge.
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
configure.in:
Auto merged
include/heap.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
sql/ha_heap.cc:
Auto merged
sql/ha_heap.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
storage/heap/hp_create.c:
Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
Auto merged
sql/sql_update.cc:
Manual merge
tests/mysql_client_test.c:
SCCS merged
storage/ndb/src/kernel/blocks/Makefile.am:
Fix proposed by Jonas Oreland: Stop building "ndb_print_file", it is just for testing.
storage/ndb/src/kernel/blocks/dbtup/Makefile.am:
Fix proposed by Jonas Oreland: Stop building "test_varpage", it is just for testing.
Apply a patch by Jonas for NDB diskdata.
mysql-test/r/sp-code.result:
Fix a test result after merge: 94 and 95 are SQLCOM codes of
SQLCOM_CALL. New commands were added in 5.1 so SQLCOM_CALL got
renumbered.
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Apply second patch by Jonas to make NDB diskdata work on systems
without O_DIRECT support.
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Apply the diskdata patch by Jonas: the patch adds a fallback to
the standard I/O if O_DIRECT does not work.
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
storage/ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Auto merged
Put back getTable
NdbDictionaryImpl.cpp, NdbDictionary.cpp, NdbDictionary.hpp:
Added putTable
storage/ndb/include/ndbapi/NdbDictionary.hpp:
Added putTable
storage/ndb/include/ndbapi/NdbEventOperation.hpp:
Put back getTable
storage/ndb/src/ndbapi/NdbDictionary.cpp:
Added putTable
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Added putTable
storage/ndb/src/ndbapi/NdbEventOperation.cpp:
Put back getTable
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Put back getTable
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Introduce LCP keep list, for maintaining snapshot of LCP start
list of tuples deleted during checkpoint
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
Change meaning of Tuple_header::FREE
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
Handle LCP_KEEP/FREED/FREE on commit
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
Introduce LCP keep list, for maintaining snapshot of LCP start
list of tuples deleted during checkpoint
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
fix scanning lcp keep list
fix a SR bug (lcp impl. in pgman)
storage/ndb/src/kernel/blocks/pgman.cpp:
move pgman lcp to after lgman has written LCP records for all fragments
this also moves snapshot time for extent pages, which is ok as they will be
undo:ed using normal ops.
an alternative could be to let tup checkpoint it's dirty pages.
this would lead to extent pages which are not beloning to a certain fragment
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
sql/ha_ndbcluster.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
Auto merged
storage/ndb/test/ndbapi/test_event.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
SCCS merged
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
