database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Fixing a bug in the recent commit that added trigger names into error messages

Browse Source 
Trigger names were erroneously cut to 8 or 4 bytes (on 64 and 32 bit machines).
Recording correct tests results.
This commit is contained in:
Alexander Barkov
2017-04-23 12:57:26 +04:00
parent 658082551f
commit f82212946f
10 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/create_drop_trigger.result
View File

@@ -10,7 +10,7 @@ SELECT @sum;
CREATE TRIGGER IF NOT EXISTS val_sum_new BEFORE INSERT ON t1 FOR EACH ROW SET @sum = @sum + NEW.val; CREATE TRIGGER IF NOT EXISTS val_sum_new BEFORE INSERT ON t1 FOR EACH ROW SET @sum = @sum + NEW.val;
CREATE TRIGGER IF NOT EXISTS val_sum AFTER INSERT ON t1 FOR EACH ROW SET @sum = @sum + 1 + NEW.val; CREATE TRIGGER IF NOT EXISTS val_sum AFTER INSERT ON t1 FOR EACH ROW SET @sum = @sum + 1 + NEW.val;
Warnings: Warnings:
Note 1359 Trigger 'db1.val_' already exists Note 1359 Trigger 'db1.val_sum' already exists
CREATE OR REPLACE TRIGGER IF NOT EXISTS val_sum BEFORE INSERT ON t1 FOR EACH ROW SET @sum = @sum + 2 + NEW.val; CREATE OR REPLACE TRIGGER IF NOT EXISTS val_sum BEFORE INSERT ON t1 FOR EACH ROW SET @sum = @sum + 2 + NEW.val;
ERROR HY000: Incorrect usage of OR REPLACE and IF NOT EXISTS ERROR HY000: Incorrect usage of OR REPLACE and IF NOT EXISTS
SELECT ACTION_STATEMENT FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME='val_sum'; SELECT ACTION_STATEMENT FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME='val_sum';
@@ -21,7 +21,7 @@ SELECT ACTION_STATEMENT FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME='val
ACTION_STATEMENT ACTION_STATEMENT
SET @sum = @sum + 3 + NEW.val SET @sum = @sum + 3 + NEW.val
CREATE TRIGGER val_sum BEFORE INSERT ON t1 FOR EACH ROW SET @sum = @sum + 4 + NEW.val; CREATE TRIGGER val_sum BEFORE INSERT ON t1 FOR EACH ROW SET @sum = @sum + 4 + NEW.val;
ERROR HY000: Trigger 'db1.val_' already exists ERROR HY000: Trigger 'db1.val_sum' already exists
SELECT ACTION_STATEMENT FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME='val_sum'; SELECT ACTION_STATEMENT FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME='val_sum';
ACTION_STATEMENT ACTION_STATEMENT
SET @sum = @sum + 3 + NEW.val SET @sum = @sum + 3 + NEW.val

2
mysql-test/r/trigger.result
View File

@@ -1986,7 +1986,7 @@ drop table if exists t1;
create table t1 (i int, j int); create table t1 (i int, j int);
create trigger t1_bi before insert on t1 for each row begin end; create trigger t1_bi before insert on t1 for each row begin end;
create trigger t1_bi before insert on t1 for each row begin end; create trigger t1_bi before insert on t1 for each row begin end;
ERROR HY000: Trigger 'test.t1_' already exists ERROR HY000: Trigger 'test.t1_bi' already exists
create trigger t1_bi2 before insert on t1 for each row begin end; create trigger t1_bi2 before insert on t1 for each row begin end;
drop trigger t1_bi; drop trigger t1_bi;
drop trigger t1_bi2; drop trigger t1_bi2;

4
mysql-test/suite/funcs_1/r/innodb_trig_0102.result
View File

@@ -253,7 +253,7 @@ Testcase 3.5.1.10:
------------------ ------------------
CREATE TRIGGER trg7_1 BEFORE UPDATE on tb3 for each row set new.f120 ='X'; CREATE TRIGGER trg7_1 BEFORE UPDATE on tb3 for each row set new.f120 ='X';
CREATE TRIGGER trg7_1 AFTER INSERT on tb3 for each row set @x ='Y'; CREATE TRIGGER trg7_1 AFTER INSERT on tb3 for each row set @x ='Y';
ERROR HY000: Trigger 'test.trg' already exists ERROR HY000: Trigger 'test.trg7_1' already exists
drop trigger trg7_1; drop trigger trg7_1;
Testcase 3.5.1.?: Testcase 3.5.1.?:
@@ -266,7 +266,7 @@ create trigger trig before insert on t1
for each row set new.f1 ='trig t1'; for each row set new.f1 ='trig t1';
create trigger trig before update on t2 create trigger trig before update on t2
for each row set new.f1 ='trig t2'; for each row set new.f1 ='trig t2';
ERROR HY000: Trigger 'test.tri' already exists ERROR HY000: Trigger 'test.trig' already exists
insert into t1 value ('insert to t1',1); insert into t1 value ('insert to t1',1);
select * from t1; select * from t1;
f1 f2 f1 f2

2
mysql-test/suite/funcs_1/r/innodb_trig_0407.result
View File

@@ -459,7 +459,7 @@ Create trigger trg_3_406010_2 AFTER DELETE
on tb3 for each row set @test_var=@test_var+50; on tb3 for each row set @test_var=@test_var+50;
Create trigger trg_3_406010_1 AFTER INSERT Create trigger trg_3_406010_1 AFTER INSERT
on tb3 for each row set @test_var=@test_var+1; on tb3 for each row set @test_var=@test_var+1;
ERROR HY000: Trigger 'test.trg' already exists ERROR HY000: Trigger 'test.trg_3_406010_1' already exists
select @test_var; select @test_var;
@test_var @test_var
1 1

4
mysql-test/suite/funcs_1/r/memory_trig_0102.result
View File

@@ -254,7 +254,7 @@ Testcase 3.5.1.10:
------------------ ------------------
CREATE TRIGGER trg7_1 BEFORE UPDATE on tb3 for each row set new.f120 ='X'; CREATE TRIGGER trg7_1 BEFORE UPDATE on tb3 for each row set new.f120 ='X';
CREATE TRIGGER trg7_1 AFTER INSERT on tb3 for each row set @x ='Y'; CREATE TRIGGER trg7_1 AFTER INSERT on tb3 for each row set @x ='Y';
ERROR HY000: Trigger 'test.trg' already exists ERROR HY000: Trigger 'test.trg7_1' already exists
drop trigger trg7_1; drop trigger trg7_1;
Testcase 3.5.1.?: Testcase 3.5.1.?:
@@ -267,7 +267,7 @@ create trigger trig before insert on t1
for each row set new.f1 ='trig t1'; for each row set new.f1 ='trig t1';
create trigger trig before update on t2 create trigger trig before update on t2
for each row set new.f1 ='trig t2'; for each row set new.f1 ='trig t2';
ERROR HY000: Trigger 'test.tri' already exists ERROR HY000: Trigger 'test.trig' already exists
insert into t1 value ('insert to t1',1); insert into t1 value ('insert to t1',1);
select * from t1; select * from t1;
f1 f2 f1 f2

2
mysql-test/suite/funcs_1/r/memory_trig_0407.result
View File

@@ -459,7 +459,7 @@ Create trigger trg_3_406010_2 AFTER DELETE
on tb3 for each row set @test_var=@test_var+50; on tb3 for each row set @test_var=@test_var+50;
Create trigger trg_3_406010_1 AFTER INSERT Create trigger trg_3_406010_1 AFTER INSERT
on tb3 for each row set @test_var=@test_var+1; on tb3 for each row set @test_var=@test_var+1;
ERROR HY000: Trigger 'test.trg' already exists ERROR HY000: Trigger 'test.trg_3_406010_1' already exists
select @test_var; select @test_var;
@test_var @test_var
1 1

4
mysql-test/suite/funcs_1/r/myisam_trig_0102.result
View File

@@ -254,7 +254,7 @@ Testcase 3.5.1.10:
------------------ ------------------
CREATE TRIGGER trg7_1 BEFORE UPDATE on tb3 for each row set new.f120 ='X'; CREATE TRIGGER trg7_1 BEFORE UPDATE on tb3 for each row set new.f120 ='X';
CREATE TRIGGER trg7_1 AFTER INSERT on tb3 for each row set @x ='Y'; CREATE TRIGGER trg7_1 AFTER INSERT on tb3 for each row set @x ='Y';
ERROR HY000: Trigger 'test.trg' already exists ERROR HY000: Trigger 'test.trg7_1' already exists
drop trigger trg7_1; drop trigger trg7_1;
Testcase 3.5.1.?: Testcase 3.5.1.?:
@@ -267,7 +267,7 @@ create trigger trig before insert on t1
for each row set new.f1 ='trig t1'; for each row set new.f1 ='trig t1';
create trigger trig before update on t2 create trigger trig before update on t2
for each row set new.f1 ='trig t2'; for each row set new.f1 ='trig t2';
ERROR HY000: Trigger 'test.tri' already exists ERROR HY000: Trigger 'test.trig' already exists
insert into t1 value ('insert to t1',1); insert into t1 value ('insert to t1',1);
select * from t1; select * from t1;
f1 f2 f1 f2

2
mysql-test/suite/funcs_1/r/myisam_trig_0407.result
View File

@@ -459,7 +459,7 @@ Create trigger trg_3_406010_2 AFTER DELETE
on tb3 for each row set @test_var=@test_var+50; on tb3 for each row set @test_var=@test_var+50;
Create trigger trg_3_406010_1 AFTER INSERT Create trigger trg_3_406010_1 AFTER INSERT
on tb3 for each row set @test_var=@test_var+1; on tb3 for each row set @test_var=@test_var+1;
ERROR HY000: Trigger 'test.trg' already exists ERROR HY000: Trigger 'test.trg_3_406010_1' already exists
select @test_var; select @test_var;
@test_var @test_var
1 1

2
mysql-test/suite/rpl/r/rpl_create_drop_trigger.result
View File

@@ -19,7 +19,7 @@ SET @sum = @sum + NEW.val + 1
connection master; connection master;
CREATE TRIGGER IF NOT EXISTS val_sum AFTER INSERT ON t1 FOR EACH ROW SET @sum = @sum + NEW.val + 2; CREATE TRIGGER IF NOT EXISTS val_sum AFTER INSERT ON t1 FOR EACH ROW SET @sum = @sum + NEW.val + 2;
Warnings: Warnings:
Note 1359 Trigger 'db1.val_' already exists Note 1359 Trigger 'db1.val_sum' already exists
SELECT ACTION_STATEMENT AS ACTION_STATEMENT_Master FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME='val_sum'; SELECT ACTION_STATEMENT AS ACTION_STATEMENT_Master FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME='val_sum';
ACTION_STATEMENT_Master ACTION_STATEMENT_Master
SET @sum = @sum + NEW.val + 1 SET @sum = @sum + NEW.val + 1

4
sql/sql_trigger.cc
View File

@@ -833,7 +833,7 @@ bool Table_triggers_list::create_trigger(THD *thd, TABLE_LIST *tables,
} }
else if (lex->create_info.if_not_exists()) else if (lex->create_info.if_not_exists())
{ {
strxnmov(trigname_buff, sizeof(trigname_buff-1), tables->db, ".", strxnmov(trigname_buff, sizeof(trigname_buff) - 1, tables->db, ".",
lex->spname->m_name.str, NullS); lex->spname->m_name.str, NullS);
push_warning_printf(thd, Sql_condition::WARN_LEVEL_NOTE, push_warning_printf(thd, Sql_condition::WARN_LEVEL_NOTE,
ER_TRG_ALREADY_EXISTS, ER_TRG_ALREADY_EXISTS,
@@ -852,7 +852,7 @@ bool Table_triggers_list::create_trigger(THD *thd, TABLE_LIST *tables,
} }
else else
{ {
strxnmov(trigname_buff, sizeof(trigname_buff-1), tables->db, ".", strxnmov(trigname_buff, sizeof(trigname_buff) - 1, tables->db, ".",
lex->spname->m_name.str, NullS); lex->spname->m_name.str, NullS);
my_error(ER_TRG_ALREADY_EXISTS, MYF(0), trigname_buff); my_error(ER_TRG_ALREADY_EXISTS, MYF(0), trigname_buff);
DBUG_RETURN(true); DBUG_RETURN(true);