diff options
| author | unknown <igor@rurik.mysql.com> | 2006-03-30 11:34:14 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-03-30 11:34:14 -0800 |
| commit | 86504f87851d7eb5947d3bba41ae0ddf45aa92ab (patch) | |
| tree | a1c2b545e404ea382c863d9cefc9d31a6ee03117 /sql/sql_select.cc | |
| parent | 736978084583e97dac733fa2f1394c34ffee8386 (diff) | |
| parent | 9a02fede24e99c6bfd61830a618ea0086ffe24fb (diff) | |
| download | mariadb-git-86504f87851d7eb5947d3bba41ae0ddf45aa92ab.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 1712819aad4..3fa77a73e41 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -7469,7 +7469,7 @@ simplify_joins(JOIN *join, List<TABLE_LIST> *join_list, COND *conds, bool top) */ if (table->on_expr) { - Item *expr= table->prep_on_expr ? table->prep_on_expr : table->on_expr; + Item *expr= table->on_expr; /* If an on expression E is attached to the table, check all null rejected predicates in this expression. @@ -7480,7 +7480,9 @@ simplify_joins(JOIN *join, List<TABLE_LIST> *join_list, COND *conds, bool top) */ expr= simplify_joins(join, &nested_join->join_list, expr, FALSE); - table->prep_on_expr= table->on_expr= expr; + table->on_expr= expr; + if (!table->prep_on_expr) + table->prep_on_expr= expr->copy_andor_structure(join->thd); } nested_join->used_tables= (table_map) 0; nested_join->not_null_tables=(table_map) 0; |