3524 Ole John Aske 2011-06-30
Update of 'result' files missing from previous commits
modified:
mysql-test/suite/ndb/r/ndb_condition_pushdown.result
mysql-test/suite/ndb/r/ndb_gis.result
3523 Ole John Aske 2011-06-30
In order to ease merging of SPJ into 5.5 / trunk based branches the errorcode
WARN_QUERY_NOT_PUSHED has been temporarily replaced with the hardcoded
error '9999'.
It is our intention to revert to use WARN_QUERY_NOT_PUSHED when its
definition has been merged into mainline (and it has got assigned
a fixed value which doesn't change for every merge.)
modified:
mysql-test/suite/ndb/r/ndb_join_pushdown.result
sql/ha_ndbcluster_push.cc
=== modified file 'mysql-test/suite/ndb/r/ndb_condition_pushdown.result'
--- a/mysql-test/suite/ndb/r/ndb_condition_pushdown.result 2011-06-24 12:32:05 +0000
+++ b/mysql-test/suite/ndb/r/ndb_condition_pushdown.result 2011-06-30 10:45:54 +0000
@@ -2236,7 +2236,7 @@ id select_type table type possible_keys
1 SIMPLE tx ALL NULL NULL NULL NULL 2 100.00 Using where with pushed condition: (`test`.`tx`.`c` = 1)
1 SIMPLE t2 ALL NULL NULL NULL NULL 2 100.00 Using where with pushed condition: (`test`.`t2`.`c` = 1); Using join buffer
Warnings:
-Note 1644 Can't push table 't2' as child, 'type' must be a 'ref' access
+Note 9999 Can't push table 't2' as child, 'type' must be a 'ref' access
Note 1003 select `test`.`tx`.`a` AS `a`,`test`.`tx`.`b` AS `b`,`test`.`tx`.`c` AS `c`,`test`.`tx`.`d` AS `d`,`test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`c` AS `c`,`test`.`t2`.`d` AS `d` from `test`.`tx` join `test`.`tx` `t2` where ((`test`.`tx`.`c` = 1) and (`test`.`t2`.`c` = 1))
explain extended
select straight_join *
@@ -2261,15 +2261,15 @@ id select_type table type possible_keys
1 SIMPLE t2 ref PRIMARY PRIMARY 4 const 2 100.00 Using where; Using filesort
1 SIMPLE tx eq_ref PRIMARY PRIMARY 8 test.t2.c,test.t2.d 1 100.00
Warnings:
-Note 1644 Table 't2' is not pushable: GROUP BY cannot be done using index on grouped columns.
-Note 1644 Table 'tx' is not pushable: GROUP BY cannot be done using index on grouped columns.
+Note 9999 Table 't2' is not pushable: GROUP BY cannot be done using index on grouped columns.
+Note 9999 Table 'tx' is not pushable: GROUP BY cannot be done using index on grouped columns.
Note 1003 select `test`.`t2`.`c` AS `c`,count(distinct `test`.`t2`.`a`) AS `count(distinct t2.a)` from `test`.`tx` join `test`.`tx` `t2` where ((`test`.`tx`.`b` = `test`.`t2`.`d`) and (`test`.`tx`.`a` = `test`.`t2`.`c`) and (`test`.`t2`.`a` = 4)) group by `test`.`t2`.`c`
explain extended select * from tx join tx as t2 on tx.c=1 where t2.c=1;
id select_type table type possible_keys key key_len ref rows filtered Extra
1 SIMPLE tx ALL NULL NULL NULL NULL 2 100.00 Using where with pushed condition: (`test`.`tx`.`c` = 1)
1 SIMPLE t2 ALL NULL NULL NULL NULL 2 100.00 Using where with pushed condition: (`test`.`t2`.`c` = 1); Using join buffer
Warnings:
-Note 1644 Can't push table 't2' as child, 'type' must be a 'ref' access
+Note 9999 Can't push table 't2' as child, 'type' must be a 'ref' access
Note 1003 select `test`.`tx`.`a` AS `a`,`test`.`tx`.`b` AS `b`,`test`.`tx`.`c` AS `c`,`test`.`tx`.`d` AS `d`,`test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`c` AS `c`,`test`.`t2`.`d` AS `d` from `test`.`tx` join `test`.`tx` `t2` where ((`test`.`tx`.`c` = 1) and (`test`.`t2`.`c` = 1))
explain extended
select t2.c, count(distinct t2.a)
@@ -2281,8 +2281,8 @@ id select_type table type possible_keys
1 SIMPLE t2 ref PRIMARY PRIMARY 4 const 2 100.00 Using where; Using filesort
1 SIMPLE tx eq_ref PRIMARY PRIMARY 8 test.t2.c,test.t2.d 1 100.00
Warnings:
-Note 1644 Table 't2' is not pushable: GROUP BY cannot be done using index on grouped columns.
-Note 1644 Table 'tx' is not pushable: GROUP BY cannot be done using index on grouped columns.
+Note 9999 Table 't2' is not pushable: GROUP BY cannot be done using index on grouped columns.
+Note 9999 Table 'tx' is not pushable: GROUP BY cannot be done using index on grouped columns.
Note 1003 select `test`.`t2`.`c` AS `c`,count(distinct `test`.`t2`.`a`) AS `count(distinct t2.a)` from `test`.`tx` join `test`.`tx` `t2` where ((`test`.`tx`.`b` = `test`.`t2`.`d`) and (`test`.`tx`.`a` = `test`.`t2`.`c`) and (`test`.`t2`.`a` = 4)) group by `test`.`t2`.`c`
drop table tx;
create table t (pk1 int, pk2 int, primary key(pk1,pk2)) engine = ndb;
=== modified file 'mysql-test/suite/ndb/r/ndb_gis.result'
--- a/mysql-test/suite/ndb/r/ndb_gis.result 2011-04-27 07:42:18 +0000
+++ b/mysql-test/suite/ndb/r/ndb_gis.result 2011-06-30 10:45:54 +0000
@@ -406,8 +406,8 @@ id select_type table type possible_keys
1 SIMPLE g1 ALL NULL NULL NULL NULL 2 100.00 Using temporary; Using filesort
1 SIMPLE g2 ALL NULL NULL NULL NULL 2 100.00 Using join buffer
Warnings:
-Note 1644 Table 'g1' is not pushable: select list can't contain BLOB columns
-Note 1644 Table 'g2' is not pushable: select list can't contain BLOB columns
+Note 9999 Table 'g1' is not pushable: select list can't contain BLOB columns
+Note 9999 Table 'g2' is not pushable: select list can't contain BLOB columns
Note 1003 select `test`.`g1`.`fid` AS `first`,`test`.`g2`.`fid` AS `second`,within(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `w`,contains(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `c`,overlaps(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `o`,equals(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `e`,disjoint(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `d`,touches(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `t`,intersects(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `i`,crosses(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `r` from `test`.`gis_geometrycollection` `g1` join `test`.`gis_geometrycollection` `g2` order by `test`.`g1`.`fid`,`test`.`g2`.`fid`
DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
CREATE TABLE t1 (
@@ -960,8 +960,8 @@ id select_type table type possible_keys
1 SIMPLE g1 ALL NULL NULL NULL NULL 2 100.00 Using temporary; Using filesort
1 SIMPLE g2 ALL NULL NULL NULL NULL 2 100.00 Using join buffer
Warnings:
-Note 1644 Table 'g1' is not pushable: select list can't contain BLOB columns
-Note 1644 Table 'g2' is not pushable: select list can't contain BLOB columns
+Note 9999 Table 'g1' is not pushable: select list can't contain BLOB columns
+Note 9999 Table 'g2' is not pushable: select list can't contain BLOB columns
Note 1003 select `test`.`g1`.`fid` AS `first`,`test`.`g2`.`fid` AS `second`,within(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `w`,contains(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `c`,overlaps(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `o`,equals(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `e`,disjoint(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `d`,touches(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `t`,intersects(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `i`,crosses(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `r` from `test`.`gis_geometrycollection` `g1` join `test`.`gis_geometrycollection` `g2` order by `test`.`g1`.`fid`,`test`.`g2`.`fid`
DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
CREATE TABLE t1 (
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch(ole.john.aske:3523 to 3524) | Ole John Aske | 4 Jul |
