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

Parser: disable SV for tmp tables [closes #344]

Browse Source
This commit is contained in:
Aleksey Midenkov
2017-11-24 17:44:43 +03:00
parent 86e57eaaa3
commit 7320c683b9
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/versioning/r/create.result
View File

@ -271,8 +271,6 @@ A8 int without system versioning
) with system versioning; ) with system versioning;
ERROR HY000: Wrong parameters for `t1`: no columns defined 'WITH SYSTEM VERSIONING' ERROR HY000: Wrong parameters for `t1`: no columns defined 'WITH SYSTEM VERSIONING'
create or replace table t1 (a int) with system versioning; create or replace table t1 (a int) with system versioning;
create temporary table tmp with system versioning select * from t1;
create or replace table t1 (a int) with system versioning;
create table tt1 like t1; create table tt1 like t1;
show create table tt1; show create table tt1;
Table Create Table Table Create Table
@ -368,5 +366,7 @@ ERROR 42S21: Duplicate column name 'sys_trx_start'
create or replace table t (sys_trx_end int); create or replace table t (sys_trx_end int);
alter table t with system versioning; alter table t with system versioning;
ERROR 42S21: Duplicate column name 'sys_trx_end' ERROR 42S21: Duplicate column name 'sys_trx_end'
create or replace temporary table t (x int) with system versioning;
ERROR HY000: Incorrect usage of TEMPORARY and WITH SYSTEM VERSIONING
drop database test; drop database test;
create database test; create database test;

8
mysql-test/suite/versioning/t/create.test
View File

@ -192,11 +192,6 @@ create or replace table t1 (
A8 int without system versioning A8 int without system versioning
) with system versioning; ) with system versioning;
# table with/without system versioning
create or replace table t1 (a int) with system versioning;
create temporary table tmp with system versioning select * from t1;
# CREATE TABLE ... LIKE # CREATE TABLE ... LIKE
create or replace table t1 (a int) with system versioning; create or replace table t1 (a int) with system versioning;
create table tt1 like t1; create table tt1 like t1;
@ -286,5 +281,8 @@ create or replace table t (sys_trx_end int);
--error ER_DUP_FIELDNAME --error ER_DUP_FIELDNAME
alter table t with system versioning; alter table t with system versioning;
--error ER_WRONG_USAGE
create or replace temporary table t (x int) with system versioning;
drop database test; drop database test;
create database test; create database test;

16
sql/sql_yacc.yy
View File

@ -6045,8 +6045,20 @@ opt_versioning_option:
versioning_option: versioning_option:
WITH_SYSTEM_SYM VERSIONING_SYM WITH_SYSTEM_SYM VERSIONING_SYM
{ {
Lex->vers_get_info().with_system_versioning= true; if (Lex->create_info.options & HA_LEX_CREATE_TMP_TABLE)
Lex->create_info.options|= HA_VERSIONED_TABLE; {
if (!thd->variables.vers_force)
{
my_error(ER_WRONG_USAGE, MYF(0),
"TEMPORARY", "WITH SYSTEM VERSIONING");
MYSQL_YYABORT;
}
}
else
{
Lex->vers_get_info().with_system_versioning= true;
Lex->create_info.options|= HA_VERSIONED_TABLE;
}
} }
; ;