into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/mysql-5.1-ndb-bj
sql/sql_base.cc:
Auto merged
sql/sql_view.cc:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
Fix build failure if O_DIRECT is not defined
Fix stack overflow by making odirect_readbuf global
Remove soem old debug variables
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Fix build failure if O_DIRECT is not defined
Fix stack overflow by making odirect_readbuf global
Remove soem old debug variables
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
Fix build failure if O_DIRECT is not defined
Fix stack overflow by making odirect_readbuf global
Remove soem old debug variables
into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
mysql-test/t/disabled.def:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/include/ndbapi/NdbOperation.hpp:
Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
storage/ndb/src/mgmapi/ndb_logevent.cpp:
Auto merged
storage/ndb/test/ndbapi/testIndex.cpp:
Auto merged
storage/ndb/test/ndbapi/testSystemRestart.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
merge
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
merge
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
merge
storage/ndb/test/run-test/daily-basic-tests.txt:
merge
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921:
Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
Auto merged
BitKeeper/deleted/.del-mysys.dsp~32695fee91189326:
Auto merged
BitKeeper/deleted/.del-im_options_set.imtest~b53d9d60e5684833:
Auto merged
BitKeeper/deleted/.del-im_options_unset.imtest~768eb186b51d0048:
Auto merged
BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f:
Auto merged
client/mysql.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
client/mysqlcheck.c:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
dbug/dbug.c:
Auto merged
extra/perror.c:
Auto merged
extra/yassl/src/yassl_imp.cpp:
Auto merged
extra/yassl/src/yassl_int.cpp:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/cast.result:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/federated.result:
Auto merged
mysql-test/r/func_compress.result:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/gis-rtree.result:
Auto merged
mysql-test/r/gis.result:
Auto merged
mysql-test/r/im_daemon_life_cycle.result:
Auto merged
mysql-test/r/im_utils.result:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/r/mysqlcheck.result:
Auto merged
mysql-test/r/rpl_sp.result:
Auto merged
mysql-test/r/rpl_trigger.result:
Auto merged
mysql-test/r/sp-code.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/strict.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/r/type_datetime.result:
Auto merged
mysql-test/r/type_ranges.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/r/user_var.result:
Auto merged
mysql-test/t/cast.test:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/func_group.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
Auto merged
mysql-test/t/im_life_cycle.imtest:
Auto merged
mysql-test/t/im_utils.imtest:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
mysql-test/t/mysqlcheck.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/rpl_trigger.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/strict.test:
Auto merged
mysql-test/t/udf.test:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
sql-common/client.c:
Auto merged
sql-common/my_time.c:
Auto merged
sql/table.h:
Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
mysql-test/r/im_life_cycle.result:
e
use local
mysql-test/r/ps.result:
use local
client/Makefile.am:
Manual merge.
client/mysqlimport.c:
Manual merge.
configure.in:
Manual merge.
mysql-test/mysql-test-run.pl:
Manual merge.
mysql-test/r/mysqldump.result:
Manual merge.
mysql-test/r/mysqltest.result:
Manual merge.
mysql-test/r/ndb_basic.result:
Manual merge.
mysql-test/r/rpl_view.result:
Manual merge.
mysql-test/r/show_check.result:
Manual merge.
mysql-test/r/sp-error.result:
Manual merge.
mysql-test/r/sp.result:
Manual merge.
mysql-test/r/union.result:
Manual merge.
mysql-test/t/mysqldump.test:
Manual merge.
mysql-test/t/mysqltest.test:
Manual merge.
mysql-test/t/ndb_basic.test:
Manual merge.
mysql-test/t/rpl_sp.test:
Manual merge.
mysql-test/t/rpl_view.test:
Manual merge.
mysql-test/t/show_check.test:
Manual merge.
mysql-test/t/sp-error.test:
Manual merge.
mysql-test/t/sp.test:
Manual merge.
sql/item_sum.cc:
Manual merge.
sql/mysql_priv.h:
Manual merge.
sql/sp_head.cc:
Manual merge.
sql/sql_db.cc:
Manual merge.
sql/sql_delete.cc:
Manual merge.
sql/sql_lex.h:
Manual merge.
sql/sql_show.cc:
Manual merge.
sql/sql_table.cc:
Manual merge.
sql/sql_trigger.cc:
Manual merge.
sql/sql_yacc.yy:
Manual merge.
tests/mysql_client_test.c:
Manual merge.
into mysql.com:/home/marty/MySQL/mysql-5.1-ndb
mysql-test/r/ndb_read_multi_range.result:
Auto merged
mysql-test/t/ndb_lock.test:
Auto merged
mysql-test/t/ndb_read_multi_range.test:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
mysql-test/r/ndb_lock.result:
Merge (using local)
sql/ha_ndbcluster.cc:
Merge fix for bug #18184 SELECT ... FOR UPDATE does not work..
sql/ha_ndbcluster.h:
Merge fix for bug #18184 SELECT ... FOR UPDATE does not work..
Add extra sleeps (conditionally) if user-ndb-object still exists during shutdown
Note: This is not in anyway optimal, but i dont't really know in which order should be shutdown
but it fixes problem...
sql/ha_ndbcluster_binlog.cc:
Add extra wait loop to make user "user" ndb-object go away...
otherwise user thread can have ongoing SUB_DATA
storage/ndb/include/ndbapi/ndb_cluster_connection.hpp:
Add interface for getting active ndb-object count
storage/ndb/src/ndbapi/Ndbif.cpp:
Add return in case of incorrect magic
storage/ndb/src/ndbapi/TransporterFacade.cpp:
Add interface for getting active ndb-object count
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
Add interface for getting active ndb-object count
make fragment logpart in DIH "global"
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Store logpart id in FRAGMENTATION as it goes very bad if
they differ on different nodes, as they are copied from master
on node/system -restart
make each fragment use own LCP file, so that (s/n)r can use different LCP-no for different fragments
storage/ndb/include/kernel/signaldata/FsOpenReq.hpp:
Add fragment id to LCP filename
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Add new error code
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
put each fragment in own LCP file
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
put each fragment in own LCP file
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Use fifo lists
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
1) use fifo lists
2) restore each fragment separatly
3) add error codes
storage/ndb/src/kernel/blocks/restore.cpp:
Add fragment id to LCP filename
storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp:
Add fragment id to LCP filename
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Add testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
add testcase
make dump state args list const
make node lists const
storage/ndb/include/mgmapi/mgmapi_debug.h:
make dump state args list const
storage/ndb/src/mgmapi/mgmapi.cpp:
make dump state args list const
storage/ndb/test/include/NdbRestarter.hpp:
make node lists const
storage/ndb/test/src/NdbRestarter.cpp:
make node lists const
report only once on "all dump 1000"
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
report DM only once
storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
report DM only once
make Dblqh use OM_AUTO_SYNC
storage/ndb/include/kernel/signaldata/FsOpenReq.hpp:
make Dblqh us OM_AUTO_SYNC
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
make Dblqh us OM_AUTO_SYNC
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
make Dblqh us OM_AUTO_SYNC
storage/ndb/src/kernel/vm/pc.hpp:
remove unused #defines
3 new paramters:
DiskSyncSize - Outstanding disk writes before sync (default 4M)
DiskCheckpointSpeed - Write speed of LCP in bytes/sec (default 10M)
DiskCheckpointSpeedInRestart - As above but during LCP (default 100M)
Depricated old NoOfDiskPagesToDisk*
- Change NoOfFragmentLogFiles default to 16 (1Gb)
storage/ndb/include/kernel/signaldata/BackupContinueB.hpp:
Add possibility to limitat of disk write speed in backup
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
Add possibility to limitat of disk write speed in backup
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Add possibility to limitat of disk write speed in backup
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
Add possibility to limitat of disk write speed in backup
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
Add possibility to limitat of disk write speed in backup
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Add possibility to limitat of disk write speed in backup
Change NoOfFragmentLogFiles default to 16 (1Gb)
DiskSyncSize
DiskCheckpointSpeed
DiskCheckpointSpeedInRestart
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
Handle deprication warning also in my.cnf format
add sync-flag to FsAppendReq
storage/ndb/include/kernel/signaldata/FsAppendReq.hpp:
Add sync flag to FsAppend
storage/ndb/include/kernel/signaldata/FsOpenReq.hpp:
Add auto sync flag to FSOPEN
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Add append_synch and auto sync
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
Add variables for auto sync
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
Add append_sync and auto sync
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
storage/ndb/test/include/HugoTransactions.hpp:
Auto merged
storage/ndb/test/src/HugoTransactions.cpp:
Auto merged
storage/ndb/test/include/HugoTransactions.hpp:
Add abort flag to hugoLoad
storage/ndb/test/src/HugoTransactions.cpp:
Add abort flag to hugoLoad
storage/ndb/test/tools/hugoLoad.cpp:
Add abort flag to hugoLoad
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
client/mysql.cc:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/group_min_max.result:
Auto merged
BitKeeper/deleted/.del-make_win_src_distribution.sh~f80d8fca44e4e5f1:
Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
Auto merged
BitKeeper/deleted/.del-mysqld_ia64.dsp~7f8cf84d81ee04e2:
Auto merged
BitKeeper/deleted/.del-mysqldump.dsp~a8bd23547d3fc27e:
Auto merged
BitKeeper/deleted/.del-mysqldump_ia64.dsp~a2aabe898be35b31:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
mysql-test/r/type_ranges.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
mysql-test/t/func_gconcat.test:
Auto merged
mysql-test/t/func_group.test:
Auto merged
mysql-test/t/group_min_max.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/innodb_mysql.test:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/select.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/field.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/opt_range.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/time.cc:
Auto merged
storage/ndb/test/ndbapi/Makefile.am:
Auto merged
strings/decimal.c:
Auto merged
mysql-test/r/analyse.result:
Manual merge
mysql-test/r/bigint.result:
Manual merge
mysql-test/r/create.result:
Manual merge
mysql-test/r/information_schema.result:
Manual merge
mysql-test/r/ps_2myisam.result:
Manual merge
mysql-test/r/ps_3innodb.result:
Manual merge
mysql-test/r/ps_4heap.result:
Manual merge
mysql-test/r/ps_5merge.result:
Manual merge
mysql-test/r/ps_6bdb.result:
Manual merge
mysql-test/r/rpl_insert_id.result:
Manual merge
mysql-test/r/select.result:
Manual merge
mysql-test/r/sp.result:
Manual merge
mysql-test/r/subselect.result:
Manual merge
mysql-test/t/information_schema.test:
Manual merge
mysql-test/t/rpl_insert_id.test:
Manual merge
sql/field.h:
Manual merge
sql/item.cc:
Manual merge
sql/item.h:
Manual merge
sql/item_strfunc.h:
Manual merge
sql/item_sum.cc:
Manual merge
sql/mysql_priv.h:
Manual merge
sql/share/errmsg.txt:
Manual merge
sql/sql_class.h:
Manual merge
sql/sql_select.cc:
Manual merge
into orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug14935
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
manual
into willster.(none):/home/stewart/Documents/MySQL/5.1/main
BitKeeper/etc/config:
Auto merged
sql/opt_range.cc:
Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp:
Auto merged
storage/ndb/test/ndbapi/testDict.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
mysql-test/Makefile.am:
manual merge
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
manual merge
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
if TUX update fails, need to abort op on tuple (5.1 specific)
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
if TUX update fails, need to abort op on tuple (5.1 specific)
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
if TUX update fails, need to abort op on tuple (5.1 specific)
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
if TUX update fails, need to abort op on tuple (5.1 specific)
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
if TUX update fails, need to abort op on tuple (5.1 specific)
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
mysql-test/r/partition.result:
Auto merged
mysql-test/t/partition.test:
Auto merged
sql/unireg.cc:
Auto merged
BitKeeper/deleted/.del-partition_innodb.result:
Auto merged
BitKeeper/deleted/.del-partition_innodb.test:
Auto merged
into siva.hindu.god:/usr/home/tim/m/bk/merge-51
(which is mysql-5.1-new-maint team tree)
include/my_base.h:
Auto merged
mysql-test/extra/rpl_tests/rpl_loaddata.test:
Auto merged
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/r/rpl_loaddata.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/lib/mtr_report.pl:
merge of mysql-5.1 -> mysql-5.1-new-maint
mysql-test/mysql-test-run.pl:
merge of mysql-5.1 -> mysql-5.1-new-maint
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
include/my_sys.h:
Auto merged
mysql-test/r/auto_increment.result:
Auto merged
mysql-test/r/func_math.result:
Auto merged
mysql-test/r/func_system.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/log.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
sql/slave.h:
SCCS merged
mysql-test/r/show_check.result:
Manual merge.
mysql-test/t/show_check.test:
Manual merge.
sql/log_event.cc:
Manual merge.
sql/share/errmsg.txt:
Manual merge.
sql/sql_class.h:
Manual merge.
sql/sql_db.cc:
Manual merge.
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/ndb_autodiscover3.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/wait_timeout.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
into orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug18781
storage/ndb/include/kernel/GlobalSignalNumbers.h:
auto
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
SCCS merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
auto
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
auto
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
manual
- keep accounting for aoutstanding drop trigger requests
- also lock table object in suma while doing that (should be impossible right now though since dict serializes all requests)
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
SCCS merged
Add DynArr256 which is a ndb-ish judy array
Like the one used in ACC
storage/ndb/src/kernel/vm/Makefile.am:
Add DynArr256
storage/ndb/src/kernel/vm/bench_pool.cpp:
update benchpool program
storage/ndb/src/kernel/vm/DynArr256.cpp:
New BitKeeper file ``storage/ndb/src/kernel/vm/DynArr256.cpp''
storage/ndb/src/kernel/vm/DynArr256.hpp:
New BitKeeper file ``storage/ndb/src/kernel/vm/DynArr256.hpp''
