1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/bb-10.3-release' into 10.3

Browse Source
This commit is contained in:
Oleksandr Byelkin 2019-12-04 15:57:09 +01:00
commit 670c9a3a18
4 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/suite/versioning/r/update.result
View File

@ -299,5 +299,13 @@ create or replace table t1 (id int, k int, primary key (id)) engine=innodb with
insert into t1 values (1,1),(2,2); insert into t1 values (1,1),(2,2);
create or replace view v1 as select * from t1; create or replace view v1 as select * from t1;
update v1 set id= 2 where k = 0; update v1 set id= 2 where k = 0;
create or replace table t1 (a int) with system versioning;
create or replace view v1 as select * from t1;
create or replace procedure sp() update v1 set xx = 1;
call sp;
ERROR 42S22: Unknown column 'xx' in 'field list'
call sp;
ERROR 42S22: Unknown column 'xx' in 'field list'
drop procedure sp;
drop view v1; drop view v1;
drop table t1; drop table t1;

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

@ -219,7 +219,16 @@ insert into t1 values (1,1),(2,2);
create or replace view v1 as select * from t1; create or replace view v1 as select * from t1;
update v1 set id= 2 where k = 0; update v1 set id= 2 where k = 0;
create or replace table t1 (a int) with system versioning;
create or replace view v1 as select * from t1;
create or replace procedure sp() update v1 set xx = 1;
--error ER_BAD_FIELD_ERROR
call sp;
--error ER_BAD_FIELD_ERROR
call sp;
# cleanup # cleanup
drop procedure sp;
drop view v1; drop view v1;
drop table t1; drop table t1;

6
sql/sp_head.cc
View File

@ -3379,11 +3379,7 @@ sp_lex_keeper::reset_lex_and_exec_core(THD *thd, uint *nextp,
Update the state of the active arena if no errors on Update the state of the active arena if no errors on
open_tables stage. open_tables stage.
*/ */
if (likely(!res) || likely(!thd->is_error()) || if (likely(!res) || likely(!thd->is_error()))
(thd->get_stmt_da()->sql_errno() != ER_CANT_REOPEN_TABLE &&
thd->get_stmt_da()->sql_errno() != ER_NO_SUCH_TABLE &&
thd->get_stmt_da()->sql_errno() != ER_NO_SUCH_TABLE_IN_ENGINE &&
thd->get_stmt_da()->sql_errno() != ER_UPDATE_TABLE_USED))
thd->stmt_arena->state= Query_arena::STMT_EXECUTED; thd->stmt_arena->state= Query_arena::STMT_EXECUTED;
/* /*

10
sql/sql_derived.cc
View File

@ -707,9 +707,15 @@ bool mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *derived)
case SQLCOM_DELETE_MULTI: case SQLCOM_DELETE_MULTI:
case SQLCOM_UPDATE: case SQLCOM_UPDATE:
case SQLCOM_UPDATE_MULTI: case SQLCOM_UPDATE_MULTI:
if ((res= unit->first_select()->vers_setup_conds(thd, derived->merge_underlying_list))) if ((res= first_select->vers_setup_conds(thd,
derived->merge_underlying_list)))
goto exit; goto exit;
derived->where= and_items(thd, derived->where, derived->merge_underlying_list->where); if (derived->merge_underlying_list->where)
{
Query_arena_stmt on_stmt_arena(thd);
derived->where= and_items(thd, derived->where,
derived->merge_underlying_list->where);
}
default: default:
break; break;
} }