into mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-merge
sql/handler.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
sql/ha_ndbcluster.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
bug#19141, bug#18575
Maek sure global dict lock is taken during create/drop file/filegroup
storage/ndb/include/kernel/signaldata/DropFilegroup.hpp:
Fix error code
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Fix c_blockState lock for createdrop file/filegroup
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Fix not master for create/drop file
ndb: corrected initialization of records
mysql-test/Makefile.am:
ndb: corrected install dir
sql/ha_ndbcluster.cc:
ndb: corrected initialization of records
A-insert/B-insert/A-rollback/B-rollback leads to node crash, as bits in tuple header gets incorrectly assigned in second insert
this also likely fixes bug 18589 and explains 18808
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
remove debug printout
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Make sure that alloc bit is set if insert and first_op
storage/ndb/test/ndbapi/testBasic.cpp:
testcase for bug#19245
storage/ndb/test/run-test/daily-basic-tests.txt:
testcase for bug#19245
fix bug#19244, dd page got locked in page cache
likely fix bug 18780
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
Fix so that insert/delete on DD does not lock page forever in memory
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
Set page to dirty when aborting prealloc
fix memory corruption in event-api
maybe bug fix for 18621, 19154, 19172, 19174
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Make sure that nasty c++ features arent run on Gci_container as it's supposed to be POD!
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
Make sure that nasty c++ features arent run on Gci_container as it's supposed to be POD!
mysql-test/std_data/ndb_backup50/BACKUP-1.1.ctl:
New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1.1.ctl''
mysql-test/std_data/ndb_backup50/BACKUP-1.2.ctl:
New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1.2.ctl''
mysql-test/std_data/ndb_backup51/BACKUP-1.1.ctl:
New BitKeeper file ``mysql-test/std_data/ndb_backup51/BACKUP-1.1.ctl''
mysql-test/std_data/ndb_backup51/BACKUP-1.2.ctl:
New BitKeeper file ``mysql-test/std_data/ndb_backup51/BACKUP-1.2.ctl''
- added compatability with 5.0
- added test case for compatability with 5.0 and 5.1
mysql-test/std_data/ndb_backup50/BACKUP-1-0.1.Data:
New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1-0.1.Data''
mysql-test/std_data/ndb_backup50/BACKUP-1-0.2.Data:
New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1-0.2.Data''
mysql-test/std_data/ndb_backup50/BACKUP-1.1.log:
New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1.1.log''
mysql-test/std_data/ndb_backup50/BACKUP-1.2.log:
New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1.2.log''
mysql-test/std_data/ndb_backup51/BACKUP-1-0.1.Data:
New BitKeeper file ``mysql-test/std_data/ndb_backup51/BACKUP-1-0.1.Data''
mysql-test/std_data/ndb_backup51/BACKUP-1-0.2.Data:
New BitKeeper file ``mysql-test/std_data/ndb_backup51/BACKUP-1-0.2.Data''
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18962
mysql-test/r/partition_pruning.result:
Auto merged
sql/partition_info.cc:
Auto merged
mysql-test/include/rpl_multi_engine3.inc:
add some sleep for __slow__ replication
mysql-test/t/disabled.def:
enable rpl_ndb_2myisam but keep rpl_ndb_2innodb disabled, new bug#19227
