Skip to content

Commit

Permalink
MDEV-13005: Fixing bugs in SEQUENCE, part 3, 5/5
Browse files Browse the repository at this point in the history
Task 6:
We can find the .frm type of file. If it is sequence then is_sequence
passed to dd_frm_type() will be true. Since there is already a check
to give error message if we trigger is on temporary table or view, an
additional condition is added to check if .frm is sequence
(is_sequence==true) and error message is changed to show
"Trigger's '%-.192s' is view, temporary table or sequence" instead of
"Trigger's '%-.192s' is view or temporary table".
  • Loading branch information
mariadb-RuchaDeodhar committed Mar 30, 2022
1 parent a8e7e7c commit 2eaaa88
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 8 deletions.
2 changes: 1 addition & 1 deletion mysql-test/main/trigger.result
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ drop table t1;
drop table t3;
create temporary table t1 (i int);
create trigger trg before insert on t1 for each row set @a:=1;
ERROR HY000: Trigger's 't1' is view or temporary table
ERROR HY000: Trigger's 't1' is view, temporary table or sequence
drop table t1;
create table t1 (x1col char);
create trigger tx1 before insert on t1 for each row set new.x1col = 'x';
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/funcs_1/r/innodb_trig_0407.result
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ Testcase 3.5.5.2:
Create temporary table t1_temp (f1 bigint signed, f2 bigint unsigned);
Create trigger trg2 before INSERT
on t1_temp for each row set new.f2=9999;
ERROR HY000: Trigger's 't1_temp' is view or temporary table
ERROR HY000: Trigger's 't1_temp' is view, temporary table or sequence
drop table t1_temp;

Testcase 3.5.5.3:
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/funcs_1/r/memory_trig_0407.result
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ Testcase 3.5.5.2:
Create temporary table t1_temp (f1 bigint signed, f2 bigint unsigned);
Create trigger trg2 before INSERT
on t1_temp for each row set new.f2=9999;
ERROR HY000: Trigger's 't1_temp' is view or temporary table
ERROR HY000: Trigger's 't1_temp' is view, temporary table or sequence
drop table t1_temp;

Testcase 3.5.5.3:
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/funcs_1/r/myisam_trig_0407.result
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ Testcase 3.5.5.2:
Create temporary table t1_temp (f1 bigint signed, f2 bigint unsigned);
Create trigger trg2 before INSERT
on t1_temp for each row set new.f2=9999;
ERROR HY000: Trigger's 't1_temp' is view or temporary table
ERROR HY000: Trigger's 't1_temp' is view, temporary table or sequence
drop table t1_temp;

Testcase 3.5.5.3:
Expand Down
6 changes: 6 additions & 0 deletions mysql-test/suite/sql_sequence/create.result
Original file line number Diff line number Diff line change
Expand Up @@ -711,3 +711,9 @@ CREATE TEMPORARY TABLE s1 (s1 INT);
CREATE TEMPORARY SEQUENCE s1 (s1 INT);
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '(s1 INT)' at line 1
DROP TEMPORARY TABLE s1;
# Task 6:
CREATE SEQUENCE seq1 START WITH 2;
CREATE TRIGGER s1 BEFORE UPDATE ON seq1 FOR EACH ROW SET @a= 5;
ERROR HY000: Trigger's 'seq1' is view, temporary table or sequence
DROP SEQUENCE seq1;
# End of 10.4 test
8 changes: 8 additions & 0 deletions mysql-test/suite/sql_sequence/create.test
Original file line number Diff line number Diff line change
Expand Up @@ -545,3 +545,11 @@ CREATE TEMPORARY TABLE s1 (s1 INT);
--error ER_PARSE_ERROR
CREATE TEMPORARY SEQUENCE s1 (s1 INT);
DROP TEMPORARY TABLE s1;

--echo # Task 6:
CREATE SEQUENCE seq1 START WITH 2;
--error ER_TRG_ON_VIEW_OR_TEMP_TABLE
CREATE TRIGGER s1 BEFORE UPDATE ON seq1 FOR EACH ROW SET @a= 5;
DROP SEQUENCE seq1;

--echo # End of 10.4 test
4 changes: 2 additions & 2 deletions sql/share/errmsg-utf8.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5421,8 +5421,8 @@ ER_TRG_DOES_NOT_EXIST
ger "Trigger existiert nicht"
hindi "TRIGGER मौजूद नहीं है"
ER_TRG_ON_VIEW_OR_TEMP_TABLE
eng "Trigger's '%-.192s' is view or temporary table"
ger "'%-.192s' des Triggers ist View oder temporäre Tabelle"
eng "Trigger's '%-.192s' is view, temporary table or sequence"
hindi "'%-.192s' एक व्यू, टेम्पररी टेबल या सीक्वेंस है"
ER_TRG_CANT_CHANGE_ROW
eng "Updating of %s row is not allowed in %strigger"
ger "Aktualisieren einer %s-Zeile ist in einem %s-Trigger nicht erlaubt"
Expand Down
12 changes: 10 additions & 2 deletions sql/sql_trigger.cc
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,11 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create)
bool lock_upgrade_done= FALSE;
MDL_ticket *mdl_ticket= NULL;
Query_tables_list backup;
char path[FN_REFLEN + 1];
char engine_name_buf[NAME_CHAR_LEN + 1];
LEX_CSTRING engine_name= { engine_name_buf, 0 };
bool is_sequence= 0;

DBUG_ENTER("mysql_create_or_drop_trigger");

/* Charset of the buffer for statement must be system one. */
Expand Down Expand Up @@ -529,8 +534,11 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create)
/* We should have only one table in table list. */
DBUG_ASSERT(tables->next_global == 0);

/* We do not allow creation of triggers on temporary tables. */
if (create && thd->find_tmp_table_share(tables))
build_table_filename(path, sizeof(path) - 1, tables->db.str, tables->alias.str, ".frm", 0);
tables->required_type= dd_frm_type(NULL, path, &engine_name, &is_sequence);

/* We do not allow creation of triggers on temporary tables or sequence. */
if (is_sequence || (create && thd->find_tmp_table_share(tables)))
{
my_error(ER_TRG_ON_VIEW_OR_TEMP_TABLE, MYF(0), tables->alias.str);
goto end;
Expand Down

0 comments on commit 2eaaa88

Please sign in to comment.