Change to new (after merge) error numbers

mysql-test/r/create.result:
  Fixed error number
mysql-test/r/rpl_sp.result:
  Fixed error number
mysql-test/r/sp.result:
  Fixed error number
mysql-test/r/view.result:
  Better fix for now() handling
mysql-test/t/ndb_basic.test:
  Use error names instead of numbers
mysql-test/t/ndb_index_unique.test:
  Use error names instead of numbers
mysql-test/t/rpl_skip_error-slave.opt:
  Change to new error number
mysql-test/t/sp.test:
  Change to new error number
mysql-test/t/view.test:
  Better fix for now() handling

9 files changed, 30 insertions, 30 deletions

diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index 977011e7391..c2bbb01af8c 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -285,7 +285,7 @@ ERROR 23000: Duplicate entry '3' for key 'PRIMARY'
 show warnings;
 Level	Code	Message
 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";
 Variable_name	Value
 Opened_tables	2
diff --git a/mysql-test/r/rpl_sp.result b/mysql-test/r/rpl_sp.result
index e4c7336aabc..ea07a86d009 100644
--- a/mysql-test/r/rpl_sp.result
+++ b/mysql-test/r/rpl_sp.result
@@ -107,7 +107,7 @@ call foo4();
 ERROR 23000: Duplicate entry '20' for key 'a'
 show warnings;
 Level	Code	Message
-Error	1579	Duplicate entry '20' for key 'a'
+Error	1582	Duplicate entry '20' for key 'a'
 select * from t2;
 a
 20
@@ -241,7 +241,7 @@ return 10;
 end|
 do fn1(100);
 Warnings:
-Error	1579	Duplicate entry '100' for key 'a'
+Error	1582	Duplicate entry '100' for key 'a'
 select fn1(20);
 ERROR 23000: Duplicate entry '20' for key 'a'
 select * from t2;
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index c452bedd9e8..51ab8d5e139 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -1493,10 +1493,10 @@ insert into t3 (a) values (1)|
 create procedure h_ee()
 deterministic
 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';
 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';
 insert into t3 values (1);
 end;
@@ -1504,7 +1504,7 @@ end|
 create procedure h_es()
 deterministic
 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';
 begin
 -- integrity constraint violation
@@ -1541,7 +1541,7 @@ end|
 create procedure h_ex()
 deterministic
 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';
 begin
 declare continue handler for sqlexception
@@ -1556,7 +1556,7 @@ begin
 declare continue handler for sqlstate '23000' 
 select 'Outer (bad)' as 'h_se';
 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';
 insert into t3 values (1);
 end;
@@ -1696,7 +1696,7 @@ begin
 declare continue handler for sqlexception
 select 'Outer (bad)' as 'h_xe';
 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';
 insert into t3 values (1);
 end;
@@ -4701,10 +4701,10 @@ insert into t3 values (1)|
 create procedure bug15011()
 deterministic
 begin
-declare continue handler for 1579
+declare continue handler for 1582
 select 'Outer' as 'Handler';
 begin
-declare continue handler for 1579
+declare continue handler for 1582
 select 'Inner' as 'Handler';
 insert into t3 values (1);
 end;
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index 3088e4d1559..1b20b4b223c 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -2675,9 +2675,9 @@ lName varchar(25) NOT NULL,
 DOB date NOT NULL,
 uID int unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY);
 INSERT INTO t1(fName, lName, DOB) VALUES
-('Alice', 'Hill', date_sub(curdate(), interval 15271 day)),
-('Bob', 'Adams', date_sub(curdate(), interval 33600 day)),
-('Carol', 'Simpson', date_sub(curdate(), interval 13700 day));
+('Hank', 'Hill', '1964-09-29'),
+('Tom', 'Adams', '1908-02-14'),
+('Homer', 'Simpson', '1968-03-05');
 CREATE VIEW v1 AS
 SELECT (year(now())-year(DOB)) AS Age
 FROM t1 HAVING Age < 75;
diff --git a/mysql-test/t/ndb_basic.test b/mysql-test/t/ndb_basic.test
index 8541c0ac0c5..20a975b28a8 100644
--- a/mysql-test/t/ndb_basic.test
+++ b/mysql-test/t/ndb_basic.test
@@ -775,7 +775,7 @@ drop table t1,t2;
 # insert ignore
 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);
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 set a=1, b=100;
 insert ignore into t1 set a=1, b=100;
 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;
 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 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;
 select * from t1 order by a;
 update t1 set b = 1 where a > 1 order by a desc limit 1;
 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;
 select * from t1 order by a;
 update ignore t1,t2 set a = 1, c = 1 where a = 3 and c = 3;
diff --git a/mysql-test/t/ndb_index_unique.test b/mysql-test/t/ndb_index_unique.test
index 42ccb02f0ca..e6d3fbb87a0 100644
--- a/mysql-test/t/ndb_index_unique.test
+++ b/mysql-test/t/ndb_index_unique.test
@@ -91,7 +91,7 @@ select * from t2 order by a;
 
 # Bug #24818 CREATE UNIQUE INDEX (...) USING HASH on a NDB table crashes mysqld
 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);
 alter table t2 drop index bi;
 insert into t2 values(9, 3, 1);
diff --git a/mysql-test/t/rpl_skip_error-slave.opt b/mysql-test/t/rpl_skip_error-slave.opt
index acb0b77cc03..982362d93a5 100644
--- a/mysql-test/t/rpl_skip_error-slave.opt
+++ b/mysql-test/t/rpl_skip_error-slave.opt
@@ -1 +1 @@
---slave-skip-error=1053,1579
+--slave-skip-error=1053,1582
diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test
index 326518902d7..38753ed3ac0 100644
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@@ -1763,11 +1763,11 @@ insert into t3 (a) values (1)|
 create procedure h_ee()
     deterministic
 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';
 
   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';
 
     insert into t3 values (1);
@@ -1777,7 +1777,7 @@ end|
 create procedure h_es()
     deterministic
 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';
 
   begin
@@ -1823,7 +1823,7 @@ end|
 create procedure h_ex()
     deterministic
 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';
 
   begin
@@ -1842,7 +1842,7 @@ begin
     select 'Outer (bad)' as 'h_se';
 
   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';
 
     insert into t3 values (1);
@@ -2015,7 +2015,7 @@ begin
     select 'Outer (bad)' as 'h_xe';
 
   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';
 
     insert into t3 values (1);
@@ -5528,11 +5528,11 @@ insert into t3 values (1)|
 create procedure bug15011()
   deterministic
 begin
-  declare continue handler for 1579
+  declare continue handler for 1582
     select 'Outer' as 'Handler';
 
   begin
-    declare continue handler for 1579
+    declare continue handler for 1582
       select 'Inner' as 'Handler';
 
     insert into t3 values (1);
diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test
index b75e690e677..3c5308a935c 100644
--- a/mysql-test/t/view.test
+++ b/mysql-test/t/view.test
@@ -2544,9 +2544,9 @@ CREATE TABLE t1(
   uID int unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY);
  
 INSERT INTO t1(fName, lName, DOB) VALUES
-  ('Alice', 'Hill', date_sub(curdate(), interval 15271 day)),
-  ('Bob', 'Adams', date_sub(curdate(), interval 33600 day)),
-  ('Carol', 'Simpson', date_sub(curdate(), interval 13700 day));
+  ('Hank', 'Hill', '1964-09-29'),
+  ('Tom', 'Adams', '1908-02-14'),
+  ('Homer', 'Simpson', '1968-03-05');
 
 CREATE VIEW v1 AS
   SELECT (year(now())-year(DOB)) AS Age