(since am cant build directories in parallell)
BitKeeper/deleted/.del-Makefile.am~661a7e944c6a2048:
Delete: storage/ndb/src/kernel/blocks/dbacc/Makefile.am
BitKeeper/deleted/.del-Makefile.am~7062fe587bbd7db4:
Delete: storage/ndb/src/kernel/blocks/cmvmi/Makefile.am
BitKeeper/deleted/.del-Makefile.am~b7531a4ddc688658:
Delete: storage/ndb/src/kernel/blocks/dbtux/Makefile.am
BitKeeper/deleted/.del-Makefile.am~e06c16d4515a6ce6:
Delete: storage/ndb/src/kernel/blocks/dbtc/Makefile.am
BitKeeper/deleted/.del-Makefile.am~1f16f5bcb0850b40:
Delete: storage/ndb/src/kernel/blocks/qmgr/Makefile.am
BitKeeper/deleted/.del-Makefile.am~2446a572de707944:
Delete: storage/ndb/src/kernel/blocks/trix/Makefile.am
BitKeeper/deleted/.del-Makefile.am~51344ef8d0bbc561:
Delete: storage/ndb/src/kernel/blocks/suma/Makefile.am
BitKeeper/deleted/.del-Makefile.am~c65b52fdd2143330:
Delete: storage/ndb/src/kernel/blocks/ndbfs/Makefile.am
BitKeeper/deleted/.del-Makefile.am~c9ae371812ceaf68:
Delete: storage/ndb/src/kernel/blocks/dbutil/Makefile.am
BitKeeper/deleted/.del-Makefile.am~e1b9fbc3d07a629d:
Delete: storage/ndb/src/kernel/blocks/ndbcntr/Makefile.am
storage/ndb/src/kernel/Makefile.am:
Merge all blocks into one lib
storage/ndb/src/kernel/blocks/Makefile.am:
Merge all blocks into one lib
storage/ndb/src/kernel/blocks/backup/Makefile.am:
Merge all blocks into one lib
storage/ndb/src/kernel/blocks/dbdict/Makefile.am:
Merge all blocks into one lib
storage/ndb/src/kernel/blocks/dbdih/Makefile.am:
Merge all blocks into one lib
storage/ndb/src/kernel/blocks/dblqh/Makefile.am:
Merge all blocks into one lib
storage/ndb/src/kernel/blocks/dbtup/Makefile.am:
Merge all blocks into one lib
storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
Merge all blocks into one lib
(reviewed by Mats)
sql/log_event.cc:
Changes to avoid compilation errors in MS Visual Studio 7.1
sql/sql_class.cc:
Changes to avoid compilation errors in MS Visual Studio 7.1
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 mysql.com:/home/alik/MySQL/devel/5.1-tree
include/config-win.h:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/rpl_ddl.result:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110
into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
BitKeeper/etc/ignore:
auto-union
client/mysqldump.c:
Auto merged
include/mysql_com.h:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/type_time.result:
Auto merged
sql/Makefile.am:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
client/Makefile.am:
Add my_user.c
include/Makefile.am:
Add my_user.c
libmysqld/Makefile.am:
Add my_user.c
mysql-test/t/disabled.def:
Enable type_time.test
sql/sql_parse.cc:
Merge.
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/r/archive.result:
New results
mysql-test/t/archive.test:
More tests for indexes and new tests for being selective on selects.
sql/ha_archive.cc:
We now look and see if blobs are needed, and if they are not, we seek past them.
into poseidon.ndb.mysql.com:/home/tomas/v7
include/my_base.h:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
mysql-test/t/disabled.def:
SCCS merged
Added --use-threads option for porting to Windows.
client/mysqlslap.c:
Addinng thread option for porting to windows (second piece of code)
Also added flush call to fix one bug
mysql-test/r/mysqlslap.result:
New results
mysql-test/t/disabled.def:
Bug 16167 should not be fixed
mysql-test/t/mysqlslap.test:
Added test for new use-threads option
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''