diff options
| author | unknown <gkodinov@dl145s.mysql.com> | 2006-10-20 11:12:35 +0200 |
|---|---|---|
| committer | unknown <gkodinov@dl145s.mysql.com> | 2006-10-20 11:12:35 +0200 |
| commit | 73baa90a07fd7f5cc68ee72c36a16f906b690aac (patch) | |
| tree | 9be74a8f0ac2aa9f6b4197d560171877636e55bf /sql/table.cc | |
| parent | 94f337bb4d5593221ae257fcf18a439c87eb0fe9 (diff) | |
| parent | 951243708c3e6ccd18153abdc082583664c007e7 (diff) | |
| download | mariadb-git-73baa90a07fd7f5cc68ee72c36a16f906b690aac.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
mysql-test/r/myisam.result:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_select.cc:
Auto merged
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 1877e3f926c..8505b15459b 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -2787,12 +2787,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; |