into whalegate.ndb.mysql.com:/home/tomas/cge-5.1
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
into mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
storage/ndb/include/kernel/signaldata/TcKeyRef.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
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/ndbapi/NdbDictionary.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
sql/ha_ndbcluster.cc:
Merge
storage/ndb/src/ndbapi/NdbOperationExec.cpp:
Merge
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge
client/mysqldump.c:
Auto merged
include/my_base.h:
Auto merged
include/my_sys.h:
Auto merged
libmysql/CMakeLists.txt:
Auto merged
libmysql/Makefile.shared:
Auto merged
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/suite/rpl/t/rpl_ssl.test:
Auto merged
mysql-test/t/cast.test:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/field.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/records.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/unireg.cc:
Auto merged
storage/myisam/ft_boolean_search.c:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisam/sort.c:
Auto merged
mysql-test/t/log_state.test:
Manual merge fix-up
mysql-test/include/mix1.inc:
Manual merge
mysql-test/r/ctype_ucs.result:
Manual merge
mysql-test/r/func_misc.result:
Manual merge
mysql-test/r/innodb_mysql.result:
Manual merge
mysql-test/r/key.result:
Manual merge
mysql-test/r/log_state.result:
Manual merge
mysql-test/suite/binlog/t/binlog_killed.test:
Manual merge
mysql-test/t/ctype_ucs.test:
Manual merge
mysql-test/t/func_misc.test:
Manual merge
mysql-test/t/key.test:
Manual merge
sql/item_strfunc.h:
Manual merge
strings/ctype-simple.c:
Manual merge
make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race, error insert causes 5s delay)
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)
storage/ndb/test/ndbapi/testNodeRestart.cpp:
soem more printout
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
The check that how many auto_increment columns in table are there should be preceded creating the table.
If there are more than one auto_increment columns, the table shouldn't be created.
mysql-test/suite/ndb/r/ndb_autoinc.result:
Adding test case for auto_increment isn't the default primary key columns
mysql-test/suite/ndb/t/ndb_autoinc.test:
Adding test case for auto_increment isn't the default primary key columns
- move api failure handling into own method
- add START_ORD so that hb checking can start really early
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
- make sure qmgr is "fully" informed about connections so that it can handle hb correctly
- dont allow API/mysqld node to reconnect if we have not started yet (sp 8)
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
- move api failure handling into own method
- add START_ORD so that hb checking can start really early
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
- move api failure handling into own method
- add START_ORD so that hb checking can start really early
- Init datastructures in constructor
- as CONNECT_REP may occur before start phases
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
- Init datastructures in constructor
- as CONNECT_REP may occur before start phases
- start hb handling directly on connect rep (instead of first hb)
Add *correct* check when a LCP is restorable
by looking at maxGciStarted from LCP_FRAG_REP
(for all fragments)
bug observed by running testSystemRestart -n SR_DD_1_LCP T1
(causes "incorrect" behaviour in 51-ndb, and crash when using 2 LCP)
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
ndb - bug#32519
Add *correct* check when a LCP is restorable
by looking at maxGciStarted from LCP_FRAG_REP
(for all fragments)
Fix handling of multiple redo phases
- set correct state
- handle 4 phases, by moving START_FRAGCONF to end of phase instead of beginning...
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
remove unused state ACTIVE_REMOVE_AFTER
remove unused variable nextLcp
remove unused methods (BUILD_INDX)
add counter of outstanding GSN_EXEC_FRAGREQ
remove c_redo_complete_fragments cause it fits badly with functional multi-redo-phases
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
remove unused stuff
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
1) set correct state before starting next non-empty REDO phase
2) move GSN_START_FRAGCONF to execFRAGCONF instead of when sending GSN_EXEC_FRAGREQ
or fragments with 4 redo-phases would never be complete...
storage/ndb/test/ndbapi/testSystemRestart.cpp:
testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
testcase
add new testtool that does connect/disconnect in loop
storage/ndb/test/tools/Makefile.am:
add new test tool
storage/ndb/test/tools/connect.cpp:
New BitKeeper file ``storage/ndb/test/tools/connect.cpp''
Increase connection negotiation timeout
Improve some weirdness
storage/ndb/src/common/transporter/Transporter.cpp:
- Increase connection negotiation timeout
- return false if trying to connect when already connected (should still be assert)
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
Use correct "is_connected" checks
(although this is kind of bogus and should be cleaned-up)
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug30271
storage/ndb/include/mgmapi/ndb_logevent.h:
Auto merged
storage/ndb/src/mgmapi/ndb_logevent.cpp:
Auto merged
1: Create a log file which is larger than 4G in 32-bit host.
2: Create a data file (tablespace) which is larger than 4G in 32-bit host.
storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp:
Add error code for log file too large
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Add error insert code in lgman and tsman
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Add error code definination of lgman and tsman
storage/ndb/src/kernel/blocks/lgman.cpp:
Return REF when log file more than 4G in 32-bits host
storage/ndb/src/kernel/blocks/tsman.cpp:
return FER when data file larger than 4G in 32-bits host
storage/ndb/src/ndbapi/ndberror.c:
Add describe of new errorCode
storage/ndb/test/ndbapi/testDict.cpp:
Add test case for bug29186
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
mysql-test/suite/ndb/r/ndb_multi.result:
Auto merged
mysql-test/suite/ndb/t/ndb_multi.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
Updated DropDDObjects in testDict to ignore the user tables created in the MySQL database
storage/ndb/test/ndbapi/testDict.cpp:
Updated DropDDObjects in testDict to ignore the user tables created in the MySQL database
into perch.ndb.mysql.com:/home/jonas/src/51-ndb
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/ERROR_codes.txt:
merge
storage/ndb/test/ndbapi/testNodeRestart.cpp:
merge
storage/ndb/test/run-test/daily-basic-tests.txt:
merge
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint
storage/ndb/src/ndbapi/ClusterMgr.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
SCCS merged
sql/ha_ndbcluster_binlog.cc:
more state saving
storage/ndb/tools/restore/Restore.cpp:
ndb:
break out tuple data read for ndb_restore
more save state in run query
storage/ndb/test/include/dbutil.hpp:
Hearder file for SQL Database Utilities class for adding MySQL SQL abilities to NDB API tests cases.
storage/ndb/test/src/dbutil.cpp:
Implementation file for SQL Database Utilities class for adding MySQL SQL abilities to NDB API tests cases.
storage/ndb/test/src/Makefile.am:
Updated to include dbutil
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
mysql-test/suite/rpl/r/rpl_bug31076.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_update.cc:
Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
Auto merged
mysql-test/suite/rpl/t/rpl_bug31076.test:
manual merge
into loke.(none):/home/knielsen/devel/mysql-5.1-new-ndb
storage/ndb/include/kernel/AttributeHeader.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
SCCS merged
partial backport from 6.2 + add fix of bug
storage/ndb/include/kernel/GlobalSignalNumbers.h:
add prep_copy_frag
storage/ndb/include/kernel/signaldata/AccScan.hpp:
add new argument specifying which page to scan to
storage/ndb/include/kernel/signaldata/CopyFrag.hpp:
add new argument specifying which page to scan to
storage/ndb/include/ndb_version.h.in:
add versioning checks for prep_copy_frag
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
add prep_copy_frag
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
new error codes
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
add new to-step
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
add new to-step
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
add new to-step
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
add new to-step
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
add new to-step
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
add new to-step
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
add new argument specifying which page to scan to
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
add utility to get max page used by fragment
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
add NR scan to > frag.noOfPages
storage/ndb/test/ndbapi/testSystemRestart.cpp:
add testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
add testcase
storage/ndb/test/src/NdbRestarts.cpp:
add testcase
into perch.ndb.mysql.com:/home/jonas/src/51-ndb
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
merge
