diff options
| author | unknown <igor@rurik.mysql.com> | 2006-03-30 13:34:14 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-03-30 13:34:14 -0800 |
| commit | f078e5e1a473577016447ffd7d678beca008dac7 (patch) | |
| tree | 132d38d66051b32d720b7f93cd3771099546c7cc /sql/sql_select.cc | |
| parent | a318cc7c03e6aca9f5aacf328e294a8665b6f676 (diff) | |
| parent | 0f3a620ba9c2c41846db91d98cc6a6484537339a (diff) | |
| download | mariadb-git-f078e5e1a473577016447ffd7d678beca008dac7.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-5.1
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
mysql-test/r/loaddata.result:
Auto merged
mysql-test/r/ndb_read_multi_range.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/loaddata.test:
Auto merged
mysql-test/t/ndb_read_multi_range.test:
Auto merged
sql/field.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_select.cc:
Auto merged
storage/ndb/tools/Makefile.am:
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 02eb4d72d5c..524f9c7b09b 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -7517,7 +7517,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. @@ -7528,7 +7528,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; |