into trift-lap.fambruehe:/MySQL/M51/push-5.1
mysql-test/Makefile.am:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
scripts/mysql_system_tables.sql:
Auto merged
scripts/mysql_system_tables_data.sql:
Auto merged
sql/item_subselect.h:
Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/test/ndbapi/testScanFilter.cpp:
Auto merged
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
No need to propagate 5.0 changes into a 5.1 file which is deleted anyway.
Makefile.am:
Add "funcs_1" and "funcs_2" to the 5.1 version of the "test-bt" target.
storage/ndb/src/ndbapi/NdbImpl.hpp:
Manual merge from 5.0.40
into trift-lap.fambruehe:/MySQL/M50/push-5.0
Makefile.am:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
scripts/mysql_system_tables.sql:
Auto merged
scripts/mysql_system_tables_data.sql:
Auto merged
sql/item_subselect.h:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Manual merge: Use the symbolic constant.
ndb/test/ndbapi/testScanFilter.cpp:
Manual merge: Use the standard text.
into trift-lap.fambruehe:/MySQL/M51/push-5.1
configure.in:
Auto merged
include/Makefile.am:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/partition.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
storage/ndb/src/common/debugger/signaldata/DictTabInfo.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/dblqh/Dblqh.hpp:
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/DbtupFixAlloc.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
storage/ndb/test/include/HugoOperations.hpp:
Auto merged
storage/ndb/test/ndbapi/testBasic.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/test/src/HugoOperations.cpp:
Auto merged
mysql-test/r/ndb_partition_key.result:
manual merge
sql/ha_ndbcluster.cc:
manual merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
manual merge
storage/ndb/test/src/NDBT_Table.cpp:
manual merge
sql/ha_ndbcluster.cc:
WL#1190 preparatory work needed for compatability with future online add column
- make forcing of var part reference into ndb storage default, may be overridden by table setting ROW_FORMAT=FIXED
mysql-test/r/ndb_row_format.result:
New BitKeeper file ``mysql-test/r/ndb_row_format.result''
mysql-test/t/ndb_row_format.test:
New BitKeeper file ``mysql-test/t/ndb_row_format.test''
into magare.gmz:/home/kgeorge/mysql/autopush/B27363-5.0-opt
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/item.cc:
Auto merged
sql/item_sum.cc:
Auto merged
Validity checks for nested set functions
were not taking into account that the enclosed
set function may be on a nest level that is
lower than the nest level of the enclosing set
function.
Fixed by :
- propagating max_sum_func_level
up the enclosing set functions chain.
- updating the max_sum_func_level of the
enclosing set function when the enclosed set
function is aggregated above or on the same
nest level of as the level of the enclosing
set function.
- updating the max_arg_level of the enclosing
set function on a reference that refers to
an item above or on the same nest level
as the level of the enclosing set function.
- Treating both Item_field and Item_ref as possibly
referencing items from outer nest levels.
mysql-test/r/subselect.result:
Bug #27363: test cases
mysql-test/t/subselect.test:
Bug #27363: test cases
sql/item.cc:
Bug #27363:
Treat the reference as an outer reference for the
enclosing set function even if it's referencing
an item that is above the nest level of the
enclosing set function.
Consider both Item_field and Item_ref.
sql/item_sum.cc:
Bug #27363: Use the enclosed set function aggregation
level to mark the enclosing set function even
if it's aggregated on a level that is above the
nest level of the enclosing set function.
Pass max_sum_func_level up the accending branch of the
recursion because it must take into account each
directly or indirectly nested set function.
mysql-test/t/partition.test:
Disable warnings around CREATE TABLE ... ENGINE=BLACKHOLE to make this test case work without Blackhole compiled into the server.
mysql-test/t/partition_hash.test:
Disable warnings around CREATE TABLE ... ENGINE=BLACKHOLE to make this test case work without Blackhole compiled into the server.
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
merge
storage/ndb/test/tools/Makefile.am:
merge
INSERT into InnoDB table may cause "ERROR 1062 (23000): Duplicate entry..."
errors or lost records after multi-row INSERT of the form:
"INSERT INTO t (id...) VALUES (NULL...) ON DUPLICATE KEY UPDATE id=VALUES(id)",
where "id" is an AUTO_INCREMENT column.
It happens because InnoDB handler forgets to save next insert id after
updating of auto_increment column with new values. As result of that
last insert id stored inside InnoDB dictionary tables differs from it's
cached thd->next_insert_id value.
sql/ha_innodb.cc:
Fixed bug #27650.
INSERT into InnoDB table may cause "ERROR 1062 (23000): Duplicate entry..."
errors or lost records after multi-row INSERT of the form:
"INSERT INTO t (id...) VALUES (NULL...) ON DUPLICATE KEY UPDATE id=VALUES(id)",
where "id" is an AUTO_INCREMENT column.
It happens because InnoDB handler forgets to save next insert id after
updating of auto_increment column with new values. As result of that
last insert id stored inside InnoDB dictionary tables differs from it's
cached thd->next_insert_id value.
ha_innobase::write_row() function has been corrected.
mysql-test/t/innodb_mysql.test:
Added a test case for bug #27650.
mysql-test/r/innodb_mysql.result:
Added a test case for bug #27650.
mysql-test/t/partition_not_windows-master.opt:
BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/51/mysql-test/t/partition_not_windows-master.opt
mysql-test/t/partition_not_windows.test:
Tweak comments to be more meaningful
clean up varsize
by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
clean up varsize
by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
clean up varsize
by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
clean up varsize
by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
clean up varsize
by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
clean up varsize
by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
clean up varsize
by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
clean up varsize
by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
clean up varsize
by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp:
clean up varsize
by putting varpart ref "inside" fixpart instead of "optionally" at the end
---
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-vanilla-building
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-vanilla-building
---
Fix test cases to pass for a plain ./configure && make build. This includes disabling two test cases when certain features are not present in the server. We're not losing coverage from this because these features are usually present, and disabling them here only serves the purpose to make the test cases work in the unlikely case that they aren't.
---
fixes
mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test:
Disable this test case if we don't have partitioning
mysql-test/t/rpl_row_basic_11bugs.test:
Disable warnings in a number of places to make this test case work with servers that don't contain InnoDB
---
make test case look better on request from reviewer
mysql-test/t/rpl_row_mysqlbinlog.test:
Disable this test case if the server does not have cp932 compiled in
mysql-test/t/sp.test:
Disable warnings during table creation in one place where engine=innodb is used, in order to make this test case work with a mysqld that was compiled without InnoDB.
into ymer.(none):/usr/local/mysql/mysql-5.0-ndb
ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
ndb/test/ndbapi/testBlobs.cpp:
Manual merge.
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
mysql-test/t/sp.test:
Disable warnings during table creation in one place where engine=innodb is used, in order to make this test case work with a mysqld that was compiled without InnoDB.
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.0-ndb
ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
