into zim.(none):/home/brian/mysql/arch-5.1
BUILD/compile-alpha-cxx:
Auto merged
BUILD/compile-alpha-debug:
Auto merged
BUILD/compile-dist:
Auto merged
BUILD/compile-ia64-debug-max:
Auto merged
CMakeLists.txt:
Auto merged
client/mysql.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
BUILD/FINISH.sh:
Innodbase config still needed.
affects basically all replication tests
storage/ndb/include/kernel/signaldata/SumaImpl.hpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
1) Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
2) make sure to set NdbdNodeId on _TE_STOP
storage/ndb/src/ndbapi/NdbBlob.cpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/ndbapi/NdbEventOperation.cpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/ndbapi/Ndbif.cpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
Fix so that expand_check2 is only run per fragment,
as restore now works 1 fragment at a time (again)
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Fix so that expand_check2 is only run per fragment,
as restore now works 1 fragment at a time (again)
Deleted config/ac-macros/ha_berkeley.m4
Removed more referenses to bdb
BitKeeper/deleted/.del-ha_berkeley.m4:
Delete: config/ac-macros/ha_berkeley.m4
BUILD/FINISH.sh:
Removed more referenses to bdb
BUILD/compile-alpha-cxx:
Removed more referenses to bdb
BUILD/compile-alpha-debug:
Removed more referenses to bdb
BUILD/compile-dist:
Removed more referenses to bdb
BUILD/compile-ia64-debug-max:
Removed more referenses to bdb
CMakeLists.txt:
Removed more referenses to bdb
Makefile.am:
Removed more referenses to bdb
libmysqld/lib_sql.cc:
Removed more referenses to bdb
sql/mysql_priv.h:
Removed more referenses to bdb
storage/ndb/config/win-prg.am:
Removed more referenses to bdb
storage/ndb/test/run-test/ndb-autotest.sh:
Removed more referenses to bdb
support-files/my-huge.cnf.sh:
Removed more referenses to bdb
support-files/my-large.cnf.sh:
Removed more referenses to bdb
support-files/my-medium.cnf.sh:
Removed more referenses to bdb
fix bug in drop_file during pageout (LCP)
storage/ndb/src/kernel/blocks/pgman.cpp:
1) Allow Page_entry::REQUEST, when dropping page (in drop_file path)
2) Do all IO JBA
3) Handle PAGEOUT during drop_file (caused by LCP)
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
mysql-test/r/ndb_lock.result:
Auto merged
mysql-test/t/ndb_lock.test:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
mysql-test/t/disabled.def:
SCCS merged
sql/ha_ndbcluster.cc:
e
merge
Fix bug in lcp during drop table
Make sure that file thread is not started until meta data has completed
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Fix bug in lcp during drop table
Make sure that file thread is not started until meta data has completed
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
Fix bug in lcp during drop table
Make sure that file thread is not started until meta data has completed
storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp:
Fix bug in lcp during drop table
Make sure that file thread is not started until meta data has completed
into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
Fix build failure if O_DIRECT is not defined
Fix stack overflow by making odirect_readbuf global
Remove soem old debug variables
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Fix build failure if O_DIRECT is not defined
Fix stack overflow by making odirect_readbuf global
Remove soem old debug variables
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
Fix build failure if O_DIRECT is not defined
Fix stack overflow by making odirect_readbuf global
Remove soem old debug variables
into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
mysql-test/t/disabled.def:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/include/ndbapi/NdbOperation.hpp:
Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
storage/ndb/src/mgmapi/ndb_logevent.cpp:
Auto merged
storage/ndb/test/ndbapi/testIndex.cpp:
Auto merged
storage/ndb/test/ndbapi/testSystemRestart.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
merge
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
merge
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
merge
storage/ndb/test/run-test/daily-basic-tests.txt:
merge
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921:
Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
Auto merged
BitKeeper/deleted/.del-mysys.dsp~32695fee91189326:
Auto merged
BitKeeper/deleted/.del-im_options_set.imtest~b53d9d60e5684833:
Auto merged
BitKeeper/deleted/.del-im_options_unset.imtest~768eb186b51d0048:
Auto merged
BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f:
Auto merged
client/mysql.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
client/mysqlcheck.c:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
dbug/dbug.c:
Auto merged
extra/perror.c:
Auto merged
extra/yassl/src/yassl_imp.cpp:
Auto merged
extra/yassl/src/yassl_int.cpp:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/cast.result:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/federated.result:
Auto merged
mysql-test/r/func_compress.result:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/gis-rtree.result:
Auto merged
mysql-test/r/gis.result:
Auto merged
mysql-test/r/im_daemon_life_cycle.result:
Auto merged
mysql-test/r/im_utils.result:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/r/mysqlcheck.result:
Auto merged
mysql-test/r/rpl_sp.result:
Auto merged
mysql-test/r/rpl_trigger.result:
Auto merged
mysql-test/r/sp-code.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/strict.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/r/type_datetime.result:
Auto merged
mysql-test/r/type_ranges.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/r/user_var.result:
Auto merged
mysql-test/t/cast.test:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/func_group.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
Auto merged
mysql-test/t/im_life_cycle.imtest:
Auto merged
mysql-test/t/im_utils.imtest:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
mysql-test/t/mysqlcheck.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/rpl_trigger.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/strict.test:
Auto merged
mysql-test/t/udf.test:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
sql-common/client.c:
Auto merged
sql-common/my_time.c:
Auto merged
sql/table.h:
Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
mysql-test/r/im_life_cycle.result:
e
use local
mysql-test/r/ps.result:
use local
client/Makefile.am:
Manual merge.
client/mysqlimport.c:
Manual merge.
configure.in:
Manual merge.
mysql-test/mysql-test-run.pl:
Manual merge.
mysql-test/r/mysqldump.result:
Manual merge.
mysql-test/r/mysqltest.result:
Manual merge.
mysql-test/r/ndb_basic.result:
Manual merge.
mysql-test/r/rpl_view.result:
Manual merge.
mysql-test/r/show_check.result:
Manual merge.
mysql-test/r/sp-error.result:
Manual merge.
mysql-test/r/sp.result:
Manual merge.
mysql-test/r/union.result:
Manual merge.
mysql-test/t/mysqldump.test:
Manual merge.
mysql-test/t/mysqltest.test:
Manual merge.
mysql-test/t/ndb_basic.test:
Manual merge.
mysql-test/t/rpl_sp.test:
Manual merge.
mysql-test/t/rpl_view.test:
Manual merge.
mysql-test/t/show_check.test:
Manual merge.
mysql-test/t/sp-error.test:
Manual merge.
mysql-test/t/sp.test:
Manual merge.
sql/item_sum.cc:
Manual merge.
sql/mysql_priv.h:
Manual merge.
sql/sp_head.cc:
Manual merge.
sql/sql_db.cc:
Manual merge.
sql/sql_delete.cc:
Manual merge.
sql/sql_lex.h:
Manual merge.
sql/sql_show.cc:
Manual merge.
sql/sql_table.cc:
Manual merge.
sql/sql_trigger.cc:
Manual merge.
sql/sql_yacc.yy:
Manual merge.
tests/mysql_client_test.c:
Manual merge.
into mysql.com:/home/marty/MySQL/mysql-5.1-ndb
mysql-test/r/ndb_read_multi_range.result:
Auto merged
mysql-test/t/ndb_lock.test:
Auto merged
mysql-test/t/ndb_read_multi_range.test:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
mysql-test/r/ndb_lock.result:
Merge (using local)
sql/ha_ndbcluster.cc:
Merge fix for bug #18184 SELECT ... FOR UPDATE does not work..
sql/ha_ndbcluster.h:
Merge fix for bug #18184 SELECT ... FOR UPDATE does not work..
Add extra sleeps (conditionally) if user-ndb-object still exists during shutdown
Note: This is not in anyway optimal, but i dont't really know in which order should be shutdown
but it fixes problem...
sql/ha_ndbcluster_binlog.cc:
Add extra wait loop to make user "user" ndb-object go away...
otherwise user thread can have ongoing SUB_DATA
storage/ndb/include/ndbapi/ndb_cluster_connection.hpp:
Add interface for getting active ndb-object count
storage/ndb/src/ndbapi/Ndbif.cpp:
Add return in case of incorrect magic
storage/ndb/src/ndbapi/TransporterFacade.cpp:
Add interface for getting active ndb-object count
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
Add interface for getting active ndb-object count
make fragment logpart in DIH "global"
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Store logpart id in FRAGMENTATION as it goes very bad if
they differ on different nodes, as they are copied from master
on node/system -restart
