storage/ndb/include/ndbapi/NdbEventOperation.hpp:
event merge false by default => change option name
storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp:
event merge false by default => change option name
storage/ndb/src/ndbapi/NdbEventOperation.cpp:
event merge false by default => change option name
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
event merge false by default => change option name
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
event merge false by default => change option name
storage/ndb/test/ndbapi/test_event.cpp:
event merge false by default => change option name
storage/ndb/test/ndbapi/test_event_merge.cpp:
event merge false by default => change option name
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
storage/ndb/include/util/Bitmask.hpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/test/ndbapi/testDataBuffers.cpp:
Auto merged
mysql-test/r/ndb_bitfield.result:
merge
mysql-test/t/ndb_bitfield.test:
merge
mysql-test/include/have_ndb_extra.inc:
New BitKeeper file ``mysql-test/include/have_ndb_extra.inc''
mysql-test/include/not_ndb.inc:
New BitKeeper file ``mysql-test/include/not_ndb.inc''
mysql-test/r/have_ndb_extra.require:
New BitKeeper file ``mysql-test/r/have_ndb_extra.require''
mysql-test/r/ndb_alter_table_row.result:
New BitKeeper file ``mysql-test/r/ndb_alter_table_row.result''
mysql-test/r/ndb_alter_table_stm.result:
New BitKeeper file ``mysql-test/r/ndb_alter_table_stm.result''
mysql-test/r/ndb_binlog_basic.result:
New BitKeeper file ``mysql-test/r/ndb_binlog_basic.result''
mysql-test/r/ndb_binlog_multi.result:
New BitKeeper file ``mysql-test/r/ndb_binlog_multi.result''
mysql-test/r/ndb_multi_row.result:
New BitKeeper file ``mysql-test/r/ndb_multi_row.result''
mysql-test/r/not_ndb.require:
New BitKeeper file ``mysql-test/r/not_ndb.require''
mysql-test/r/rpl_ndb_bank.result:
New BitKeeper file ``mysql-test/r/rpl_ndb_bank.result''
mysql-test/r/rpl_ndb_basic.result:
New BitKeeper file ``mysql-test/r/rpl_ndb_basic.result''
mysql-test/r/rpl_ndb_disk.result:
New BitKeeper file ``mysql-test/r/rpl_ndb_disk.result''
mysql-test/r/rpl_ndb_idempotent.result:
New BitKeeper file ``mysql-test/r/rpl_ndb_idempotent.result''
mysql-test/r/rpl_ndb_load.result:
New BitKeeper file ``mysql-test/r/rpl_ndb_load.result''
mysql-test/r/rpl_ndb_multi.result:
New BitKeeper file ``mysql-test/r/rpl_ndb_multi.result''
mysql-test/r/rpl_ndb_sync.result:
New BitKeeper file ``mysql-test/r/rpl_ndb_sync.result''
mysql-test/r/rpl_row_basic_7ndb.result:
New BitKeeper file ``mysql-test/r/rpl_row_basic_7ndb.result''
mysql-test/t/ndb_alter_table_row.test:
New BitKeeper file ``mysql-test/t/ndb_alter_table_row.test''
mysql-test/t/ndb_alter_table_stm.test:
New BitKeeper file ``mysql-test/t/ndb_alter_table_stm.test''
mysql-test/t/ndb_binlog_basic.test:
New BitKeeper file ``mysql-test/t/ndb_binlog_basic.test''
mysql-test/t/ndb_binlog_multi.test:
New BitKeeper file ``mysql-test/t/ndb_binlog_multi.test''
mysql-test/t/ndb_multi_row.test:
New BitKeeper file ``mysql-test/t/ndb_multi_row.test''
mysql-test/t/rpl_ndb_bank.test:
New BitKeeper file ``mysql-test/t/rpl_ndb_bank.test''
mysql-test/t/rpl_ndb_basic.test:
New BitKeeper file ``mysql-test/t/rpl_ndb_basic.test''
mysql-test/t/rpl_ndb_disk.test:
New BitKeeper file ``mysql-test/t/rpl_ndb_disk.test''
mysql-test/t/rpl_ndb_idempotent.test:
New BitKeeper file ``mysql-test/t/rpl_ndb_idempotent.test''
mysql-test/t/rpl_ndb_load.test:
New BitKeeper file ``mysql-test/t/rpl_ndb_load.test''
mysql-test/t/rpl_ndb_multi.test:
New BitKeeper file ``mysql-test/t/rpl_ndb_multi.test''
mysql-test/t/rpl_ndb_sync.test:
New BitKeeper file ``mysql-test/t/rpl_ndb_sync.test''
mysql-test/t/rpl_row_basic_7ndb.test:
New BitKeeper file ``mysql-test/t/rpl_row_basic_7ndb.test''
sql/ha_ndbcluster_binlog.cc:
New BitKeeper file ``sql/ha_ndbcluster_binlog.cc''
sql/ha_ndbcluster_binlog.h:
New BitKeeper file ``sql/ha_ndbcluster_binlog.h''
sql/ha_ndbcluster_tables.h:
New BitKeeper file ``sql/ha_ndbcluster_tables.h''
sql/rpl_injector.cc:
New BitKeeper file ``sql/rpl_injector.cc''
sql/rpl_injector.h:
New BitKeeper file ``sql/rpl_injector.h''
storage/ndb/include/kernel/signaldata/DihFragCount.hpp:
New BitKeeper file ``storage/ndb/include/kernel/signaldata/DihFragCount.hpp''
storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp:
Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
are the same function.
storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp:
Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
are the same function.
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
are the same function.
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
are the same function.
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
are the same function.
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
Add missing return value, otherwise Sun compiler complains.
fix Suma get buffer ptr, adopt to new page pool in tup
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Fix new page pool usage
previously it accepted page = base + RNIL, since it didnt use page anyway, sort of a prefetch...
into mysql.com:/space/pekka/ndb/version/my51-rbr
storage/ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
storage/ndb/test/ndbapi/test_event.cpp:
Auto merged
into mysql.com:/usr/local/mysql/mysql-5.1-new
storage/ndb/src/common/portlib/Makefile.am:
Auto merged
BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838:
Auto merged
storage/ndb/config/common.mk.am:
Manual merge.
