4089 Ole John Aske 2012-11-13
Addendum to fix for bug#14709490
Disable ndb_bushy_joins.test when testing the embedded server.
Embedded server can't send & reap as this test depends on.
modified:
mysql-test/suite/ndb/t/ndb_bushy_joins.test
4088 Ole John Aske 2012-11-13 [merge]
Merge 7.1 -> 7.2 (Bug#14709490)
- Also added new (SPJ) testcase developed for this bug.
- Updated some other testcase results as this fix may change
the EXPLAIN of some pushed queries.
added:
mysql-test/suite/ndb/r/ndb_bushy_joins.result
mysql-test/suite/ndb/t/ndb_bushy_joins.cnf
mysql-test/suite/ndb/t/ndb_bushy_joins.test
modified:
mysql-test/suite/ndb/r/ndb_condition_pushdown.result
mysql-test/suite/ndb/r/ndb_join_pushdown_default.result
mysql-test/suite/ndb/t/ndb_join_pushdown.inc
sql/ha_ndbcluster_push.cc
storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp
storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
=== modified file 'mysql-test/suite/ndb/t/ndb_bushy_joins.test'
=== modified file 'mysql-test/suite/ndb/t/ndb_bushy_joins.test'
--- a/mysql-test/suite/ndb/t/ndb_bushy_joins.test 2012-11-13 10:27:06 +0000
+++ b/mysql-test/suite/ndb/t/ndb_bushy_joins.test 2012-11-13 12:07:51 +0000
@@ -11,8 +11,9 @@
# (bug#14709490)
########################################################
--- source include/have_ndb.inc
--- source include/have_multi_ndb.inc
+--source include/not_embedded.inc
+--source include/have_ndb.inc
+--source include/have_multi_ndb.inc
connect (ddl,localhost,root,,test);
connect (j1,localhost,root,,test);
No bundle (reason: useless for push emails).| Thread |
|---|
| • bzr push into mysql-5.5-cluster-7.2 branch (ole.john.aske:4088 to 4089)Bug#14709490 | Ole John Aske | 14 Nov |
