diff options
| author | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2010-03-26 11:44:24 +0400 |
|---|---|---|
| committer | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2010-03-26 11:44:24 +0400 |
| commit | f57839cd6060ff2d8edb4bf0875b67d0176d88e4 (patch) | |
| tree | c5a754b2062abebbea62dea7e12133cdfcc41d7c /sql | |
| parent | bccf219bfc61bb45d334b40d732651eb9bef5075 (diff) | |
| download | mariadb-git-f57839cd6060ff2d8edb4bf0875b67d0176d88e4.tar.gz | |
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.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index cbc608ea972..84de1fe241b 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -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 { |