database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge bk@192.168.21.1:mysql-5.1-opt

Browse Source 
into  mysql.com:/home/hf/work/16813/my51-16813


sql/table.cc:
  Auto merged
mysql-test/r/view.result:
  merging
mysql-test/t/view.test:
  merging
This commit is contained in:
unknown
2006-10-01 16:43:35 +05:00
parent d0ab146b7e 9314fabdd3
commit 5db08aa988
3 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/table.cc
View File

@@ -2773,12 +2773,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;