into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
storage/ndb/src/Makefile.am:
Auto merged
configure.in:
Too many changes to merge. Leaving the local version. Will add soname changes by hand.
.
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
BUILD/check-cpu:
Auto merged
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~2f6eabb2f69cb33d:
Auto merged
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/mysqladmin.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
mysys/mf_iocache.c:
Auto merged
mysys/my_read.c:
Auto merged
mysys/my_seek.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/mysqlbug.sh:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_sum.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
storage/myisam/mi_packrec.c:
Auto merged
tests/mysql_client_test.c:
Auto merged
Makefile.am:
Use local
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
Use local
sql/mysqld.cc:
Use local
strings/ctype-extra.c:
SCCS merged
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
BUILD/check-cpu:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/type_enum.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/mysqladmin.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/type_enum.test:
Auto merged
mysql-test/t/view.test:
Auto merged
mysys/my_read.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
server-tools/instance-manager/Makefile.am:
Auto merged
sql/event_queue.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_sum.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.cc:
Auto merged
storage/federated/ha_federated.cc:
Auto merged
server-tools/instance-manager/instance.cc:
Use remote (global 5.1 version)
sql/unireg.cc:
Use remote (5.1 global version)
mysql-test/t/trigger.test:
Manual merge
server-tools/instance-manager/guardian.cc:
Manual merge
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/include/portlib/NdbMem.h:
Auto merged
storage/ndb/src/common/portlib/NdbMem.c:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
Auto merged
storage/ndb/src/kernel/vm/Configuration.hpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/include/portlib/NdbMem.h:
Auto merged
storage/ndb/src/common/portlib/NdbMem.c:
Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
Auto merged
storage/ndb/src/kernel/vm/Configuration.hpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
merge
- blob event operation not reference counted correctly, missing TE_ACTIVE
- add reference counting for blobs events
- make sure also blob event operations get TE_ACTIVE
- some minor cleanups + adjustment of dbug prints
additional fix after autotest
dont send start_fragreq to temporary tables such as ordered indexes...
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
dont send START_FRAGREQ to temporary tables (such as ordered indexes)
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
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/dbtup/Dbtup.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
Auto merged
storage/ndb/src/kernel/blocks/pgman.cpp:
Auto merged
Fix DD problem during NR after 3 missed LCP's
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Send START_FRAGREQ also for fragments wo/ LCP
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
inform TUP that no LCP is restored (if no lcp is restored :-)
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
inform TUP that no LCP is restored (if no lcp is restored :-)
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
inform TUP that no LCP is restored (if no lcp is restored :-)
storage/ndb/src/kernel/blocks/pgman.cpp:
Add error insert using dump
added new field 'REFERENCED_TABLE_NAME' to 'referential_constraints' table
field 'UNIQUE_CONSTRAINT_NAME' contains the name of the referenced index
mysql-test/r/information_schema_inno.result:
result fix
mysql-test/t/information_schema_inno.test:
test fix
sql/sql_show.cc:
added new field 'REFERENCED_TABLE_NAME' to 'referential_constraints' table
field 'UNIQUE_CONSTRAINT_NAME' contains the name of the referenced index
sql/table.h:
added 'referenced_key_name' member to 'st_foreign_key_info' struct
storage/innobase/handler/ha_innodb.cc:
added the filling of referenced key name
into mysql.com:/home/kent/bk/tmp2/mysql-5.1-build
mysys/my_read.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
support-files/MySQL-shared-compat.spec.sh:
Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
Auto merged
BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e:
Auto merged
BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e:
Auto merged
BitKeeper/deleted/.del-mysqlserver.dsp~d99cfb2d291e3785:
Auto merged
storage/innobase/buf/buf0buf.c:
Auto merged
storage/innobase/fil/fil0fil.c:
Auto merged
storage/innobase/ha/ha0ha.c:
Auto merged
storage/innobase/ha/hash0hash.c:
Auto merged
storage/innobase/include/hash0hash.h:
Auto merged
storage/innobase/lock/lock0lock.c:
Auto merged
storage/innobase/log/log0recv.c:
Auto merged
storage/innobase/thr/thr0loc.c:
Auto merged
Windows warnings cleanup.
I am still get a weird warning about file descriptors closed multiple times.
storage/archive/ha_archive.cc:
Cleanup from Windows warnings.
REAL_PATH has been rewritten.
storage/archive/ha_archive.h:
real_path holds the full path of the non-symlinked version
storage/archive/archive_reader.c:
Added version bit to solve the issue of hitting old archive files when reading them.
storage/archive/azio.c:
Set the compression back on.
storage/archive/ha_archive.cc:
Cleaned up memory allocation ( a bit more logical and less tricky ).
Fixed bug in not setting autoincrement correctly and cleaned up memory usage for optimize
storage/archive/ha_archive.h:
Clean up.
into bodhi.local:/opt/local/work/mysql-5.1-runtime
mysql-test/t/csv.test:
Auto merged
server-tools/instance-manager/guardian.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
fix not aligned or non 32-bit values in "smart" scan
mysql-test/r/ndb_partition_key.result:
testcase
mysql-test/t/ndb_partition_key.test:
ndb - bug
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Fix unaligned or non-32-bit values in "smart scan"
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/include/kernel/GlobalSignalNumbers.h:
Auto merged
storage/ndb/include/kernel/NodeInfo.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
Auto merged
storage/ndb/include/ndb_version.h.in:
Auto merged
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
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/qmgr/Qmgr.hpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
storage/ndb/src/kernel/blocks/suma/SumaInit.cpp:
Auto merged
storage/ndb/src/kernel/vm/GlobalData.hpp:
Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
merge
storage/ndb/test/run-test/daily-basic-tests.txt:
merge
into bodhi.local:/opt/local/work/mysql-5.1-runtime
mysql-test/t/trigger.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
mysql-test/r/csv.result:
Manual merge.
mysql-test/t/csv.test:
Manual merge.
into zim.(none):/home/brian/mysql/archive-format-5.1
storage/archive/Makefile.am:
Auto merged
storage/archive/archive_test.c:
Auto merged
storage/archive/azio.c:
Auto merged
storage/archive/ha_archive.h:
Auto merged
storage/archive/ha_archive.cc:
Merge
storage/archive/Makefile.am:
Added archive reader
storage/archive/archive_test.c:
Extended archive test
storage/archive/azio.c:
Rewrite of azio to include support for more meta data in header
storage/archive/azlib.h:
Extended information.
storage/archive/ha_archive.cc:
Rewrite to handle new azio
storage/archive/ha_archive.h:
Rewrite to handle new azio.
storage/archive/archive_reader.c:
New BitKeeper file ``storage/archive/archive_reader.c''
Unencode internal db & table name
mysql-test/r/information_schema_inno.result:
test result
mysql-test/t/information_schema_inno.test:
test case
storage/innobase/handler/ha_innodb.cc:
Unencode internal db & table name
into moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1-bug23443
sql/item_func.cc:
Auto merged
storage/heap/hp_block.c:
Auto merged
storage/heap/hp_write.c:
Manual merge.
