bk commit into 5.1 tree (monty:1.2424)

[monty]

Below is the list of changes that have just been committed into a local
5.1 repository of monty. When monty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-23 01:58:07+02:00, monty@stripped +10 -0
  Change to new (after merge) error numbers

  mysql-test/extra/rpl_tests/rpl_trig004.test@stripped, 2007-01-23 01:58:05+02:00,
monty@stripped +1 -1
    Fixed bug in last push

  mysql-test/r/create.result@stripped, 2007-01-23 01:58:05+02:00, monty@stripped +1 -1
    Fixed error number

  mysql-test/r/rpl_sp.result@stripped, 2007-01-23 01:58:05+02:00, monty@stripped +2 -2
    Fixed error number

  mysql-test/r/sp.result@stripped, 2007-01-23 01:58:05+02:00, monty@stripped +8 -8
    Fixed error number

  mysql-test/r/view.result@stripped, 2007-01-23 01:58:05+02:00, monty@stripped +3 -3
    Better fix for now() handling

  mysql-test/t/ndb_basic.test@stripped, 2007-01-23 01:58:05+02:00, monty@stripped +3 -3
    Use error names instead of numbers

  mysql-test/t/ndb_index_unique.test@stripped, 2007-01-23 01:58:05+02:00, monty@stripped +1
-1
    Use error names instead of numbers

  mysql-test/t/rpl_skip_error-slave.opt@stripped, 2007-01-23 01:58:05+02:00, monty@stripped +1
-1
    Change to new error number

  mysql-test/t/sp.test@stripped, 2007-01-23 01:58:06+02:00, monty@stripped +8 -8
    Change to new error number

  mysql-test/t/view.test@stripped, 2007-01-23 01:58:06+02:00, monty@stripped +3 -3
    Better fix for now() handling

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	monty
# Host:	narttu.mysql.fi
# Root:	/home/my/mysql-5.1

--- 1.198/mysql-test/r/view.result	2007-01-22 19:08:44 +02:00
+++ 1.199/mysql-test/r/view.result	2007-01-23 01:58:05 +02:00
@@ -2675,9 +2675,9 @@
 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;

--- 1.178/mysql-test/t/view.test	2007-01-22 19:08:44 +02:00
+++ 1.179/mysql-test/t/view.test	2007-01-23 01:58:06 +02:00
@@ -2544,9 +2544,9 @@
   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

--- 1.33/mysql-test/r/rpl_sp.result	2007-01-22 19:18:19 +02:00
+++ 1.34/mysql-test/r/rpl_sp.result	2007-01-23 01:58:05 +02:00
@@ -107,7 +107,7 @@
 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 @@
 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;

--- 1.3/mysql-test/extra/rpl_tests/rpl_trig004.test	2007-01-22 18:42:48 +02:00
+++ 1.4/mysql-test/extra/rpl_tests/rpl_trig004.test	2007-01-23 01:58:05 +02:00
@@ -29,7 +29,7 @@
 
 INSERT INTO test.t2 VALUES (1, 0.0);
 # Expect duplicate error 1022 == ndb
---error 1022,error ER_DUP_ENTRY_WITH_KEY_NAME
+--error 1022, ER_DUP_ENTRY_WITH_KEY_NAME
 INSERT INTO test.t2 VALUES (1, 0.0);
 
 #show binlog events; 

--- 1.47/mysql-test/t/ndb_basic.test	2006-12-17 22:08:00 +02:00
+++ 1.48/mysql-test/t/ndb_basic.test	2007-01-23 01:58:05 +02:00
@@ -775,7 +775,7 @@
 # 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 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;

--- 1.26/mysql-test/t/ndb_index_unique.test	2007-01-22 19:08:44 +02:00
+++ 1.27/mysql-test/t/ndb_index_unique.test	2007-01-23 01:58:05 +02:00
@@ -91,7 +91,7 @@
 
 # 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);

--- 1.130/mysql-test/r/create.result	2007-01-22 18:42:48 +02:00
+++ 1.131/mysql-test/r/create.result	2007-01-23 01:58:05 +02:00
@@ -285,7 +285,7 @@
 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

--- 1.246/mysql-test/r/sp.result	2007-01-22 19:08:44 +02:00
+++ 1.247/mysql-test/r/sp.result	2007-01-23 01:58:05 +02:00
@@ -1493,10 +1493,10 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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;

--- 1.214/mysql-test/t/sp.test	2007-01-22 19:08:44 +02:00
+++ 1.215/mysql-test/t/sp.test	2007-01-23 01:58:06 +02:00
@@ -1763,11 +1763,11 @@
 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 @@
 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 @@
 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 @@
     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 @@
     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 @@
 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);

--- 1.4/mysql-test/t/rpl_skip_error-slave.opt	2007-01-22 18:42:49 +02:00
+++ 1.5/mysql-test/t/rpl_skip_error-slave.opt	2007-01-23 01:58:05 +02:00
@@ -1 +1 @@
---slave-skip-error=1053,1579
+--slave-skip-error=1053,1582