into ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca
storage/ndb/test/include/HugoOperations.hpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/test/src/HugoOperations.cpp:
Auto merged
storage/ndb/test/ndbapi/testBasic.cpp:
SCCS merged
into ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/test/include/HugoOperations.hpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/test/src/HugoOperations.cpp:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Manual merge.
storage/ndb/test/ndbapi/testBasic.cpp:
Manual merge.
storage/ndb/test/ndbapi/testNdbApi.cpp:
Manual merge.
into ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Manual merge.
into ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
storage/ndb/include/ndbapi/NdbOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
In a certain code path the NDBD could loop infinitely in the lock queue.
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Fix infinite loop.
storage/ndb/test/include/HugoOperations.hpp:
Add optional hinting of TC for new transactions.
storage/ndb/test/ndbapi/testBasic.cpp:
Add test case.
storage/ndb/test/run-test/daily-basic-tests.txt:
Add test case.
storage/ndb/test/src/HugoOperations.cpp:
Add optional hinting of TC for new transactions.
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
When running nodes return AllocNodeIdRef::NodeFailureHandlingNotCompleted error during applying the node id for restarting nodes, it should try again.
storage/ndb/src/ndbapi/ndberror.c:
change AllocNodeIdRef::NodeFailureHandlingNotCompleted error from permanent error to temporary error
Bug #24227 ndb_size.pl should report default values instead of < default for config params
Bug #24229 ndb_size.pl doesn't compute Index usage correctly
Big ndb_size.pl update
BitKeeper/deleted/.del-ndb_size.tmpl:
Delete: storage/ndb/tools/ndb_size.tmpl
storage/ndb/tools/Makefile.am:
ndb_size.tmpl no longer required
storage/ndb/tools/ndb_size.pl:
total revamp.
remove use of template, improve functionality.
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/bug18676
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_table.cc:
Auto merged
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug22240
storage/ndb/tools/restore/consumer_restore.cpp:
Auto merged
storage/ndb/tools/restore/restore_main.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Auto merged
into dev3-164.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-23137
config/ac-macros/ha_ndbcluster.m4:
Auto merged
storage/ndb/config/common.mk.am:
Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
1)Assign the correct array type for varchar and varbinary type when creating them in NDB kernel
2)Replace the max length defined with the real length used for var data
storage/ndb/tools/restore/consumer_restore.hpp:
Add the "m_no_upgrade" member variable to decide if upgrading array type for var type
storage/ndb/tools/restore/restore_main.cpp:
Add --no-upgrade(-u) option for ndb_restore to decide if upgrade array type for var data.
The default is false, it should be used with --skip-table-check(-s) option when -u option is unused.
- Post merge cleanup.
CMakeLists.txt:
Bug#24732 Executables do not include Vista manifests
- Added logic for EMBED_MANIFESTS configuration option.
client/CMakeLists.txt:
Bug#24732 Executables do not include Vista manifests
- Embed manifest with custom CMake MACRO for client executables.
extra/CMakeLists.txt:
Bug#24732 Executables do not include Vista manifests
- Embed manifest with custom CMake MACRO for my_print_default executable.
libmysql/CMakeLists.txt:
Bug#24732 Executables do not include Vista manifests
- Embed manifest with custom CMake MACRO for myTest executable.
server-tools/instance-manager/CMakeLists.txt:
Bug#24732 Executables do not include Vista manifests
- Embed manifest with custom CMake MACRO for mysqlmanager executable.
sql/CMakeLists.txt:
Bug#24732 Executables do not include Vista manifests
- Embed manifest with custom CMake MACRO for mysqld executable.
storage/myisam/CMakeLists.txt:
Bug#24732 Executables do not include Vista manifests
- Embed manifest with custom CMake MACRO for myisam executables.
win/README:
Bug#24732 Executables do not include Vista manifests
- Added new configuration option documentation.
win/configure.js:
Bug#24732 Executables do not include Vista manifests
- Added new EMBED_MANIFESTS configuration option.
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
client/Makefile.am:
Auto merged
client/mysql.cc:
Auto merged
configure.in:
Auto merged
client/mysqltest.c:
Auto merged
libmysqld/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
add (auto) testcase for bug#28023
storage/ndb/test/ndbapi/testNodeRestart.cpp:
add testcase for bug#28023
storage/ndb/test/run-test/daily-basic-tests.txt:
add testcase for bug#28023
into romeo.(none):/home/bk/merge-mysql-5.1
BitKeeper/etc/ignore:
auto-union
client/mysql.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
configure.in:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/r/rpl_ndb_basic.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
BitKeeper/deleted/.del-configure.in.rej:
Auto merged
configure.in:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
Fixes:
- Bug #26662: mysqld assertion when creating temporary (InnoDB) table on a tmpfs filesystem
Fix by not open(2)ing with O_DIRECT but rather calling fcntl(2) to set
this flag immediately after open(2)ing. This way an error caused by
O_DIRECT not being supported can easily be ignored.
- Bug #23313: AUTO_INCREMENT=# not reported back for InnoDB tables
- Bug #21404: AUTO_INCREMENT value reset when Adding FKEY (or ALTER?)
Report the current value of the AUTO_INCREMENT counter to MySQL.
mysql-test/r/innodb.result:
Applied innodb-5.1-ss1404 snapshot
Revision r1404:
Report the current value of the AUTO_INCREMENT counter to MySQL.
(Bug #23313, Bug #21404)
ha_innobase::update_create_info(): New function, to report
the auto_increment_value.
mysql-test/t/innodb.test:
Applied innodb-5.1-ss1404 snapshot
Revision r1404:
Report the current value of the AUTO_INCREMENT counter to MySQL.
(Bug #23313, Bug #21404)
ha_innobase::update_create_info(): New function, to report
the auto_increment_value.
storage/innobase/handler/ha_innodb.cc:
Applied innodb-5.1-ss1404 snapshot
Revision r1404:
Report the current value of the AUTO_INCREMENT counter to MySQL.
(Bug #23313, Bug #21404)
ha_innobase::update_create_info(): New function, to report
the auto_increment_value.
storage/innobase/handler/ha_innodb.h:
Applied innodb-5.1-ss1404 snapshot
Revision r1404:
Report the current value of the AUTO_INCREMENT counter to MySQL.
(Bug #23313, Bug #21404)
ha_innobase::update_create_info(): New function, to report
the auto_increment_value.
storage/innobase/os/os0file.c:
Applied innodb-5.1-ss1404 snapshot
Revision r1395:
* Fix Bug#26662 by not open(2)ing with O_DIRECT but rather calling fcntl(2)
to set this flag immediately after open(2)ing. This way an error caused by
O_DIRECT not being supported can easily be ignored.
* Add support for skipping the OS caching on Solaris by calling directio()
instead of fcntl().
Approved by: Heikki
Revision r1391:
Merge the bodies of os_file_handle_error() and os_file_handle_error_no_exit()
into a generic function which is called from both os_file_handle_error() and
os_file_handle_error_no_exit()
Approved by: Marko
storage/innobase/plug.in:
Applied innodb-5.1-ss1404 snapshot
Revision r1395:
* Fix Bug#26662 by not open(2)ing with O_DIRECT but rather calling fcntl(2)
to set this flag immediately after open(2)ing. This way an error caused by
O_DIRECT not being supported can easily be ignored.
* Add support for skipping the OS caching on Solaris by calling directio()
instead of fcntl().
Approved by: Heikki
into mysql.com:/home/svoj/devel/mysql/BUG24342/mysql-5.1-engines
mysql-test/r/merge.result:
Auto merged
mysql-test/t/merge.test:
Auto merged
storage/myisam/mi_rkey.c:
Auto merged
storage/myisam/myisamdef.h:
Auto merged
storage/myisammrg/myrg_rkey.c:
SCCS 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/dbdict/Dbdict.hpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
Auto merged
storage/ndb/test/ndbapi/testDict.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/test/src/NDBT_Test.cpp:
Auto merged
redo checkSchemaState to handle bug (plus prepare to handle other DD related bugs in the area)
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
bug#21755
redo checkSchemaState to handle bug (plus prepare to handle other DD related bugs in the area)
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
bug#21755
new big test prg testDict -n DictRestart
new bug test prg testDict -n Bug21755
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
new small FS trace feature
storage/ndb/test/ndbapi/testDict.cpp:
new big test prg testDict -n DictRestart
new bug test prg testDict -n Bug21755
storage/ndb/test/run-test/daily-basic-tests.txt:
new big test prg testDict -n DictRestart
new bug test prg testDict -n Bug21755
refactor testSRBank and create new class NdbMixRestarter
storage/ndb/test/ndbapi/testSRBank.cpp:
refactor testSRBank and create new class NdbMixRestarter
storage/ndb/test/src/Makefile.am:
refactor testSRBank and create new class NdbMixRestarter
storage/ndb/test/src/NDBT_Test.cpp:
fix
storage/ndb/test/include/NdbMixRestarter.hpp:
New BitKeeper file ``storage/ndb/test/include/NdbMixRestarter.hpp''
storage/ndb/test/src/NdbMixRestarter.cpp:
New BitKeeper file ``storage/ndb/test/src/NdbMixRestarter.cpp''
