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-14652 NATURAL JOIN crash in mark_common_columns() [fixes #405]

Browse Source 
SQL: reverted NATURAL JOIN fix #161 (deprecated by #383)
This commit is contained in:
Aleksey Midenkov
2017-12-14 21:16:31 +03:00
parent 4be2173e0f
commit 2ae2876a6c
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/suite/versioning/r/select.result
View File

@ -362,6 +362,12 @@ select * from t1 for system_time as of current_timestamp;
x x
select * from t1 for system_time as of now; select * from t1 for system_time as of now;
ERROR 42S22: Unknown column 'now' in 'where clause' ERROR 42S22: Unknown column 'now' in 'where clause'
### Issue #405, NATURAL JOIN failure
create or replace table t1 (a int) with system versioning;
create or replace table t2 (b int);
create or replace view v1 as select a, sys_trx_start, sys_trx_end from t1 where a > round(rand()*1000);
select * from v1 natural join t2;
a b
drop view v1; drop view v1;
drop table t1, t2; drop table t1, t2;
call innodb_verify_vtq(32); call innodb_verify_vtq(32);

6
mysql-test/suite/versioning/t/select.test
View File

@ -248,6 +248,12 @@ select * from t1 for system_time as of current_timestamp;
--error ER_BAD_FIELD_ERROR --error ER_BAD_FIELD_ERROR
select * from t1 for system_time as of now; select * from t1 for system_time as of now;
--echo ### Issue #405, NATURAL JOIN failure
create or replace table t1 (a int) with system versioning;
create or replace table t2 (b int);
create or replace view v1 as select a, sys_trx_start, sys_trx_end from t1 where a > round(rand()*1000);
select * from v1 natural join t2;
drop view v1; drop view v1;
drop table t1, t2; drop table t1, t2;

9
sql/sql_base.cc
View File

@ -6420,15 +6420,6 @@ mark_common_columns(THD *thd, TABLE_LIST *table_ref_1, TABLE_LIST *table_ref_2,
if (nj_col_1->field() && nj_col_1->field()->vers_sys_field()) if (nj_col_1->field() && nj_col_1->field()->vers_sys_field())
continue; continue;
if (table_ref_1->is_view() && table_ref_1->table->versioned())
{
Item *item= nj_col_1->view_field->item;
DBUG_ASSERT(item->type() == Item::FIELD_ITEM);
Item_field *item_field= (Item_field *)item;
if (item_field->field->vers_sys_field())
continue;
}
field_name_1= nj_col_1->name(); field_name_1= nj_col_1->name();
is_using_column_1= using_fields && is_using_column_1= using_fields &&
test_if_string_in_list(field_name_1->str, using_fields); test_if_string_in_list(field_name_1->str, using_fields);