Change to new (after merge) error numbers

parent 7df1dbcd
...@@ -285,7 +285,7 @@ ERROR 23000: Duplicate entry '3' for key 'PRIMARY' ...@@ -285,7 +285,7 @@ ERROR 23000: Duplicate entry '3' for key 'PRIMARY'
show warnings; show warnings;
Level Code Message Level Code Message
Note 1050 Table 't1' already exists Note 1050 Table 't1' already exists
Error 1579 Duplicate entry '3' for key 'PRIMARY' Error 1582 Duplicate entry '3' for key 'PRIMARY'
show status like "Opened_tables"; show status like "Opened_tables";
Variable_name Value Variable_name Value
Opened_tables 2 Opened_tables 2
......
...@@ -107,7 +107,7 @@ call foo4(); ...@@ -107,7 +107,7 @@ call foo4();
ERROR 23000: Duplicate entry '20' for key 'a' ERROR 23000: Duplicate entry '20' for key 'a'
show warnings; show warnings;
Level Code Message Level Code Message
Error 1579 Duplicate entry '20' for key 'a' Error 1582 Duplicate entry '20' for key 'a'
select * from t2; select * from t2;
a a
20 20
...@@ -241,7 +241,7 @@ return 10; ...@@ -241,7 +241,7 @@ return 10;
end| end|
do fn1(100); do fn1(100);
Warnings: Warnings:
Error 1579 Duplicate entry '100' for key 'a' Error 1582 Duplicate entry '100' for key 'a'
select fn1(20); select fn1(20);
ERROR 23000: Duplicate entry '20' for key 'a' ERROR 23000: Duplicate entry '20' for key 'a'
select * from t2; select * from t2;
......
...@@ -1493,10 +1493,10 @@ insert into t3 (a) values (1)| ...@@ -1493,10 +1493,10 @@ insert into t3 (a) values (1)|
create procedure h_ee() create procedure h_ee()
deterministic deterministic
begin begin
declare continue handler for 1579 -- ER_DUP_ENTRY_WITH_KEY_NAME declare continue handler for 1582 -- ER_DUP_ENTRY_WITH_KEY_NAME
select 'Outer (bad)' as 'h_ee'; select 'Outer (bad)' as 'h_ee';
begin begin
declare continue handler for 1579 -- ER_DUP_ENTRY_WITH_KEY_NAME declare continue handler for 1582 -- ER_DUP_ENTRY_WITH_KEY_NAME
select 'Inner (good)' as 'h_ee'; select 'Inner (good)' as 'h_ee';
insert into t3 values (1); insert into t3 values (1);
end; end;
...@@ -1504,7 +1504,7 @@ end| ...@@ -1504,7 +1504,7 @@ end|
create procedure h_es() create procedure h_es()
deterministic deterministic
begin begin
declare continue handler for 1579 -- ER_DUP_ENTRY_WITH_KEY_NAME declare continue handler for 1582 -- ER_DUP_ENTRY_WITH_KEY_NAME
select 'Outer (good)' as 'h_es'; select 'Outer (good)' as 'h_es';
begin begin
-- integrity constraint violation -- integrity constraint violation
...@@ -1541,7 +1541,7 @@ end| ...@@ -1541,7 +1541,7 @@ end|
create procedure h_ex() create procedure h_ex()
deterministic deterministic
begin begin
declare continue handler for 1579 -- ER_DUP_ENTRY_WITH_KEY_NAME declare continue handler for 1582 -- ER_DUP_ENTRY_WITH_KEY_NAME
select 'Outer (good)' as 'h_ex'; select 'Outer (good)' as 'h_ex';
begin begin
declare continue handler for sqlexception declare continue handler for sqlexception
...@@ -1556,7 +1556,7 @@ begin ...@@ -1556,7 +1556,7 @@ begin
declare continue handler for sqlstate '23000' declare continue handler for sqlstate '23000'
select 'Outer (bad)' as 'h_se'; select 'Outer (bad)' as 'h_se';
begin begin
declare continue handler for 1579 -- ER_DUP_ENTRY_WITH_KEY_NAME declare continue handler for 1582 -- ER_DUP_ENTRY_WITH_KEY_NAME
select 'Inner (good)' as 'h_se'; select 'Inner (good)' as 'h_se';
insert into t3 values (1); insert into t3 values (1);
end; end;
...@@ -1696,7 +1696,7 @@ begin ...@@ -1696,7 +1696,7 @@ begin
declare continue handler for sqlexception declare continue handler for sqlexception
select 'Outer (bad)' as 'h_xe'; select 'Outer (bad)' as 'h_xe';
begin begin
declare continue handler for 1579 -- ER_DUP_ENTRY_WITH_KEY_NAME declare continue handler for 1582 -- ER_DUP_ENTRY_WITH_KEY_NAME
select 'Inner (good)' as 'h_xe'; select 'Inner (good)' as 'h_xe';
insert into t3 values (1); insert into t3 values (1);
end; end;
...@@ -4701,10 +4701,10 @@ insert into t3 values (1)| ...@@ -4701,10 +4701,10 @@ insert into t3 values (1)|
create procedure bug15011() create procedure bug15011()
deterministic deterministic
begin begin
declare continue handler for 1579 declare continue handler for 1582
select 'Outer' as 'Handler'; select 'Outer' as 'Handler';
begin begin
declare continue handler for 1579 declare continue handler for 1582
select 'Inner' as 'Handler'; select 'Inner' as 'Handler';
insert into t3 values (1); insert into t3 values (1);
end; end;
......
...@@ -2675,9 +2675,9 @@ lName varchar(25) NOT NULL, ...@@ -2675,9 +2675,9 @@ lName varchar(25) NOT NULL,
DOB date NOT NULL, DOB date NOT NULL,
uID int unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY); uID int unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY);
INSERT INTO t1(fName, lName, DOB) VALUES INSERT INTO t1(fName, lName, DOB) VALUES
('Alice', 'Hill', date_sub(curdate(), interval 15271 day)), ('Hank', 'Hill', '1964-09-29'),
('Bob', 'Adams', date_sub(curdate(), interval 33600 day)), ('Tom', 'Adams', '1908-02-14'),
('Carol', 'Simpson', date_sub(curdate(), interval 13700 day)); ('Homer', 'Simpson', '1968-03-05');
CREATE VIEW v1 AS CREATE VIEW v1 AS
SELECT (year(now())-year(DOB)) AS Age SELECT (year(now())-year(DOB)) AS Age
FROM t1 HAVING Age < 75; FROM t1 HAVING Age < 75;
......
...@@ -775,7 +775,7 @@ drop table t1,t2; ...@@ -775,7 +775,7 @@ drop table t1,t2;
# insert ignore # insert ignore
create table t1 (a int not null primary key, b int not null) engine=ndb; create table t1 (a int not null primary key, b int not null) engine=ndb;
insert into t1 values (1,10), (2,20), (3,30); insert into t1 values (1,10), (2,20), (3,30);
--error 1062 --error ER_DUP_ENTRY_WITH_KEY_NAME
insert into t1 set a=1, b=100; insert into t1 set a=1, b=100;
insert ignore into t1 set a=1, b=100; insert ignore into t1 set a=1, b=100;
select * from t1 order by a; select * from t1 order by a;
...@@ -788,12 +788,12 @@ create table t1 (a int not null primary key, b int not null) engine=ndb; ...@@ -788,12 +788,12 @@ create table t1 (a int not null primary key, b int not null) engine=ndb;
create table t2 (c int not null primary key, d int not null) engine=ndb; create table t2 (c int not null primary key, d int not null) engine=ndb;
insert into t1 values (1,10), (2,10), (3,30), (4, 30); insert into t1 values (1,10), (2,10), (3,30), (4, 30);
insert into t2 values (1,10), (2,10), (3,30), (4, 30); insert into t2 values (1,10), (2,10), (3,30), (4, 30);
--error 1062 --error ER_DUP_ENTRY_WITH_KEY_NAME
update t1 set a = 1 where a = 3; update t1 set a = 1 where a = 3;
select * from t1 order by a; select * from t1 order by a;
update t1 set b = 1 where a > 1 order by a desc limit 1; update t1 set b = 1 where a > 1 order by a desc limit 1;
select * from t1 order by a; select * from t1 order by a;
--error 1062 --error ER_DUP_ENTRY_WITH_KEY_NAME
update t1,t2 set a = 1, c = 1 where a = 3 and c = 3; update t1,t2 set a = 1, c = 1 where a = 3 and c = 3;
select * from t1 order by a; select * from t1 order by a;
update ignore t1,t2 set a = 1, c = 1 where a = 3 and c = 3; update ignore t1,t2 set a = 1, c = 1 where a = 3 and c = 3;
......
...@@ -91,7 +91,7 @@ select * from t2 order by a; ...@@ -91,7 +91,7 @@ select * from t2 order by a;
# Bug #24818 CREATE UNIQUE INDEX (...) USING HASH on a NDB table crashes mysqld # Bug #24818 CREATE UNIQUE INDEX (...) USING HASH on a NDB table crashes mysqld
create unique index bi using hash on t2(b); create unique index bi using hash on t2(b);
-- error 1062 -- error ER_DUP_ENTRY_WITH_KEY_NAME
insert into t2 values(9, 3, 1); insert into t2 values(9, 3, 1);
alter table t2 drop index bi; alter table t2 drop index bi;
insert into t2 values(9, 3, 1); insert into t2 values(9, 3, 1);
......
--slave-skip-error=1053,1579 --slave-skip-error=1053,1582
...@@ -1763,11 +1763,11 @@ insert into t3 (a) values (1)| ...@@ -1763,11 +1763,11 @@ insert into t3 (a) values (1)|
create procedure h_ee() create procedure h_ee()
deterministic deterministic
begin begin
declare continue handler for 1579 -- ER_DUP_ENTRY_WITH_KEY_NAME declare continue handler for 1582 -- ER_DUP_ENTRY_WITH_KEY_NAME
select 'Outer (bad)' as 'h_ee'; select 'Outer (bad)' as 'h_ee';
begin begin
declare continue handler for 1579 -- ER_DUP_ENTRY_WITH_KEY_NAME declare continue handler for 1582 -- ER_DUP_ENTRY_WITH_KEY_NAME
select 'Inner (good)' as 'h_ee'; select 'Inner (good)' as 'h_ee';
insert into t3 values (1); insert into t3 values (1);
...@@ -1777,7 +1777,7 @@ end| ...@@ -1777,7 +1777,7 @@ end|
create procedure h_es() create procedure h_es()
deterministic deterministic
begin begin
declare continue handler for 1579 -- ER_DUP_ENTRY_WITH_KEY_NAME declare continue handler for 1582 -- ER_DUP_ENTRY_WITH_KEY_NAME
select 'Outer (good)' as 'h_es'; select 'Outer (good)' as 'h_es';
begin begin
...@@ -1823,7 +1823,7 @@ end| ...@@ -1823,7 +1823,7 @@ end|
create procedure h_ex() create procedure h_ex()
deterministic deterministic
begin begin
declare continue handler for 1579 -- ER_DUP_ENTRY_WITH_KEY_NAME declare continue handler for 1582 -- ER_DUP_ENTRY_WITH_KEY_NAME
select 'Outer (good)' as 'h_ex'; select 'Outer (good)' as 'h_ex';
begin begin
...@@ -1842,7 +1842,7 @@ begin ...@@ -1842,7 +1842,7 @@ begin
select 'Outer (bad)' as 'h_se'; select 'Outer (bad)' as 'h_se';
begin begin
declare continue handler for 1579 -- ER_DUP_ENTRY_WITH_KEY_NAME declare continue handler for 1582 -- ER_DUP_ENTRY_WITH_KEY_NAME
select 'Inner (good)' as 'h_se'; select 'Inner (good)' as 'h_se';
insert into t3 values (1); insert into t3 values (1);
...@@ -2015,7 +2015,7 @@ begin ...@@ -2015,7 +2015,7 @@ begin
select 'Outer (bad)' as 'h_xe'; select 'Outer (bad)' as 'h_xe';
begin begin
declare continue handler for 1579 -- ER_DUP_ENTRY_WITH_KEY_NAME declare continue handler for 1582 -- ER_DUP_ENTRY_WITH_KEY_NAME
select 'Inner (good)' as 'h_xe'; select 'Inner (good)' as 'h_xe';
insert into t3 values (1); insert into t3 values (1);
...@@ -5528,11 +5528,11 @@ insert into t3 values (1)| ...@@ -5528,11 +5528,11 @@ insert into t3 values (1)|
create procedure bug15011() create procedure bug15011()
deterministic deterministic
begin begin
declare continue handler for 1579 declare continue handler for 1582
select 'Outer' as 'Handler'; select 'Outer' as 'Handler';
begin begin
declare continue handler for 1579 declare continue handler for 1582
select 'Inner' as 'Handler'; select 'Inner' as 'Handler';
insert into t3 values (1); insert into t3 values (1);
......
...@@ -2544,9 +2544,9 @@ CREATE TABLE t1( ...@@ -2544,9 +2544,9 @@ CREATE TABLE t1(
uID int unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY); uID int unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY);
INSERT INTO t1(fName, lName, DOB) VALUES INSERT INTO t1(fName, lName, DOB) VALUES
('Alice', 'Hill', date_sub(curdate(), interval 15271 day)), ('Hank', 'Hill', '1964-09-29'),
('Bob', 'Adams', date_sub(curdate(), interval 33600 day)), ('Tom', 'Adams', '1908-02-14'),
('Carol', 'Simpson', date_sub(curdate(), interval 13700 day)); ('Homer', 'Simpson', '1968-03-05');
CREATE VIEW v1 AS CREATE VIEW v1 AS
SELECT (year(now())-year(DOB)) AS Age SELECT (year(now())-year(DOB)) AS Age
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment