BitKeeper/etc/ignore:
auto-union
client/mysqltest.c:
Auto merged
extra/my_print_defaults.c:
Auto merged
extra/perror.c:
Auto merged
extra/resolve_stack_dump.c:
Auto merged
include/help_end.h:
Auto merged
include/help_start.h:
Auto merged
myisam/myisamlog.c:
Auto merged
mysql-test/r/group_by.result:
Auto merged
mysql-test/r/heap_hash.result:
Auto merged
BitKeeper/deleted/.del-pack_isam.c~43801f0df7504834:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/user_var.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
ndb/src/kernel/vm/FastScheduler.cpp:
Auto merged
netware/mysql_test_run.c:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_list.h:
Auto merged
sql/sql_select.cc:
Auto merged
netware/BUILD/nwbootstrap:
merge: keep local
scripts/make_binary_distribution.sh:
merge: keep local
sql/ha_heap.cc:
Trivial merge
sql/ha_innodb.cc:
Auto merge (Code already existed in 5.0)
sql/item_cmpfunc.cc:
Simple merge
sql/item_func.cc:
Simple merge
sql/item_row.cc:
Simple merge
sql/item_strfunc.cc:
Simple merge
sql/item_subselect.cc:
Merge with sanjas optimzation patch, but keep old code withing ifdef as a reference until this is fixed
Fix bug in bug fix in FastScheduler
remove possibility of endless loop
resulting in APZJobBuffer overflow due to statistics reporting
ndb/src/kernel/vm/FastScheduler.cpp:
Fix bug in bug fix in FastScheduler
remove possibility of endless loop
resulting in APZJobBuffer overflow due to statistics reporting
ndb/src/common/util/NdbSqlUtil.cpp:
strnxfrm bug, may not write the length it says
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
fix index in debug print
ndb/test/ndbapi/testOIBasic.cpp:
do not generate too many mb chars, not checked in TUP
configure.in:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/test/ndbapi/testScan.cpp:
Auto merged
ndb/test/src/NDBT_Test.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
SCCS merged
crash if scan is poped from queue before all attrinfo has arrived
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
only restart scan if all attrinfo has arrived
otherwise just set remove from queue and set state
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
new error insert - force send attrinfo
ndb/test/ndbapi/testScan.cpp:
new test bug8262 many threads - scanning small tables
ndb/test/run-test/daily-basic-tests.txt:
run new test case in autotest
BitKeeper/etc/logging_ok:
auto-union
sql/sql_yacc.yy:
Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
corrected documentation on fragmentation
set "fragmentation medium" to mean 2 fragments per node instead of 1
set default fragmentation to small instead of medium
bug#8284 adjust fragmentation to max_rows
mysql-test/r/ndb_basic.result:
added test to trigger drifferent fragmentations in ndb
mysql-test/t/ndb_basic.test:
added test to trigger drifferent fragmentations in ndb
ndb/include/ndbapi/NdbDictionary.hpp:
corrected documentation on fragmentation
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
set "fragmentation medium" to mean 2 fragments per node instead of 1
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
set default fragmentation to small instead of medium
sql/ha_ndbcluster.cc:
bug#8284 adjust fragmentation to max_rows
more test program fixes
replace pNdb->closeTransaction with closeTransaction(pNdb)
ndb/test/src/HugoTransactions.cpp:
more test program fixes
replace pNdb->closeTransaction with closeTransaction(pNdb)
configure.in:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/ndb_autodiscover.test:
Auto merged
mysql-test/t/ndb_restore.test:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/test/include/HugoOperations.hpp:
Auto merged
ndb/test/include/NDBT_Test.hpp:
Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
ndb/test/src/NDBT_Test.cpp:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
ndb/test/ndbapi/flexAsynch.cpp:
Auto merged
ndb/test/ndbapi/flexBench.cpp:
Auto merged
ndb/test/ndbapi/flexHammer.cpp:
Auto merged
ndb/test/ndbapi/flexTT.cpp:
Auto merged
ndb/test/ndbapi/flex_bench_mysql.cpp:
Auto merged
ndb/test/src/NDBT_Test.cpp:
corrected automerge error
add abort to multi op test case
ndb/include/ndbapi/NdbConnection.hpp:
Add aborts to test case
ndb/test/include/HugoOperations.hpp:
Add aborts to test case
ndb/test/ndbapi/testOperations.cpp:
Add aborts to test case
ndb/test/src/HugoOperations.cpp:
Add aborts to test case
ndb/test/src/HugoTransactions.cpp:
Add aborts to test case
workaround for HPUX signal.h error, missing extern "C"
moved my_thread_end to NdbThreadExit
more checks for shared memory transporter signum setup
acinclude.m4:
backported configure flag from 5.0
include/my_global.h:
workaround for HPUX signal.h error, missing extern "C"
ndb/src/common/portlib/NdbThread.c:
moved my_thread_end to NdbThreadExit
ndb/src/mgmsrv/ConfigInfo.cpp:
more checks for shared memory transporter signum setup
1) New testcase
Check every combination of ins/upd/del of length 5
Check reading savepoint's
2) Fix 1 liner in acc wrt committing read
ndb/include/ndbapi/NdbConnection.hpp:
Make testcase friend
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Fix so that committing a READ can _not_ result in setting elementIsDisappeared
ndb/test/include/NDBT_Test.hpp:
Make copy of testcase name
ndb/test/ndbapi/testOperations.cpp:
New testcase
Check every combination of ins/upd/del of length 5
Check reading savepoint's
ndb/test/src/HugoOperations.cpp:
Close transaction in destructor
ndb/test/src/NDBT_Test.cpp:
Make copy of testcase name
BitKeeper/etc/logging_ok:
auto-union
client/mysqldump.c:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
strings/ctype-simple.c:
SCCS merged
Fixing this bugs improves performance by 40% for very small read
statements and with 12-13 % for very simple updating transactions
(flexBench -o 10000) in single threaded application. Removes a fixed
cost of around 100.000 cycles every time the ndbd process wakes up to
execute some queries.
ndb/src/kernel/vm/FastScheduler.cpp:
Integrate sendPacked into doJob
The lack of integration meant that several loops in
ipControlLoop were executed each time the ndbd process
woke up, also for reads it meant that response was divided
in two TCP/IP packets
Is necessary to integrate this with overload protection
ndb/src/kernel/vm/ThreadConfig.cpp:
Integrate sendPacked into doJob
The lack of integration meant that several loops in
ipControlLoop were executed each time the ndbd process
woke up, also for reads it meant that response was divided
in two TCP/IP packets
Is necessary to integrate this with overload protection
+ ion shutdown - don't close files that are not open
+ abort in debug - if closing a fd == -1
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
removed usage of SIGRTMIN temorarilly as it causes problems on some platforms
ndb/include/ndbapi/ndb_opt_defaults.h:
removed usage of SIGRTMIN temorarilly as it causes problems on some platforms
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
clean: targets removed
generated *.h files moved to include/
Docs/Images/Makefile.am:
no clean: targets please!
client/Makefile.am:
generated *.h files moved to include/
extra/Makefile.am:
generated *.h files moved to include/
include/Makefile.am:
no clean: targets please!
libmysql/Makefile.am:
generated *.h files moved to include/
libmysql_r/Makefile.am:
generated *.h files moved to include/
libmysqld/Makefile.am:
generated *.h files moved to include/
libmysqld/examples/Makefile.am:
generated *.h files moved to include/
no clean: target please!
ndb/docs/Makefile.am:
no clean: targets please!
scripts/Makefile.am:
SUPERCLEANFILES means nothing
server-tools/instance-manager/Makefile.am:
generated *.h files moved to include/
sql/Makefile.am:
generated *.h files moved to include/
sql/share/Makefile.am:
instead of (incorrectly) duplicating comp_err command line,
call do make in extra/
tools/Makefile.am:
generated *.h files moved to include/
BitKeeper/etc/ignore:
Added include/mysqld_ername.h include/mysqld_error.h include/sql_state.h to the ignore list
ndb/include/Makefile.am:
Auto merged
ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
ndb/src/common/mgmcommon/IPCConfig.cpp:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/tools/delete_all.cpp:
Auto merged
ndb/tools/desc.cpp:
Auto merged
ndb/tools/drop_index.cpp:
Auto merged
ndb/tools/drop_tab.cpp:
Auto merged
ndb/tools/listTables.cpp:
Auto merged
ndb/tools/restore/restore_main.cpp:
Auto merged
ndb/tools/select_all.cpp:
Auto merged
ndb/tools/select_count.cpp:
Auto merged
ndb/tools/waiter.cpp:
Auto merged
ndb/include/util/ndb_opts.h:
SCCS merged
ndb/src/mgmsrv/main.cpp:
resolved merge conflict
added shared memory config parameter, signum for use in signalling
added global variable for holdign signum to be used for shared memory connection
only fiddle with signals if it is set
simplified common ndb client option handling
ndb/include/Makefile.am:
added common defaults file
ndb/include/mgmapi/mgmapi_config_parameters.h:
added shared memory config parameter, signum for use in signalling
ndb/include/transporter/TransporterDefinitions.hpp:
added shared memory config parameter, signum for use in signalling
ndb/include/util/ndb_opts.h:
simplified common ndb client option handling
ndb/src/common/mgmcommon/IPCConfig.cpp:
added shared memory config parameter, signum for use in signalling
ndb/src/common/portlib/NdbThread.c:
added global variable for holdign signum to be used for shared memory connection
only block signals if shared memory is used
ndb/src/common/transporter/SHM_Transporter.cpp:
use signum in new global variable for shared memory signalling
ndb/src/common/transporter/TransporterRegistry.cpp:
use signum in new global variable for shared memory signalling
only fiddle with signals if it is set
ndb/src/cw/cpcd/main.cpp:
ndb_opts not really used
ndb/src/kernel/vm/Configuration.cpp:
simplified common ndb client option handling
ndb/src/mgmclient/main.cpp:
simplified common ndb client option handling
ndb/src/mgmsrv/ConfigInfo.cpp:
added shared memory config parameter, signum for use in signalling
ndb/src/mgmsrv/main.cpp:
simplified common ndb client option handling
ndb/tools/delete_all.cpp:
simplified common ndb client option handling
ndb/tools/desc.cpp:
simplified common ndb client option handling
ndb/tools/drop_index.cpp:
simplified common ndb client option handling
ndb/tools/drop_tab.cpp:
simplified common ndb client option handling
ndb/tools/listTables.cpp:
simplified common ndb client option handling
ndb/tools/restore/restore_main.cpp:
simplified common ndb client option handling
ndb/tools/select_all.cpp:
simplified common ndb client option handling
ndb/tools/select_count.cpp:
simplified common ndb client option handling
ndb/tools/waiter.cpp:
simplified common ndb client option handling
mysql-test/r/ndb_index_ordered.result:
make YEAR and TIMESTAMP into ndb types
mysql-test/t/ndb_index_ordered.test:
make YEAR and TIMESTAMP into ndb types
ndb/include/kernel/signaldata/DictTabInfo.hpp:
make YEAR and TIMESTAMP into ndb types
ndb/include/ndbapi/NdbDictionary.hpp:
make YEAR and TIMESTAMP into ndb types
ndb/include/util/NdbSqlUtil.hpp:
make YEAR and TIMESTAMP into ndb types
ndb/src/common/util/NdbSqlUtil.cpp:
make YEAR and TIMESTAMP into ndb types
ndb/src/ndbapi/NdbDictionary.cpp:
make YEAR and TIMESTAMP into ndb types
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
make YEAR and TIMESTAMP into ndb types
ndb/src/ndbapi/NdbRecAttr.cpp:
make YEAR and TIMESTAMP into ndb types
ndb/test/include/NdbSchemaOp.hpp:
make YEAR and TIMESTAMP into ndb types
sql/ha_ndbcluster.cc:
make YEAR and TIMESTAMP into ndb types
