still some compiler warnings
storage/ndb/include/util/OutputStream.hpp:
still some compiler warnings
storage/ndb/include/util/SimpleProperties.hpp:
still some compiler warnings
storage/ndb/src/kernel/vm/Pool.hpp:
still some compiler warnings
- make sure cluster/schema table is always created first
sql/ha_ndbcluster_binlog.cc:
make sure cluster/schema table is always created first
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
corrected bug causing hang in getTable when using blob tables
rewrite/clean up code a bit to avoid a gcc4 compiler bug
storage/ndb/src/kernel/vm/DLFifoList.hpp:
Fix compiler bug
storage/ndb/src/kernel/vm/DLList.hpp:
Fix compiler bug
storage/ndb/src/kernel/vm/SLList.hpp:
Fix compiler bug
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
mysql-test/lib/mtr_timer.pl:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_innodb.cc:
Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/StartPerm.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/TcContinueB.hpp:
Auto merged
storage/ndb/include/mgmapi/ndbd_exit_codes.h:
Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
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/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
Auto merged
storage/ndb/src/kernel/vm/TransporterCallback.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
storage/ndb/test/include/NdbRestarter.hpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
storage/ndb/test/ndbapi/testSystemRestart.cpp:
Auto merged
storage/ndb/test/ndbapi/testTimeout.cpp:
Auto merged
storage/ndb/test/run-test/conf-daily-devel-ndbmaster.txt:
Auto merged
storage/ndb/test/run-test/conf-dl145a.txt:
Auto merged
storage/ndb/test/run-test/conf-ndbmaster.txt:
Auto merged
storage/ndb/test/run-test/ndb-autotest.sh:
Auto merged
storage/ndb/test/src/NdbRestarter.cpp:
Auto merged
storage/ndb/test/run-test/conf-shark.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
merge
storage/ndb/src/ndbapi/TransporterFacade.hpp:
merge
storage/ndb/test/run-test/Makefile.am:
merge
storage/ndb/test/run-test/daily-basic-tests.txt:
merge
storage/ndb/tools/desc.cpp:
merge
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
mysql-test/r/ndb_insert.result:
Auto merged
mysql-test/r/ndb_replace.result:
Auto merged
storage/ndb/include/ndbapi/NdbIndexOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Keeping local and do manual merge
sql/ha_ndbcluster.h:
Keeping local and do hand merge
incorrect handling of varsize primary key and charsets in tup-scan
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
put tracenr log in signal log instead...as out file gets very big...
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
PK needs to be normalized before computing hashvalue, otherwise lock-req will not find row,
causing assertion in debug build, and inconsistency in release
put nrtrace in out file instead (debug compiled..)
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
put nrtrace in out file instead (debug compiled..)
Dont put object file in list of SOURCES...causing really weird make dist problem
storage/ndb/src/kernel/vm/Makefile.am:
Dont put object file in list of SOURCES...causing really weird make dist problem
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/ndb_binlog_ddl_multi.test:
Auto merged
sql/rpl_injector.cc:
Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
sql/ha_ndbcluster_binlog.cc:
manual merge
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
+ removed extra binlog events generated by drop table schema ops to produce predictable test cases
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
ndb: dict use define for number of pages in table definition
implement limitation with only on logfile group, since SR is really buggy with several
mysql-test/r/ndb_dd_ddl.result:
Test that only 1 logfile group can be created
mysql-test/r/ndb_dd_dump.result:
Test that only 1 logfile group can be created
mysql-test/t/ndb_dd_ddl.test:
Test that only 1 logfile group can be created
mysql-test/t/ndb_dd_dump.test:
Test that only 1 logfile group can be created
storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp:
New error code for "only one logfile group" limitation
storage/ndb/src/kernel/blocks/lgman.cpp:
New error code for "only one logfile group" limitation
storage/ndb/src/ndbapi/ndberror.c:
New error code for "only one logfile group" limitation
mysql-test/r/rpl_ndb_blob.result:
test case for varsize PK + blob
mysql-test/t/rpl_ndb_blob.test:
test case for varsize PK + blob
storage/ndb/include/ndbapi/NdbBlob.hpp:
table PK in blob part key is fixed-sized so keep extra bytes zero if varsize PK
storage/ndb/src/ndbapi/NdbBlob.cpp:
table PK in blob part key is fixed-sized so keep extra bytes zero if varsize PK
