diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-10-01 18:06:07 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-10-01 18:06:07 +0500 |
| commit | e1f79d43d0052172163524512e973d8cf14551fa (patch) | |
| tree | 7d43b8721c7cc639ed62582ef112723035ade923 /sql/table.cc | |
| parent | f66945aadb88bc66efebdd5333e7baf8acf0fe30 (diff) | |
| parent | 5389cc169abd3853145d7bb1d0f6dbce214eacea (diff) | |
| download | mariadb-git-e1f79d43d0052172163524512e973d8cf14551fa.tar.gz | |
Merge bk@192.168.21.1:mysql-5.0-opt
into mysql.com:/home/hf/work/16813/my50-16813
sql/table.cc:
Auto merged
mysql-test/r/view.result:
merging
mysql-test/t/view.test:
merging
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/table.cc b/sql/table.cc index 1886fdb0b82..4dd3494f834 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1963,12 +1963,13 @@ bool st_table_list::prep_where(THD *thd, Item **conds, this expression will not be moved to WHERE condition (i.e. will be clean correctly for PS/SP) */ - tbl->on_expr= and_conds(tbl->on_expr, where); + tbl->on_expr= and_conds(tbl->on_expr, + where->copy_andor_structure(thd)); break; } } if (tbl == 0) - *conds= and_conds(*conds, where); + *conds= and_conds(*conds, where->copy_andor_structure(thd)); if (arena) thd->restore_active_arena(arena, &backup); where_processed= TRUE; |