affects basically all replication tests
storage/ndb/include/kernel/signaldata/SumaImpl.hpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
1) Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
2) make sure to set NdbdNodeId on _TE_STOP
storage/ndb/src/ndbapi/NdbBlob.cpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/ndbapi/NdbEventOperation.cpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/ndbapi/Ndbif.cpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
read TransactionDeadlockTimeout (for scans) to cater for insane settings
ndb/src/ndbapi/NdbScanOperation.cpp:
read TransactionDeadlockTimeout to cater for insane settings
Fix so that expand_check2 is only run per fragment,
as restore now works 1 fragment at a time (again)
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Fix so that expand_check2 is only run per fragment,
as restore now works 1 fragment at a time (again)
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
mysql-test/r/ndb_lock.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/ndb_lock.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
mysql-test/r/ndb_lock.result:
Auto merged
mysql-test/t/ndb_lock.test:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
mysql-test/t/disabled.def:
merge
sql/ha_ndbcluster.cc:
merge
reenable some test after adding sync_with_master to end of test
to make sure that binlog has been applied to slave before end of test
mysql-test/t/disabled.def:
reenable test after adding extra sync_with_master
mysql-test/t/rpl_ndb_func003.test:
add sync slave with master, to make sure that binlog has been applied to slave before end of test
mysql-test/t/rpl_ndb_idempotent.test:
add sync slave with master, to make sure that binlog has been applied to slave before end of test
mysql-test/t/rpl_row_basic_7ndb.test:
add sync slave with master, to make sure that binlog has been applied to slave before end of test
mysql-test/t/rpl_truncate_7ndb.test:
add sync slave with master, to make sure that binlog has been applied to slave before end of test
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/grant.test:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/mysql_client_test.test:
Auto merged
server-tools/instance-manager/listener.cc:
Auto merged
server-tools/instance-manager/portability.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
client/mysql.cc:
Manual merge.
mysql-test/mysql-test-run.pl:
Manual merge.
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
mysql-test/r/func_time.result:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
mysql-test/t/func_time.test:
Manual merge.
because searching for them makes the script abort with all non-NDB builds.
mysql-test/mysql-test-run.pl:
Checking with "mtr_exe_exists()" for the location of a binary will yield an error
if the binary is found nowhere at all, and this happens with NDB binaries in all
builds that do not contain NDB; so the correct way is fixed path names only.
Still part of the fix for the #21721 bug.
Deleted config/ac-macros/ha_berkeley.m4
Removed more referenses to bdb
BitKeeper/deleted/.del-ha_berkeley.m4:
Delete: config/ac-macros/ha_berkeley.m4
BUILD/FINISH.sh:
Removed more referenses to bdb
BUILD/compile-alpha-cxx:
Removed more referenses to bdb
BUILD/compile-alpha-debug:
Removed more referenses to bdb
BUILD/compile-dist:
Removed more referenses to bdb
BUILD/compile-ia64-debug-max:
Removed more referenses to bdb
CMakeLists.txt:
Removed more referenses to bdb
Makefile.am:
Removed more referenses to bdb
libmysqld/lib_sql.cc:
Removed more referenses to bdb
sql/mysql_priv.h:
Removed more referenses to bdb
storage/ndb/config/win-prg.am:
Removed more referenses to bdb
storage/ndb/test/run-test/ndb-autotest.sh:
Removed more referenses to bdb
support-files/my-huge.cnf.sh:
Removed more referenses to bdb
support-files/my-large.cnf.sh:
Removed more referenses to bdb
support-files/my-medium.cnf.sh:
Removed more referenses to bdb
fix bug in drop_file during pageout (LCP)
storage/ndb/src/kernel/blocks/pgman.cpp:
1) Allow Page_entry::REQUEST, when dropping page (in drop_file path)
2) Do all IO JBA
3) Handle PAGEOUT during drop_file (caused by LCP)
(mysql-test-run only)
mysql-test/ndb/ndb_config_1_node.ini:
revert timeout changes, as a test depends on it, it mysterious ways
mysql-test/ndb/ndb_config_2_node.ini:
revert timeout changes, as a test depends on it, it mysterious ways
mysql-test/ndb/ndb_config_4_node.ini:
revert timeout changes, as a test depends on it, it mysterious ways
mysql-test/t/rpl_ndb_basic.test:
revert timeout changes, as a test depends on it, it mysterious ways
mysql-test/mysql-test-run.pl:
In 5.1 packages, the binaries "ndbd" and "ndb_mgmd" are in subdirectory "bin", not in "libexec".
Use the search function "mtr_exe_exists()", in case there might be exceptions.
ndb/src/kernel/vm/DLHashTable2.hpp:
add isEmpty for use in DICT
ndb/test/include/NDBT_Tables.hpp:
getIndexes - return index cols of standard test table
ndb/test/src/NDBT_Tables.cpp:
getIndexes - return index cols of standard test table
ndb/test/ndbapi/testDict.cpp:
bug#21017: index create/drop during NR
ndb/include/kernel/signaldata/CreateIndx.hpp:
add 711
ndb/include/kernel/signaldata/DropIndx.hpp:
add 711
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
block index create/drop during NR.
fix 2 ndbrequires by checking exact schema op types
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
block index create/drop during NR.
fix 2 ndbrequires by checking exact schema op types
instance.cc:
Removed wrongly placed closing brace
item_geofunc.cc:
needed to pass in a TABLE_SHARE* instead of a TABLE*
server-tools/instance-manager/instance.cc:
Removed wrongly placed closing brace
sql/item_geofunc.cc:
needed to pass in a TABLE_SHARE* instead of a TABLE*
