mysql-test/r/ndb_basic.result:
replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
mysql-test/r/ndb_blob.result:
replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
mysql-test/r/ndb_charset.result:
replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
mysql-test/r/ndb_condition_pushdown.result:
replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
mysql-test/r/ndb_dd_sql_features.result:
replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
mysql-test/r/ndb_subquery.result:
replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
mysql-test/t/ndb_basic.test:
replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
mysql-test/t/ndb_blob.test:
replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
mysql-test/t/ndb_charset.test:
replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
mysql-test/t/ndb_condition_pushdown.test:
replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
mysql-test/t/ndb_dd_sql_features.test:
replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
mysql-test/t/ndb_subquery.test:
replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
ps_6bdb (this one fails circa once over 4 runs). After the merge: the same PLUS mysql_client_test&sp (due to problem in fix of BUG#14845 which has also
been noticed in 5.0 too and Konstantin is looking at it) PLUS mysqlcheck (just consequence of mysql_client_test).
And a replication bugfix (thd->spcont must be taken into account when calling tables_ok(), as in 5.0,
and so some brackets were missing which changed one test).
Pekka will look at the NDB code where I just used "ul": ndb_charset test, and storage/ndb/src/kernel/vm/SimulatedBlock.cpp
and storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp (SimulatedBlock.hpp automerged);
please also check storage/ndb/src/ndbapi/NdbRecAttr.cpp. Petr please check ha_tina.cc.
mysql-test/r/ndb_charset.result:
"ul" in merge (Pekka please fix)
mysql-test/t/ndb_charset.test:
"ul" in merge (Pekka please fix)
sql/sql_acl.cc:
missing ()
sql/sql_parse.cc:
If thd->spcont is true, always replicate (as in 5.0) (bad old merge probably).
into mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
(2nd try; Pekka kindly accepted to fix storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
and storage/ndb/src/kernel/vm/SimulatedBlock.cpp after I push).
configure.in:
Auto merged
mysql-test/r/ndb_charset.result:
Auto merged
mysql-test/t/view.test:
Auto merged
mysys/base64.c:
Auto merged
sql/ha_archive.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/myisam/ft_parser.c:
Auto merged
storage/ndb/include/kernel/AttributeDescriptor.hpp:
Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
Auto merged
storage/ndb/tools/ndb_size.pl:
Auto merged
storage/ndb/tools/ndb_size.tmpl:
Auto merged
mysql-test/t/disabled.def:
merge
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
used "ul", Pekka said he'll fix
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
used "ul", Pekka said he'll fix
mysql-test/r/ndb_basic.result:
wl#2624 re-commit due to bk problem
mysql-test/r/ndb_blob.result:
wl#2624 re-commit due to bk problem
mysql-test/r/ndb_charset.result:
wl#2624 re-commit due to bk problem
mysql-test/r/ndb_condition_pushdown.result:
wl#2624 re-commit due to bk problem
mysql-test/r/ndb_index_ordered.result:
wl#2624 re-commit due to bk problem
mysql-test/t/ndb_index_ordered.test:
wl#2624 re-commit due to bk problem
sql/ha_ndbcluster.cc:
wl#2624 re-commit due to bk problem
sql/ha_ndbcluster.h:
wl#2624 re-commit due to bk problem
sql/mysqld.cc:
wl#2624 re-commit due to bk problem
sql/set_var.cc:
wl#2624 re-commit due to bk problem
sql/sql_class.h:
wl#2624 re-commit due to bk problem
storage/ndb/include/kernel/AttributeHeader.hpp:
wl#2624 re-commit due to bk problem
storage/ndb/include/ndbapi/NdbDictionary.hpp:
wl#2624 re-commit due to bk problem
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
wl#2624 re-commit due to bk problem
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
wl#2624 re-commit due to bk problem
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
wl#2624 re-commit due to bk problem
storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
wl#2624 re-commit due to bk problem
storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
wl#2624 re-commit due to bk problem
storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
wl#2624 re-commit due to bk problem
storage/ndb/src/kernel/blocks/dbtux/Makefile.am:
wl#2624 re-commit due to bk problem
storage/ndb/src/ndbapi/Makefile.am:
wl#2624 re-commit due to bk problem
storage/ndb/src/ndbapi/NdbDictionary.cpp:
wl#2624 re-commit due to bk problem
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
wl#2624 re-commit due to bk problem
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
wl#2624 re-commit due to bk problem
Fix ndb_limit, handle cmpDate of length 3
Remove ucs2 test as it requires one to configure --with-extra-charsets
mysql-test/r/ndb_charset.result:
Remove ucs2 test as it requires one to configure --with-extra-charsets
mysql-test/t/ndb_charset.test:
Remove ucs2 test as it requires one to configure --with-extra-charsets
ndb/src/common/util/NdbSqlUtil.cpp:
Fix ndb_limit, handle cmpDate of length 3
mysql-test/r/ndb_alter_table.result:
wl-1442 new varchar
mysql-test/r/ndb_bitfield.result:
wl-1442 new varchar
mysql-test/r/ndb_charset.result:
wl-1442 new varchar
mysql-test/t/ndb_charset.test:
wl-1442 new varchar
ndb/include/kernel/signaldata/DictTabInfo.hpp:
wl-1442 new varchar
ndb/include/ndb_constants.h:
wl-1442 new varchar
ndb/include/ndbapi/NdbDictionary.hpp:
wl-1442 new varchar
ndb/include/util/NdbSqlUtil.hpp:
wl-1442 new varchar
ndb/src/common/util/NdbSqlUtil.cpp:
wl-1442 new varchar
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
wl-1442 new varchar
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
wl-1442 new varchar
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
wl-1442 new varchar
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
wl-1442 new varchar
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
wl-1442 new varchar
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
wl-1442 new varchar
ndb/src/ndbapi/NdbDictionary.cpp:
wl-1442 new varchar
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
wl-1442 new varchar
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
wl-1442 new varchar
ndb/src/ndbapi/NdbOperationDefine.cpp:
wl-1442 new varchar
ndb/src/ndbapi/NdbOperationSearch.cpp:
wl-1442 new varchar
ndb/src/ndbapi/NdbRecAttr.cpp:
wl-1442 new varchar
ndb/src/ndbapi/NdbTransaction.cpp:
wl-1442 new varchar
ndb/test/ndbapi/testOIBasic.cpp:
wl-1442 new varchar
sql/ha_ndbcluster.cc:
wl-1442 new varchar
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
oops
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
jamEntry
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
jamEntry
mysql-test/r/ndb_index.result:
ndb charsets: minimal fix to make test pass
mysql-test/t/ndb_index.test:
ndb charsets: minimal fix to make test pass
