database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

SQL: different results when querying a VIEW from PREPARED STATEMENT and without it [fixes #176]

Browse Source
This commit is contained in:
kevg
2017-04-11 17:58:56 +03:00
committed by Aleksey Midenkov
parent ecd18bc099
commit d64702d43a
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/versioning/r/view.result
View File

@ -39,8 +39,6 @@ x
drop prepare stmt; drop prepare stmt;
select * from vt1; select * from vt1;
x x
2
1
prepare stmt from 'select * from vt1'; prepare stmt from 'select * from vt1';
execute stmt; execute stmt;
x x
@ -50,7 +48,6 @@ x
1 1
select * from vt1 for system_time as of timestamp @t1; select * from vt1 for system_time as of timestamp @t1;
x x
2
1 1
prepare stmt from 'select * from vt1 for system_time as of timestamp @t1'; prepare stmt from 'select * from vt1 for system_time as of timestamp @t1';
execute stmt; execute stmt;

9
sql/sql_select.cc
View File

@ -703,11 +703,6 @@ int vers_setup_select(THD *thd, TABLE_LIST *tables, COND **where_expr,
DBUG_RETURN(0); DBUG_RETURN(0);
} }
while (tables && tables->is_view() && !thd->stmt_arena->is_stmt_prepare())
{
tables= tables->view->select_lex.table_list.first;
}
for (table= tables; table; table= table->next_local) for (table= tables; table; table= table->next_local)
{ {
if (table->table && table->table->versioned()) if (table->table && table->table->versioned())
@ -16879,9 +16874,9 @@ create_tmp_table(THD *thd, TMP_TABLE_PARAM *param, List<Item> &fields,
continue; // Some kind of const item continue; // Some kind of const item
} }
if (type == Item::FIELD_ITEM) if (type == Item::FIELD_ITEM || type == Item::REF_ITEM)
{ {
Item_field *item_field= (Item_field *)item; Item_field *item_field= (Item_field *)item->real_item();
Field *field= item_field->field; Field *field= item_field->field;
TABLE_SHARE *s= field->table->s; TABLE_SHARE *s= field->table->s;
if (s->versioned) if (s->versioned)