#At file:///home/gluh/MySQL/mysql-5.0-bugteam/ based on revid:sergey.glukhov@stripped
2854 Sergey Glukhov 2010-03-26
Bug#52177 crash with explain, row comparison, join, text field
The crash is the result of an attempt made by JOIN::optimize to evaluate
the WHERE condition when no records have been actually read.
The fix is to remove erroneous 'outer_join' variable check.
@ mysql-test/r/join.result
test result
@ mysql-test/t/join.test
test case
@ sql/sql_select.cc
removed erroneous 'outer_join' variable check.
modified:
mysql-test/r/join.result
mysql-test/t/join.test
sql/sql_select.cc
=== modified file 'mysql-test/r/join.result'
--- a/mysql-test/r/join.result 2010-03-24 10:37:28 +0000
+++ b/mysql-test/r/join.result 2010-03-26 07:44:24 +0000
@@ -930,4 +930,16 @@ Warnings:
Note 1003 select 1 AS `1` from `test`.`t1` left join `test`.`t1` `t2` on((1 = 1)) left join (`test`.`t1` left join `test`.`t1` `t2` on((1 = 1))) on(rand()) where 1
DROP VIEW v1;
DROP TABLE t1;
+#
+# Bug#52177 crash with explain, row comparison, join, text field
+#
+CREATE TABLE t1 (a TINYINT, b TEXT, KEY (a));
+INSERT INTO t1 VALUES (0,''),(0,'');
+FLUSH TABLES;
+EXPLAIN SELECT 1 FROM t1 LEFT JOIN t1 a ON 1
+WHERE ROW(t1.a, 1111.11) = ROW(1111.11, 1111.11) AND
+ROW(t1.b, 1111.11) <=> ROW('','');
+id select_type table type possible_keys key key_len ref rows Extra
+1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables
+DROP TABLE t1;
End of 5.0 tests.
=== modified file 'mysql-test/t/join.test'
--- a/mysql-test/t/join.test 2010-03-24 10:37:28 +0000
+++ b/mysql-test/t/join.test 2010-03-26 07:44:24 +0000
@@ -725,4 +725,15 @@ SELECT 1 FROM v1 right join v1 AS v2 ON
DROP VIEW v1;
DROP TABLE t1;
+--echo #
+--echo # Bug#52177 crash with explain, row comparison, join, text field
+--echo #
+CREATE TABLE t1 (a TINYINT, b TEXT, KEY (a));
+INSERT INTO t1 VALUES (0,''),(0,'');
+FLUSH TABLES;
+EXPLAIN SELECT 1 FROM t1 LEFT JOIN t1 a ON 1
+WHERE ROW(t1.a, 1111.11) = ROW(1111.11, 1111.11) AND
+ROW(t1.b, 1111.11) <=> ROW('','');
+DROP TABLE t1;
+
--echo End of 5.0 tests.
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc 2010-03-24 10:37:28 +0000
+++ b/sql/sql_select.cc 2010-03-26 07:44:24 +0000
@@ -1029,7 +1029,7 @@ JOIN::optimize()
}
}
- if (conds &&!outer_join && const_table_map != found_const_table_map &&
+ if (conds && const_table_map != found_const_table_map &&
(select_options & SELECT_DESCRIBE) &&
select_lex->master_unit() == &thd->lex->unit) // upper level SELECT
{
Attachment: [text/bzr-bundle] bzr/sergey.glukhov@sun.com-20100326074424-vdr03i38fv28dktk.bundle
Thread |
---|
• bzr commit into mysql-5.0-bugteam branch (Sergey.Glukhov:2854)Bug#52177 | Sergey Glukhov | 30 Mar |