into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
mysql-test/r/ndb_alter_table.result:
Auto merged
mysql-test/t/ndb_alter_table.test:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb alter table with big dicttabinfo
send alter_tab_req fragmented as signal can get larger than MAX_MESSAGE_SIZE
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
DictTabInfo used during alter table can easily becom larger than MAX_MESSAGE_SIZE
send fragmented instead
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
merge
ndb backup with charsets and simultanious updates
make sure that backup _dont_ read xfrm data
ndb/src/kernel/blocks/backup/Backup.cpp:
Backup can do dirty read
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Fix so that backup dont read xfrm data
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
Fix so that backup dont read xfrm data
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
ndb/include/ndbapi/NdbBlob.hpp:
Auto merged
ndb/include/ndbapi/NdbOperation.hpp:
Auto merged
ndb/include/ndbapi/NdbRecAttr.hpp:
Auto merged
ndb/src/ndbapi/NdbApiSignal.cpp:
Auto merged
ndb/src/ndbapi/NdbApiSignal.hpp:
Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
Auto merged
ndb/src/ndbapi/Ndbif.cpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
ndb/test/include/NDBT_Test.hpp:
Auto merged
ndb/test/ndbapi/bank/BankLoad.cpp:
Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
Auto merged
ndb/test/src/NdbBackup.cpp:
Auto merged
ndb/test/src/NdbRestarts.cpp:
Auto merged
ndb/tools/restore/Restore.cpp:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
ndb/include/ndbapi/Ndb.hpp:
merge
ndb/include/ndbapi/NdbIndexOperation.hpp:
merge
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
merge
ndb/include/ndbapi/NdbTransaction.hpp:
merge
ndb/src/ndbapi/NdbImpl.hpp:
merge
ndb/src/ndbapi/Ndblist.cpp:
merge
ndb/test/src/HugoCalculator.cpp:
merge
ndb/test/src/NDBT_Test.cpp:
merge
sql/ha_ndbcluster.cc:
merge
sql/mysqld.cc:
merge
sql/sql_lex.h:
merge
sql/sql_parse.cc:
merge
big delete from causing NdbObjectIdMap::expand at same time
as receiver thread perform getObjectId
ndb/src/ndbapi/Ndbinit.cpp:
Protect NdbObjectIdMap::expand from getObjectId
ndb/src/ndbapi/ObjectMap.hpp:
Protect NdbObjectIdMap::expand from getObjectId
remove extra ";" from test programs
ndb/test/include/NDBT_Test.hpp:
Remove extra ";"
ndb/test/ndbapi/bank/BankLoad.cpp:
Remove extra ";"
ndb/test/ndbapi/testOIBasic.cpp:
Remove extra ";"
ndb/test/src/HugoCalculator.cpp:
Remove extra ";"
ndb/test/src/NDBT_Test.cpp:
Remove extra ";"
ndb/test/src/NdbBackup.cpp:
Remove extra ";"
ndb/test/src/NdbRestarts.cpp:
Remove extra ";"
impl support for querying resource usage in ndb api
to help track down mem leaks
ndb/include/ndbapi/Ndb.hpp:
Impl. reporting of free list usage
Put free list into handler class
ndb/include/ndbapi/NdbBlob.hpp:
Impl. reporting of free list usage
Put free list into handler class
ndb/include/ndbapi/NdbConnection.hpp:
Impl. reporting of free list usage
Put free list into handler class
ndb/include/ndbapi/NdbIndexOperation.hpp:
Impl. reporting of free list usage
Put free list into handler class
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
Impl. reporting of free list usage
Put free list into handler class
ndb/include/ndbapi/NdbOperation.hpp:
Impl. reporting of free list usage
Put free list into handler class
ndb/include/ndbapi/NdbRecAttr.hpp:
Impl. reporting of free list usage
Put free list into handler class
ndb/src/ndbapi/NdbApiSignal.cpp:
Impl. reporting of free list usage
Put free list into handler class
ndb/src/ndbapi/NdbApiSignal.hpp:
Impl. reporting of free list usage
Put free list into handler class
ndb/src/ndbapi/NdbBlob.cpp:
Impl. reporting of free list usage
Put free list into handler class
ndb/src/ndbapi/NdbImpl.hpp:
Impl. reporting of free list usage
Put free list into handler class
ndb/src/ndbapi/NdbRecAttr.cpp:
Impl. reporting of free list usage
Put free list into handler class
ndb/src/ndbapi/NdbUtil.cpp:
Impl. reporting of free list usage
Put free list into handler class
ndb/src/ndbapi/NdbUtil.hpp:
Impl. reporting of free list usage
Put free list into handler class
ndb/src/ndbapi/Ndbif.cpp:
Impl. reporting of free list usage
Put free list into handler class
ndb/src/ndbapi/Ndbinit.cpp:
Impl. reporting of free list usage
Put free list into handler class
ndb/src/ndbapi/Ndblist.cpp:
Impl. reporting of free list usage
Put free list into handler class
ndb/tools/restore/Restore.cpp:
Impl. reporting of free list usage
Put free list into handler class
use select if poll is unavailable.
ndb/src/common/portlib/NdbTCP.cpp:
Implement Ndb_check_socket_hup for systems without poll(2)
ndb/src/common/portlib/win32/NdbTCP.c:
fix typo (found while fixing this bug)
into mysql.com:/home/jimw/my/mysql-5.0-clean
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
include/violite.h:
Auto merged
mysql-test/r/ndb_autodiscover.result:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/ndbapi/SignalSender.cpp:
Auto merged
sql-common/client.c:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/net_serv.cc:
Auto merged
vio/vio.c:
Auto merged
vio/viosocket.c:
Auto merged
vio/viossl.c:
Auto merged
configure.in:
Resolve conflicts
into c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
new testprogram testSRBank
BitKeeper/etc/ignore:
Added ndb/test/ndbapi/testSRBank to the ignore list
ndb/test/include/NDBT_Test.hpp:
incProperty
ndb/test/ndbapi/Makefile.am:
new test program
ndb/test/ndbapi/bank/Bank.cpp:
remove endless wait until ready loop
fix lots of retry loops to better handle error
ndb/test/ndbapi/bank/Bank.hpp:
remove endless wait until ready loop
fix lots of retry loops to better handle error
ndb/test/src/NDBT_Test.cpp:
incProperty
ndb/test/src/UtilTransactions.cpp:
close transaction if failed
ndb/test/ndbapi/testSRBank.cpp:
New BitKeeper file ``ndb/test/ndbapi/testSRBank.cpp''
into c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
mysql-test/r/connect.result:
Auto merged
mysql-test/t/connect.test:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
sql/sql_class.cc:
SCCS merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Fixed a bug and an issue with the added debug code for finding
redo log write mistakes
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Fixed a bug and an issue with the added debug code for finding
redo log write mistakes
Removed a number of unnecessary break's
ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp:
Added printouts of new debug info in log page header
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/ndbapi/Makefile.am:
Auto merged
ndb/test/src/NdbBackup.cpp:
Auto merged
