Merge bk-internal.mysql.com:/home/bk/mysql-5.1

into  mysql.com:/home/my/mysql-5.1


BUILD/SETUP.sh:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_row_basic.test:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/delayed.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/insert_select.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
mysql-test/t/rpl_row_create_table.test:
  Auto merged
mysql-test/t/rpl_sp.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/type_binary.test:
  Auto merged
mysql-test/t/type_varchar.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/rpl_sp.result:
  Manual merge
mysql-test/t/ndb_update.test:
  Manual merge
sql/share/errmsg.txt:
  Manual merge

mysql-test/extra/binlog_tests/insert_select-binlog.test

@@ -13,7 +13,7 @@ insert into t1 values(2);
 create table t2(a int);
 insert into t2 values(1),(2);
 reset master;
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 select * from t2;
 # The above should produce an error, but still be in the binlog;
 # verify the binlog :
@@ -29,7 +29,7 @@ drop table t1, t2;
 create table t1(a int);
 insert into t1 values(1),(1);
 reset master;
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 create table t2(unique(a)) select a from t1;
 # The above should produce an error, *and* not appear in the binlog
 let $VERSION=`select version()`;

mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test

@@ -273,12 +273,12 @@ set autocommit=0;
 CREATE TABLE t1 (a int, b int) engine=myisam;
 reset master;
 INSERT INTO t1 values (1,1),(1,2);
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 CREATE TABLE t2 (primary key (a)) engine=innodb select * from t1;
 # This should give warning
 DROP TABLE if exists t2;
 INSERT INTO t1 values (3,3);
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 CREATE TEMPORARY TABLE t2 (primary key (a)) engine=innodb select * from t1;
 ROLLBACK;
 # This should give warning
@@ -286,12 +286,12 @@ DROP TABLE IF EXISTS t2;
 
 CREATE TABLE t2 (a int, b int, primary key (a)) engine=innodb;
 INSERT INTO t1 VALUES (4,4);
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 CREATE TABLE IF NOT EXISTS t2 (primary key (a)) engine=innodb select * from t1;
 SELECT * from t2;
 TRUNCATE table t2;
 INSERT INTO t1 VALUES (5,5);
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 INSERT INTO t2 select * from t1;
 SELECT * FROM t2;
 DROP TABLE t2;
@@ -301,25 +301,25 @@ CREATE TEMPORARY TABLE t2 (a int, b int, primary key (a)) engine=innodb ;
 INSERT INTO t1 values (7,7);
 ROLLBACK;
 INSERT INTO t1 values (8,8);
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 CREATE TEMPORARY TABLE IF NOT EXISTS t2 (primary key (a)) engine=innodb select * from t1;
 COMMIT;
 INSERT INTO t1 values (9,9);
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 CREATE TEMPORARY TABLE IF NOT EXISTS t2 (primary key (a)) engine=innodb select * from t1;
 ROLLBACK;
 SELECT * from t2;
 TRUNCATE table t2;
 INSERT INTO t1 values (10,10);
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 INSERT INTO t2 select * from t1;
 SELECT * from t1;
 INSERT INTO t2 values (100,100);
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 CREATE TEMPORARY TABLE IF NOT EXISTS t2 (primary key (a)) engine=innodb select * from t1;
 COMMIT;
 INSERT INTO t2 values (101,101);
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 CREATE TEMPORARY TABLE IF NOT EXISTS t2 (primary key (a)) engine=innodb select * from t1;
 ROLLBACK;
 SELECT * from t2;

mysql-test/extra/rpl_tests/rpl_auto_increment.test

@@ -76,7 +76,7 @@ insert into t1 values (NULL),(5),(NULL),(NULL);
 insert into t1 values (500),(NULL),(502),(NULL),(NULL);
 select * from t1;
 set @@insert_id=600;
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values(600),(NULL),(NULL);
 set @@insert_id=600;
 insert ignore into t1 values(600),(NULL),(NULL),(610),(NULL);
@@ -119,7 +119,7 @@ set auto_increment_increment=11;
 set auto_increment_offset=4;
 insert into t1 values(null);
 insert into t1 values(null);
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values(null);
 select a, mod(a-@@auto_increment_offset,@@auto_increment_increment) from t1 order by a;
 

mysql-test/extra/rpl_tests/rpl_foreign_key.test

@@ -22,8 +22,8 @@ SET TIMESTAMP=1000000000;
 CREATE TABLE t3 ( a INT UNIQUE );
 SET FOREIGN_KEY_CHECKS=0;
 # Had to add 1022 for run with ndb as ndb uses different
-# error and error code for 1062. Bug 16677
---error 1022, 1062
+# error and error code for error ER_DUP_ENTRY_WITH_KEY_NAME. Bug 16677
+--error 1022, ER_DUP_ENTRY_WITH_KEY_NAME
 INSERT INTO t3 VALUES (1),(1);
 sync_slave_with_master;
 

mysql-test/extra/rpl_tests/rpl_insert_id.test

@@ -97,7 +97,7 @@ SET TIMESTAMP=1000000000;
 CREATE TABLE t1 ( a INT UNIQUE );
 SET FOREIGN_KEY_CHECKS=0;
 # Duplicate Key Errors
---error 1022, 1062
+--error 1022, ER_DUP_ENTRY_WITH_KEY_NAME
 INSERT INTO t1 VALUES (1),(1);
 sync_slave_with_master;
 connection master;

mysql-test/extra/rpl_tests/rpl_insert_id_pk.test

@@ -80,7 +80,7 @@ SET TIMESTAMP=1000000000;
 CREATE TABLE t1 ( a INT UNIQUE );
 SET FOREIGN_KEY_CHECKS=0;
 # Duplicate Key Errors codes
---error 1022, 1062
+--error 1022, ER_DUP_ENTRY_WITH_KEY_NAME
 INSERT INTO t1 VALUES (1),(1);
 sync_slave_with_master;
 connection master;

mysql-test/extra/rpl_tests/rpl_loaddata.test

@@ -130,7 +130,7 @@ connection master;
 reset master;
 eval create table t2 (day date,id int(9),category enum('a','b','c'),name varchar(60),
 unique(day)) engine=$engine_type; # no transactions
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 load data infile '../std_data_ln/rpl_loaddata2.dat' into table t2 fields
 terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by
 '\n##\n' starting by '>' ignore 1 lines;
@@ -146,7 +146,7 @@ select * from t2;
 alter table t2 drop key day;
 connection master;
 delete from t2;
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 load data infile '../std_data_ln/rpl_loaddata2.dat' into table t2 fields
 terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by
 '\n##\n' starting by '>' ignore 1 lines;

mysql-test/extra/rpl_tests/rpl_row_basic.test

@@ -195,11 +195,11 @@ eval CREATE TABLE t8 (a INT PRIMARY KEY, b INT UNIQUE, c INT UNIQUE) ENGINE = $t
 
 # First we make sure that the constraints are correctly set.
 INSERT INTO t8 VALUES (99,99,99);
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 INSERT INTO t8 VALUES (99,22,33);
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 INSERT INTO t8 VALUES (11,99,33);
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 INSERT INTO t8 VALUES (11,22,99);
 SELECT * FROM t8 ORDER BY a;
 

mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test

@@ -19,7 +19,7 @@ set sql_log_bin=0;
 insert into t1 values(2);
 set sql_log_bin=1;
 save_master_pos;
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values(1),(2);
 drop table t1;
 save_master_pos;

mysql-test/extra/rpl_tests/rpl_trig004.test

@@ -29,7 +29,7 @@ delimiter ;//
 
 INSERT INTO test.t2 VALUES (1, 0.0);
 # Expect duplicate error 1022 == ndb
---error 1022,1062
+--error 1022,error ER_DUP_ENTRY_WITH_KEY_NAME
 INSERT INTO test.t2 VALUES (1, 0.0);
 
 #show binlog events;