database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-14689 Server crashes in find_field_in_tables on 2nd execution of PS with versioned table and view

Browse Source 
SQL: wrong usage of Item::transform()
This commit is contained in:
Eugene Kosov
2017-12-21 14:59:46 +03:00
committed by GitHub
parent 6dc75b5f89
commit aa4d1bedfc
3 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,5 +107,14 @@ create or replace view vt1 as select * from t1 union select * from t2;
select * from vt1; select * from vt1;
a a
1 1
# MDEV-14689 crash on second PS execute
create or replace table t1 (a int);
create or replace view v1 as select * from t1;
create or replace table t2 (b int) with system versioning;
prepare stmt from 'select a from v1 inner join t2 group by a order by a';
execute stmt;
a
execute stmt;
a
drop database test; drop database test;
create database test; create database test;

9
mysql-test/suite/versioning/t/view.test
View File

@ -89,5 +89,14 @@ create or replace table t2 (a int);
create or replace view vt1 as select * from t1 union select * from t2; create or replace view vt1 as select * from t1 union select * from t2;
select * from vt1; select * from vt1;
--echo # MDEV-14689 crash on second PS execute
create or replace table t1 (a int);
create or replace view v1 as select * from t1;
create or replace table t2 (b int) with system versioning;
prepare stmt from 'select a from v1 inner join t2 group by a order by a';
execute stmt;
execute stmt;
drop database test; drop database test;
create database test; create database test;

24
sql/sql_select.cc
View File

@ -700,24 +700,36 @@ void JOIN::vers_check_items()
if (conds) if (conds)
{ {
conds= conds->transform(thd, transformer, NULL); Item *tmp = conds->transform(thd, transformer, NULL);
if (conds != tmp)
conds= tmp;
} }
for (ORDER *ord= order; ord; ord= ord->next) for (ORDER *ord= order; ord; ord= ord->next)
{ {
ord->item_ptr= (*ord->item)->transform(thd, transformer, NULL); Item *tmp= (*ord->item)->transform(thd, transformer, NULL);
*ord->item= ord->item_ptr; if (*ord->item != tmp)
{
ord->item_ptr= tmp;
*ord->item= ord->item_ptr;
}
} }
for (ORDER *ord= group_list; ord; ord= ord->next) for (ORDER *ord= group_list; ord; ord= ord->next)
{ {
ord->item_ptr= (*ord->item)->transform(thd, transformer, NULL); Item *tmp= (*ord->item)->transform(thd, transformer, NULL);
*ord->item= ord->item_ptr; if (*ord->item != tmp)
{
ord->item_ptr= tmp;
*ord->item= ord->item_ptr;
}
} }
if (having) if (having)
{ {
having= having->transform(thd, transformer, NULL); Item *tmp= having->transform(thd, transformer, NULL);
if (having != tmp)
having= tmp;
} }
} }