Fixed some wrong/inconsistent error message

- Added trigger name to "Trigger already exists" error message
- Added also missing query name to ER_DUP_QUERY_NAME
- Fixed wrong use of MASTER_DELAY_VALUE_OUT_OF_RANGE

11 files changed, 17 insertions, 17 deletions

diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index 81b65c420cd..1f032faaa40 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -1351,7 +1351,7 @@ CREATE TRIGGER f BEFORE INSERT ON t1 FOR EACH ROW
 BEGIN 
 UPDATE A SET `pk`=1 WHERE `pk`=0 ; 
 END ;|
-ERROR HY000: Trigger already exists
+ERROR HY000: Trigger 'test.f' already exists
 CREATE TRIGGER f1 BEFORE INSERT ON t1 FOR EACH ROW 
 BEGIN 
 UPDATE A SET `pk`=1 WHERE `pk`=0 ; 
diff --git a/mysql-test/r/create_drop_binlog.result b/mysql-test/r/create_drop_binlog.result
index d22d8dd5d92..5a14ed5def9 100644
--- a/mysql-test/r/create_drop_binlog.result
+++ b/mysql-test/r/create_drop_binlog.result
@@ -274,7 +274,7 @@ DROP TRIGGER tr1;
 CREATE TRIGGER IF NOT EXISTS tr1 BEFORE INSERT ON t1 FOR EACH ROW SET NEW.a=20;
 CREATE TRIGGER IF NOT EXISTS tr1 BEFORE INSERT ON t1 FOR EACH ROW SET NEW.a=21;
 Warnings:
-Note	1359	Trigger already exists
+Note	1359	Trigger 'test.tr1' already exists
 DROP TRIGGER IF EXISTS tr1;
 DROP TRIGGER IF EXISTS tr1;
 Warnings:
diff --git a/mysql-test/r/create_drop_trigger.result b/mysql-test/r/create_drop_trigger.result
index f7ae8d21a7f..540d898d848 100644
--- a/mysql-test/r/create_drop_trigger.result
+++ b/mysql-test/r/create_drop_trigger.result
@@ -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 AFTER INSERT ON t1 FOR EACH ROW SET @sum = @sum + 1 + NEW.val;
 Warnings:
-Note	1359	Trigger already exists
+Note	1359	Trigger 'db1.val_' already exists
 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
 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
 SET @sum = @sum + 3 + NEW.val
 CREATE TRIGGER val_sum BEFORE INSERT ON t1 FOR EACH ROW SET @sum = @sum + 4 + NEW.val;
-ERROR HY000: Trigger already exists
+ERROR HY000: Trigger 'db1.val_' already exists
 SELECT ACTION_STATEMENT FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME='val_sum';
 ACTION_STATEMENT
 SET @sum = @sum + 3 + NEW.val
diff --git a/mysql-test/r/cte_nonrecursive.result b/mysql-test/r/cte_nonrecursive.result
index 207df07f083..5b773067f13 100644
--- a/mysql-test/r/cte_nonrecursive.result
+++ b/mysql-test/r/cte_nonrecursive.result
@@ -703,7 +703,7 @@ ERROR 42S21: Duplicate column name 'f1'
 with t as (select * from t2 where c>3),
 t as (select a from t1 where a>2)
 select * from t,t1 where t1.a=t.c;
-ERROR HY000: Duplicate query name in WITH clause
+ERROR HY000: Duplicate query name `t` in WITH clause
 with t as (select a from s where a<5),
 s as (select a from t1 where b>='d')
 select * from t,s where t.a=s.a;
diff --git a/mysql-test/r/trigger.result b/mysql-test/r/trigger.result
index 9224756407b..a9f4cb12a92 100644
--- a/mysql-test/r/trigger.result
+++ b/mysql-test/r/trigger.result
@@ -301,11 +301,11 @@ create trigger trg before insert on t2 for each row set @a:=1;
 ERROR 42S02: Table 'test.t2' doesn't exist
 create trigger trg before insert on t1 for each row set @a:=1;
 create trigger trg after insert on t1 for each row set @a:=1;
-ERROR HY000: Trigger already exists
+ERROR HY000: Trigger 'test.trg' already exists
 create trigger trg2 before insert on t1 for each row set @a:=1;
 drop trigger trg2;
 create trigger trg before insert on t3 for each row set @a:=1;
-ERROR HY000: Trigger already exists
+ERROR HY000: Trigger 'test.trg' already exists
 create trigger trg2 before insert on t3 for each row set @a:=1;
 drop trigger trg2;
 drop trigger trg;
@@ -1986,7 +1986,7 @@ drop table if exists t1;
 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;
-ERROR HY000: Trigger already exists
+ERROR HY000: Trigger 'test.t1_' already exists
 create trigger t1_bi2 before insert on t1 for each row begin end;
 drop trigger t1_bi;
 drop trigger t1_bi2;
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_0102.result b/mysql-test/suite/funcs_1/r/innodb_trig_0102.result
index 77fabeaef77..49ff935f63f 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_0102.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_0102.result
@@ -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 AFTER INSERT on tb3 for each row set @x ='Y';
-ERROR HY000: Trigger already exists
+ERROR HY000: Trigger 'test.trg' already exists
 drop trigger trg7_1;
 
 Testcase 3.5.1.?:
@@ -266,7 +266,7 @@ create trigger trig before insert on t1
 for each row set new.f1 ='trig t1';
 create trigger trig before update on t2
 for each row set new.f1 ='trig t2';
-ERROR HY000: Trigger already exists
+ERROR HY000: Trigger 'test.tri' already exists
 insert into t1 value ('insert to t1',1);
 select * from t1;
 f1	f2
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_0407.result b/mysql-test/suite/funcs_1/r/innodb_trig_0407.result
index 81ead0c9346..8228589a482 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_0407.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_0407.result
@@ -459,7 +459,7 @@ Create trigger trg_3_406010_2 AFTER DELETE
 on tb3 for each row set @test_var=@test_var+50;
 Create trigger trg_3_406010_1 AFTER INSERT
 on tb3 for each row set @test_var=@test_var+1;
-ERROR HY000: Trigger already exists
+ERROR HY000: Trigger 'test.trg' already exists
 select @test_var;
 @test_var
 1
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_0102.result b/mysql-test/suite/funcs_1/r/memory_trig_0102.result
index 85da4aa7832..14bc8b44353 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_0102.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_0102.result
@@ -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 AFTER INSERT on tb3 for each row set @x ='Y';
-ERROR HY000: Trigger already exists
+ERROR HY000: Trigger 'test.trg' already exists
 drop trigger trg7_1;
 
 Testcase 3.5.1.?:
@@ -267,7 +267,7 @@ create trigger trig before insert on t1
 for each row set new.f1 ='trig t1';
 create trigger trig before update on t2
 for each row set new.f1 ='trig t2';
-ERROR HY000: Trigger already exists
+ERROR HY000: Trigger 'test.tri' already exists
 insert into t1 value ('insert to t1',1);
 select * from t1;
 f1	f2
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_0407.result b/mysql-test/suite/funcs_1/r/memory_trig_0407.result
index 72a7cb4f01d..892e84a8dac 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_0407.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_0407.result
@@ -459,7 +459,7 @@ Create trigger trg_3_406010_2 AFTER DELETE
 on tb3 for each row set @test_var=@test_var+50;
 Create trigger trg_3_406010_1 AFTER INSERT
 on tb3 for each row set @test_var=@test_var+1;
-ERROR HY000: Trigger already exists
+ERROR HY000: Trigger 'test.trg' already exists
 select @test_var;
 @test_var
 1
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_0102.result b/mysql-test/suite/funcs_1/r/myisam_trig_0102.result
index 85da4aa7832..14bc8b44353 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_0102.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_0102.result
@@ -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 AFTER INSERT on tb3 for each row set @x ='Y';
-ERROR HY000: Trigger already exists
+ERROR HY000: Trigger 'test.trg' already exists
 drop trigger trg7_1;
 
 Testcase 3.5.1.?:
@@ -267,7 +267,7 @@ create trigger trig before insert on t1
 for each row set new.f1 ='trig t1';
 create trigger trig before update on t2
 for each row set new.f1 ='trig t2';
-ERROR HY000: Trigger already exists
+ERROR HY000: Trigger 'test.tri' already exists
 insert into t1 value ('insert to t1',1);
 select * from t1;
 f1	f2
diff --git a/mysql-test/suite/rpl/r/rpl_create_drop_trigger.result b/mysql-test/suite/rpl/r/rpl_create_drop_trigger.result
index 76024d1fd74..71c2bfe30ce 100644
--- a/mysql-test/suite/rpl/r/rpl_create_drop_trigger.result
+++ b/mysql-test/suite/rpl/r/rpl_create_drop_trigger.result
@@ -19,7 +19,7 @@ SET @sum = @sum + NEW.val + 1
 connection master;
 CREATE TRIGGER IF NOT EXISTS val_sum AFTER INSERT ON t1 FOR EACH ROW SET @sum = @sum + NEW.val + 2;
 Warnings:
-Note	1359	Trigger already exists
+Note	1359	Trigger 'db1.val_' already exists
 SELECT ACTION_STATEMENT AS ACTION_STATEMENT_Master FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME='val_sum';
 ACTION_STATEMENT_Master
 SET @sum = @sum + NEW.val + 1