3355 Ole John Aske 2011-06-16 [merge]
Initial merge of mysql-5.1-telco-7.0-spj-scan-scan into mysql-5.5-cluster
added:
mysql-test/suite/ndb/r/ndb_join_pushdown.result
mysql-test/suite/ndb/t/ndb_join_pushdown.test
sql/abstract_query_plan.cc
sql/abstract_query_plan.h
sql/ha_ndbcluster_push.cc
sql/ha_ndbcluster_push.h
storage/ndb/ndbapi-examples/ndbapi_multi_cursor/
storage/ndb/ndbapi-examples/ndbapi_multi_cursor/main.cpp
storage/ndb/test/tools/spj_performance_test.cpp
storage/ndb/test/tools/spj_sanity_test.cpp
storage/ndb/test/tools/test_spj.cpp
modified:
.bzr-mysql/default.conf
libmysqld/CMakeLists.txt
mysql-test/suite/ndb/my.cnf
mysql-test/suite/ndb/r/ndb_basic.result
mysql-test/suite/ndb/r/ndb_blob.result
mysql-test/suite/ndb/r/ndb_condition_pushdown.result
mysql-test/suite/ndb/r/ndb_dbug_tc_select.result
mysql-test/suite/ndb/r/ndb_gis.result
mysql-test/suite/ndb/r/ndb_index.result
mysql-test/suite/ndb/r/ndb_statistics.result
mysql-test/suite/ndb/t/ndb_condition_pushdown.test
mysql-test/suite/ndb/t/ps_7ndb.test
scripts/mysql_system_tables.sql
sql/CMakeLists.txt
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.h
sql/ha_ndbcluster_cond.cc
sql/handler.cc
sql/handler.h
sql/ndb_thd_ndb.h
sql/opt_range.h
sql/share/errmsg-utf8.txt
sql/sql_select.cc
sql/sql_select.h
storage/ndb/CMakeLists.txt
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
storage/ndb/src/kernel/vm/NdbSeqLock.hpp
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
storage/ndb/src/ndbapi/NdbQueryBuilder.cpp
storage/ndb/src/ndbapi/NdbQueryBuilder.hpp
storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp
storage/ndb/src/ndbapi/NdbQueryOperation.cpp
storage/ndb/src/ndbapi/ndberror.c
storage/ndb/test/include/HugoQueryBuilder.hpp
storage/ndb/test/ndbapi/testSystemRestart.cpp
storage/ndb/test/run-test/autotest-boot.sh
storage/ndb/test/src/HugoQueryBuilder.cpp
storage/ndb/test/src/NdbBackup.cpp
storage/ndb/test/tools/CMakeLists.txt
storage/ndb/test/tools/Makefile.am
3354 magnus.blaudd@stripped 2011-06-09
WL#5906 read before write removal (RBWR)
- Add MCP patch for read removal in MySQL Servers
update and delete loops.
- Slightly modified version compared to 7.0 where this
version checks the limitations of the algorithm in the MySQL
Server code and only the limitations of NDB is done in ha_ndbcluster
- Update test result slightly after merging in patch
for bug#37153 rewrite
modified:
mysql-test/suite/ndb/r/ndb_update_no_read.result
mysql-test/suite/ndb/t/disabled.def
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.h
sql/ha_ndbcluster_glue.h
sql/handler.h
sql/sql_delete.cc
sql/sql_update.cc
Diff too large for email (19219 lines, the limit is 10000).
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.5-cluster-spj branch (ole.john.aske:3354 to 3355) | Ole John Aske | 16 Jun |