List:Commits« Previous MessageNext Message »
From:monty Date:January 22 2007 6:18pm
Subject:bk commit into 5.1 tree (monty:1.2423)
View as plain text  
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-22 19:18:22+02:00, monty@stripped +23 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.1
  into  mysql.com:/home/my/mysql-5.1
  MERGE: 1.2303.193.1

  BUILD/SETUP.sh@stripped, 2007-01-22 19:08:43+02:00, monty@stripped +0 -0
    Auto merged
    MERGE: 1.65.1.1

  mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test@stripped, 2007-01-22
19:08:43+02:00, monty@stripped +0 -0
    Auto merged
    MERGE: 1.31.3.1

  mysql-test/extra/rpl_tests/rpl_row_basic.test@stripped, 2007-01-22 19:08:43+02:00,
monty@stripped +0 -0
    Auto merged
    MERGE: 1.3.1.1

  mysql-test/include/mix1.inc@stripped, 2007-01-22 19:08:43+02:00, monty@stripped +0 -0
    Auto merged
    MERGE: 1.22.1.1

  mysql-test/r/rpl_sp.result@stripped, 2007-01-22 19:18:19+02:00, monty@stripped +2 -4
    Manual merge
    MERGE: 1.21.2.1

  mysql-test/r/sp.result@stripped, 2007-01-22 19:08:44+02:00, monty@stripped +0 -0
    Auto merged
    MERGE: 1.232.3.1

  mysql-test/r/view.result@stripped, 2007-01-22 19:08:44+02:00, monty@stripped +1 -1
    Auto merged
    MERGE: 1.193.2.1

  mysql-test/t/ctype_utf8.test@stripped, 2007-01-22 19:08:44+02:00, monty@stripped +0
-0
    Auto merged
    MERGE: 1.101.1.1

  mysql-test/t/delayed.test@stripped, 2007-01-22 19:08:44+02:00, monty@stripped +0 -0
    Auto merged
    MERGE: 1.15.1.1

  mysql-test/t/innodb.test@stripped, 2007-01-22 19:08:44+02:00, monty@stripped +0 -0
    Auto merged
    MERGE: 1.149.1.2

  mysql-test/t/insert_select.test@stripped, 2007-01-22 19:08:44+02:00, monty@stripped
+0 -0
    Auto merged
    MERGE: 1.33.1.1

  mysql-test/t/myisam.test@stripped, 2007-01-22 19:08:44+02:00, monty@stripped +0 -0
    Auto merged
    MERGE: 1.71.3.1

  mysql-test/t/ndb_index_unique.test@stripped, 2007-01-22 19:08:44+02:00,
monty@stripped +0 -0
    Auto merged
    MERGE: 1.23.1.1

  mysql-test/t/ndb_update.test@stripped, 2007-01-22 19:18:19+02:00, monty@stripped +2
-2
    Manual merge
    MERGE: 1.7.1.1

  mysql-test/t/rpl_row_create_table.test@stripped, 2007-01-22 19:08:44+02:00,
monty@stripped +0 -0
    Auto merged
    MERGE: 1.7.1.1

  mysql-test/t/rpl_sp.test@stripped, 2007-01-22 19:08:44+02:00, monty@stripped +0 -0
    Auto merged
    MERGE: 1.19.2.1

  mysql-test/t/sp.test@stripped, 2007-01-22 19:08:44+02:00, monty@stripped +0 -0
    Auto merged
    MERGE: 1.204.1.3

  mysql-test/t/type_binary.test@stripped, 2007-01-22 19:08:44+02:00, monty@stripped +0
-0
    Auto merged
    MERGE: 1.3.1.1

  mysql-test/t/type_varchar.test@stripped, 2007-01-22 19:08:44+02:00, monty@stripped +0
-0
    Auto merged
    MERGE: 1.10.1.1

  mysql-test/t/view.test@stripped, 2007-01-22 19:08:44+02:00, monty@stripped +0 -0
    Auto merged
    MERGE: 1.175.2.1

  sql/handler.cc@stripped, 2007-01-22 19:08:44+02:00, monty@stripped +0 -0
    Auto merged
    MERGE: 1.283.5.1

  sql/share/errmsg.txt@stripped, 2007-01-22 19:18:19+02:00, monty@stripped +0 -0
    Manual merge
    MERGE: 1.134.2.1

  sql/sql_table.cc@stripped, 2007-01-22 19:08:44+02:00, monty@stripped +0 -0
    Auto merged
    MERGE: 1.372.5.2

# 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/RESYNC

--- 1.290/sql/handler.cc	2007-01-17 20:32:06 +02:00
+++ 1.291/sql/handler.cc	2007-01-22 19:08:44 +02:00
@@ -2041,7 +2041,7 @@
   {
     /* Key is unknown */
     str.copy("", 0, system_charset_info);
-    my_printf_error(ER_DUP_ENTRY, msg,
+    my_printf_error(ER_DUP_ENTRY_WITH_KEY_NAME, msg,
 		    MYF(0), str.c_ptr(), "*UNKNOWN*");
   }
   else
@@ -2054,7 +2054,7 @@
       str.length(max_length-4);
       str.append(STRING_WITH_LEN("..."));
     }
-    my_printf_error(ER_DUP_ENTRY, msg,
+    my_printf_error(ER_DUP_ENTRY_WITH_KEY_NAME, msg,
 		    MYF(0), str.c_ptr(), table->key_info[key_nr].name);
   }
 }
@@ -2099,7 +2099,7 @@
     uint key_nr=get_dup_key(error);
     if ((int) key_nr >= 0)
     {
-      print_keydup_error(key_nr, ER(ER_DUP_ENTRY));
+      print_keydup_error(key_nr, ER(ER_DUP_ENTRY_WITH_KEY_NAME));
       DBUG_VOID_RETURN;
     }
     textno=ER_DUP_KEY;

--- 1.382/sql/sql_table.cc	2007-01-16 14:12:20 +02:00
+++ 1.383/sql/sql_table.cc	2007-01-22 19:08:44 +02:00
@@ -6820,7 +6820,7 @@
            uint key_nr= to->file->get_dup_key(error);
            if ((int) key_nr >= 0)
            {
-             const char *err_msg= ER(ER_DUP_ENTRY);
+             const char *err_msg= ER(ER_DUP_ENTRY_WITH_KEY_NAME);
              if (key_nr == 0 &&
                  (to->key_info[0].key_part[0].field->flags &
                   AUTO_INCREMENT_FLAG))

--- 1.23/mysql-test/include/mix1.inc	2006-12-21 00:46:32 +02:00
+++ 1.24/mysql-test/include/mix1.inc	2007-01-22 19:08:43 +02:00
@@ -393,24 +393,24 @@
 
 CREATE TABLE t1 (a int, b int);
 insert into t1 values (1,1),(1,2);
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 CREATE TABLE t2 (primary key (a)) select * from t1;
 # This should give warning
 drop table if exists t2;
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 CREATE TEMPORARY TABLE t2 (primary key (a)) select * from t1;
 # This should give warning
 drop table if exists t2;
 CREATE TABLE t2 (a int, b int, primary key (a));
 BEGIN;
 INSERT INTO t2 values(100,100);
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 CREATE TABLE IF NOT EXISTS t2 (primary key (a)) select * from t1;
 SELECT * from t2;
 ROLLBACK;
 SELECT * from t2;
 TRUNCATE table t2;
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 INSERT INTO t2 select * from t1;
 SELECT * from t2;
 drop table t2;
@@ -418,19 +418,19 @@
 CREATE TEMPORARY TABLE t2 (a int, b int, primary key (a));
 BEGIN;
 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)) select * from t1;
 SELECT * from t2;
 COMMIT;
 BEGIN;
 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)) select * from t1;
 SELECT * from t2;
 ROLLBACK;
 SELECT * from t2;
 TRUNCATE table t2;
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 INSERT INTO t2 select * from t1;
 SELECT * from t2;
 drop table t1,t2;

--- 1.140/sql/share/errmsg.txt	2007-01-18 16:53:37 +02:00
+++ 1.141/sql/share/errmsg.txt	2007-01-22 19:18:19 +02:00
@@ -1479,30 +1479,30 @@
         swe "Nyckelnamn '%-.64s' finns flera gnger"
         ukr " ¦'  '%-.64s'"
 ER_DUP_ENTRY 23000 S1009
-        cze "Zvojen-B kl '%-.64s' (slo kle '%-.64s')"
-        dan "Ens vrdier '%-.64s' for indeks '%-.64s'"
-        nla "Dubbele ingang '%-.64s' voor zoeksleutel '%-.64s'"
-        eng "Duplicate entry '%-.64s' for key '%-.64s'"
-        jps "'%-.64s'  key '%-.64s'
ɂ¨¢ďd¡µĂ¢܂·",
-        est "Kattuv vrtus '%-.64s' vtmele '%-.64s'"
-        fre "Duplicata du champ '%-.64s' pour la clef '%-.64s'"
-        ger "Doppelter Eintrag '%-.64s' fr Schlssel '%-.64s'"
-        greek "  '%-.64s'    '%-.64s'"
-        hun "Duplikalt bejegyzes '%-.64s' a '%-.64s' kulcs szerint."
-        ita "Valore duplicato '%-.64s' per la chiave '%-.64s'"
-        jpn "'%-.64s' ¤ key '%-.64s'
¤ˤª¤¤¤ƽʣ¤·¤Ƥ¤¤ޤ¹"
-        kor "ߺ¹µ Է °ª '%-.64s': key '%-.64s'"
-        nor "Like verdier '%-.64s' for nkkel '%-.64s'"
-        norwegian-ny "Like verdiar '%-.64s' for nykkel '%-.64s'"
-        pol "Powtrzone wyst?pienie '%-.64s' dla klucza '%-.64s'"
-        por "Entrada '%-.64s' duplicada para a chave '%-.64s'"
-        rum "Cimpul '%-.64s' e duplicat pentru cheia '%-.64s'"
-        rus "  '%-.64s'   '%-.64s'"
-        serbian "Dupliran unos '%-.64s' za klju '%-.64s'"
-        slo "Opakovan kµ '%-.64s' (slo kµa '%-.64s')"
-        spa "Entrada duplicada '%-.64s' para la clave '%-.64s'"
-        swe "Dubbel nyckel '%-.64s' fr nyckel '%-.64s'"
-        ukr "  '%-.64s'   '%-.64s'"
+	cze "Zvojen-B kl '%-.64s' (slo kle %d)"
+	dan "Ens vrdier '%-.64s' for indeks %d"
+	nla "Dubbele ingang '%-.64s' voor zoeksleutel %d"
+	eng "Duplicate entry '%-.64s' for key %d"
+	jps "'%-.64s'  key %d ɂ¨¢ďd¡µĂ¢܂·",
+	est "Kattuv vrtus '%-.64s' vtmele %d"
+	fre "Duplicata du champ '%-.64s' pour la clef %d"
+	ger "Doppelter Eintrag '%-.64s' fr Schlssel %d"
+	greek "  '%-.64s'    %d"
+	hun "Duplikalt bejegyzes '%-.64s' a %d kulcs szerint."
+	ita "Valore duplicato '%-.64s' per la chiave %d"
+	jpn "'%-.64s' ¤ key %d
¤ˤª¤¤¤ƽʣ¤·¤Ƥ¤¤ޤ¹"
+	kor "ߺ¹µ Է °ª '%-.64s': key %d"
+	nor "Like verdier '%-.64s' for nkkel %d"
+	norwegian-ny "Like verdiar '%-.64s' for nykkel %d"
+	pol "Powtrzone wyst?pienie '%-.64s' dla klucza %d"
+	por "Entrada '%-.64s' duplicada para a chave %d"
+	rum "Cimpul '%-.64s' e duplicat pentru cheia %d"
+	rus "  '%-.64s'   %d"
+	serbian "Dupliran unos '%-.64s' za klju '%d'"
+	slo "Opakovan kµ '%-.64s' (slo kµa %d)"
+	spa "Entrada duplicada '%-.64s' para la clave %d"
+	swe "Dubbel nyckel '%-.64s' fr nyckel %d"
+	ukr "  '%-.64s'   %d"
 ER_WRONG_FIELD_SPEC 42000 S1009
         cze "Chybn-B specifikace sloupce '%-.64s'"
         dan "Forkert kolonnespecifikaton for felt '%-.64s'"
@@ -6025,6 +6025,31 @@
 ER_NATIVE_FCT_NAME_COLLISION
         eng "This function '%-.64s' has the same name as a native function"
         ger "Die Funktion '%-.64s' hat denselben Namen wie eine native Funktion"
+ER_DUP_ENTRY_WITH_KEY_NAME 23000 S1009
+        cze "Zvojen-B kl '%-.64s' (slo kle '%-.64s')"
+        dan "Ens vrdier '%-.64s' for indeks '%-.64s'"
+        nla "Dubbele ingang '%-.64s' voor zoeksleutel '%-.64s'"
+        eng "Duplicate entry '%-.64s' for key '%-.64s'"
+        jps "'%-.64s'  key '%-.64s'
ɂ¨¢ďd¡µĂ¢܂·",
+        est "Kattuv vrtus '%-.64s' vtmele '%-.64s'"
+        fre "Duplicata du champ '%-.64s' pour la clef '%-.64s'"
+        ger "Doppelter Eintrag '%-.64s' fr Schlssel '%-.64s'"
+        greek "  '%-.64s'    '%-.64s'"
+        hun "Duplikalt bejegyzes '%-.64s' a '%-.64s' kulcs szerint."
+        ita "Valore duplicato '%-.64s' per la chiave '%-.64s'"
+        jpn "'%-.64s' ¤ key '%-.64s'
¤ˤª¤¤¤ƽʣ¤·¤Ƥ¤¤ޤ¹"
+        kor "ߺ¹µ Է °ª '%-.64s': key '%-.64s'"
+        nor "Like verdier '%-.64s' for nkkel '%-.64s'"
+        norwegian-ny "Like verdiar '%-.64s' for nykkel '%-.64s'"
+        pol "Powtrzone wyst?pienie '%-.64s' dla klucza '%-.64s'"
+        por "Entrada '%-.64s' duplicada para a chave '%-.64s'"
+        rum "Cimpul '%-.64s' e duplicat pentru cheia '%-.64s'"
+        rus "  '%-.64s'   '%-.64s'"
+        serbian "Dupliran unos '%-.64s' za klju '%-.64s'"
+        slo "Opakovan kµ '%-.64s' (slo kµa '%-.64s')"
+        spa "Entrada duplicada '%-.64s' para la clave '%-.64s'"
+        swe "Dubbel nyckel '%-.64s' fr nyckel '%-.64s'"
+        ukr "  '%-.64s'   '%-.64s'"
 ER_BINLOG_PURGE_EMFILE
         eng "Too many files opened, please execute the command again"
         ger "Zu viele offene Dateien, bitte fhren Sie den Befehl noch einmal aus"

--- 1.102/mysql-test/t/ctype_utf8.test	2006-11-20 15:59:21 +02:00
+++ 1.103/mysql-test/t/ctype_utf8.test	2007-01-22 19:08:44 +02:00
@@ -230,9 +230,9 @@
 create table t1 (c varchar(30) character set utf8, unique(c(10)));
 insert into t1 values ('1'),('2'),('3'),('x'),('y'),('z');
 insert into t1 values ('aaaaaaaaaa');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('aaaaaaaaaaa');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('aaaaaaaaaaaa');
 insert into t1 values (repeat('b',20));
 select c c1 from t1 where c='1';
@@ -254,9 +254,9 @@
 --enable_warnings
 insert into t1 values ('1'),('2'),('3'),('x'),('y'),('z');
 insert into t1 values ('aaaaaaaaaa');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('aaaaaaaaaaa');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('aaaaaaaaaaaa');
 insert into t1 values (repeat('b',20));
 select c c1 from t1 where c='1';
@@ -276,23 +276,23 @@
 insert into t1 values ('1'),('2'),('3'),('4'),('x'),('y'),('z');
 insert into t1 values ('a');
 insert into t1 values ('aa');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('aaa');
 insert into t1 values ('b');
 insert into t1 values ('bb');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('bbb');
 insert into t1 values ('а');
 insert into t1 values ('аа');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('ааа');
 insert into t1 values ('б');
 insert into t1 values ('бб');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('ббб');
 insert into t1 values ('ꪪ');
 insert into t1 values ('ꪪꪪ');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('ꪪꪪꪪ');
 drop table t1;
 #
@@ -305,23 +305,23 @@
 insert into t1 values ('1'),('2'),('3'),('4'),('x'),('y'),('z');
 insert into t1 values ('a');
 insert into t1 values ('aa');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('aaa');
 insert into t1 values ('b');
 insert into t1 values ('bb');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('bbb');
 insert into t1 values ('а');
 insert into t1 values ('аа');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('ааа');
 insert into t1 values ('б');
 insert into t1 values ('бб');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('ббб');
 insert into t1 values ('ꪪ');
 insert into t1 values ('ꪪꪪ');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('ꪪꪪꪪ');
 drop table t1;
 #
@@ -334,14 +334,14 @@
 ) engine=heap;
 show create table t1;
 insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('aa');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('aaa');
 insert into t1 values ('б');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('бб');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('ббб');
 select c as c_all from t1 order by c;
 select c as c_a from t1 where c='a';
@@ -358,14 +358,14 @@
 ) engine=heap;
 show create table t1;
 insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('aa');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('aaa');
 insert into t1 values ('б');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('бб');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('ббб');
 select c as c_all from t1 order by c;
 select c as c_a from t1 where c='a';
@@ -383,14 +383,14 @@
 ) engine=innodb;
 --enable_warnings
 insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('aa');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('aaa');
 insert into t1 values ('б');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('бб');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('ббб');
 select c as c_all from t1 order by c;
 select c as c_a from t1 where c='a';
@@ -404,9 +404,9 @@
 create table t1 (c varchar(30) character set utf8 collate utf8_bin, unique(c(10)));
 insert into t1 values ('1'),('2'),('3'),('x'),('y'),('z');
 insert into t1 values ('aaaaaaaaaa');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('aaaaaaaaaaa');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('aaaaaaaaaaaa');
 insert into t1 values (repeat('b',20));
 select c c1 from t1 where c='1';
@@ -427,23 +427,23 @@
 insert into t1 values ('1'),('2'),('3'),('4'),('x'),('y'),('z');
 insert into t1 values ('a');
 insert into t1 values ('aa');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('aaa');
 insert into t1 values ('b');
 insert into t1 values ('bb');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('bbb');
 insert into t1 values ('а');
 insert into t1 values ('аа');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('ааа');
 insert into t1 values ('б');
 insert into t1 values ('бб');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('ббб');
 insert into t1 values ('ꪪ');
 insert into t1 values ('ꪪꪪ');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('ꪪꪪꪪ');
 drop table t1;
 
@@ -457,14 +457,14 @@
 ) engine=heap;
 show create table t1;
 insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('aa');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('aaa');
 insert into t1 values ('б');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('бб');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('ббб');
 select c as c_all from t1 order by c;
 select c as c_a from t1 where c='a';
@@ -481,14 +481,14 @@
 ) engine=heap;
 show create table t1;
 insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('aa');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('aaa');
 insert into t1 values ('б');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('бб');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('ббб');
 select c as c_all from t1 order by c;
 select c as c_a from t1 where c='a';
@@ -506,14 +506,14 @@
 ) engine=innodb;
 --enable_warnings
 insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('aa');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('aaa');
 insert into t1 values ('б');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('бб');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('ббб');
 select c as c_all from t1 order by c;
 select c as c_a from t1 where c='a';

--- 1.4/mysql-test/t/type_binary.test	2007-01-09 21:34:11 +02:00
+++ 1.5/mysql-test/t/type_binary.test	2007-01-22 19:08:44 +02:00
@@ -31,7 +31,7 @@
 create table t1 (s1 binary(2) primary key);
 insert into t1 values (0x01);
 insert into t1 values (0x0120);
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values (0x0100);
 select hex(s1) from t1 order by s1;
 # check index search

--- 1.197/mysql-test/r/view.result	2007-01-18 16:53:36 +02:00
+++ 1.198/mysql-test/r/view.result	2007-01-22 19:08:44 +02:00
@@ -2684,10 +2684,12 @@
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1`
AS select (year(now()) - year(`t1`.`DOB`)) AS `Age` from `t1` having (`Age` < 75)
+set timestamp=1136066400;
 SELECT (year(now())-year(DOB)) AS Age FROM t1 HAVING Age < 75;
 Age
 42
 38
+set timestamp=1136066400;
 SELECT * FROM v1;
 Age
 42

--- 1.177/mysql-test/t/view.test	2007-01-18 16:53:36 +02:00
+++ 1.178/mysql-test/t/view.test	2007-01-22 19:08:44 +02:00
@@ -2553,7 +2553,9 @@
     FROM t1 HAVING Age < 75; 
 SHOW CREATE VIEW v1;           
 
+set timestamp=1136066400;
 SELECT (year(now())-year(DOB)) AS Age FROM t1 HAVING Age < 75;
+set timestamp=1136066400;
 SELECT * FROM v1;
 
 DROP VIEW v1;

--- 1.32/mysql-test/r/rpl_sp.result	2007-01-12 13:24:31 +02:00
+++ 1.33/mysql-test/r/rpl_sp.result	2007-01-22 19:18:19 +02:00
@@ -107,7 +107,7 @@
 ERROR 23000: Duplicate entry '20' for key 'a'
 show warnings;
 Level	Code	Message
-Error	1062	Duplicate entry '20' for key 'a'
+Error	1579	Duplicate entry '20' for key 'a'
 select * from t2;
 a
 20
@@ -241,7 +241,7 @@
 end|
 do fn1(100);
 Warnings:
-Error	1062	Duplicate entry '100' for key 'a'
+Error	1579	Duplicate entry '100' for key 'a'
 select fn1(20);
 ERROR 23000: Duplicate entry '20' for key 'a'
 select * from t2;

--- 1.29/mysql-test/t/rpl_sp.test	2007-01-09 00:52:19 +02:00
+++ 1.30/mysql-test/t/rpl_sp.test	2007-01-22 19:08:44 +02:00
@@ -153,7 +153,7 @@
 
 delimiter ;|
 
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 call foo4();
 show warnings;
 
@@ -308,7 +308,7 @@
 
 do fn1(100);
 
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 select fn1(20);
 
 select * from t2;

--- 1.35/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test	2007-01-19 12:10:13
+02:00
+++ 1.36/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test	2007-01-22 19:08:43
+02:00
@@ -273,12 +273,12 @@
 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 @@
 
 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 @@
 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;

--- 1.4/mysql-test/extra/rpl_tests/rpl_row_basic.test	2006-12-07 16:18:27 +02:00
+++ 1.5/mysql-test/extra/rpl_tests/rpl_row_basic.test	2007-01-22 19:08:43 +02:00
@@ -195,11 +195,11 @@
 
 # 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;
 

--- 1.8/mysql-test/t/rpl_row_create_table.test	2006-12-21 10:28:56 +02:00
+++ 1.9/mysql-test/t/rpl_row_create_table.test	2007-01-22 19:08:44 +02:00
@@ -67,7 +67,7 @@
 
 connection master;
 # Test for erroneous constructions
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 CREATE TABLE t7 (UNIQUE(b)) SELECT a,b FROM tt3;
 # Shouldn't be written to the binary log
 --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
@@ -75,7 +75,7 @@
 
 # Test that INSERT-SELECT works the same way as for SBR.
 CREATE TABLE t7 (a INT, b INT UNIQUE);
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 INSERT INTO t7 SELECT a,b FROM tt3;
 SELECT * FROM t7 ORDER BY a,b;
 # Should be written to the binary log

--- 1.25/mysql-test/t/ndb_index_unique.test	2006-12-07 17:03:25 +02:00
+++ 1.26/mysql-test/t/ndb_index_unique.test	2007-01-22 19:08:44 +02:00
@@ -22,7 +22,7 @@
 insert into t1 values(7,8,3);
 select * from t1 where b = 4 order by a;
 
--- error 1062
+-- error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values(8, 2, 3);
 select * from t1 order by a;
 delete from t1 where a = 1;
@@ -59,7 +59,7 @@
 select * from t1 use index (bc) where b IS NULL and c = 2 order by a;
 select * from t1 use index (bc) where b < 4 order by a;
 select * from t1 use index (bc) where b IS NOT NULL order by a;
--- error 1062
+-- error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values(5,1,1);
 drop table t1;
 
@@ -82,7 +82,7 @@
 insert into t2 values(7,8,3);
 select * from t2 where b = 4 order by a;
 
--- error 1062
+-- error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t2 values(8, 2, 3);
 select * from t2 order by a;
 delete from t2 where a = 1;
@@ -154,7 +154,7 @@
 
 select * from t1 order by pk;
 
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values (5,0);
 select * from t1 order by pk;
 delete from t1 where a = 0;
@@ -173,7 +173,7 @@
 
 select * from t2 order by pk;
 
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t2 values(2,3,19,'abc');
 select * from t2 order by pk;
 delete from t2 where c IS NOT NULL;
@@ -342,7 +342,7 @@
 engine=ndb charset=utf8;
 
 insert into t1 values (1, repeat(_utf8 0xe288ab6474, 200));
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values (2, repeat(_utf8 0xe288ab6474, 200));
 select a, sha1(b) from t1;
 

--- 1.16/mysql-test/t/delayed.test	2006-11-13 18:08:23 +02:00
+++ 1.17/mysql-test/t/delayed.test	2007-01-22 19:08:44 +02:00
@@ -184,7 +184,7 @@
 INSERT INTO t1 VALUES(NULL, 81), (NULL, 82), (NULL, 83);
 # Create a duplicate value.
 SET insert_id= 114;
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 INSERT INTO t1 VALUES(NULL, 91);
 INSERT INTO t1 VALUES           (NULL, 92), (NULL, 93);
 # Check what we have now

--- 1.153/mysql-test/t/innodb.test	2006-12-28 07:44:55 +02:00
+++ 1.154/mysql-test/t/innodb.test	2007-01-22 19:08:44 +02:00
@@ -53,7 +53,7 @@
 update t1 set parent_id=parent_id+100;
 select * from t1 where parent_id=102;
 update t1 set id=id+1000;
--- error 1062,1022
+-- error ER_DUP_ENTRY_WITH_KEY_NAME,1022
 update t1 set id=1024 where id=1009; 
 select * from t1;
 update ignore t1 set id=id+1; # This will change all rows
@@ -134,13 +134,13 @@
 select n, "after commit" from t1;
 commit;
 insert into t1 values (5);
--- error 1062
+-- error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values (4);
 commit;
 select n, "after commit" from t1;
 set autocommit=1;
 insert into t1 values (6);
--- error 1062
+-- error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values (4);
 select n from t1;
 set autocommit=0;
@@ -214,7 +214,7 @@
 
 CREATE TABLE t1 (id char(8) not null primary key, val int not null) engine=innodb;
 insert into t1 values ('pippo', 12);
--- error 1062
+-- error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values ('pippo', 12); # Gives error
 delete from t1;
 delete from t1 where id = 'pippo';
@@ -342,9 +342,9 @@
 
 insert into t1 (ggid,passwd) values ('test1','xxx');
 insert into t1 (ggid,passwd) values ('test2','yyy');
--- error 1062
+-- error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 (ggid,passwd) values ('test2','this will fail');
--- error 1062
+-- error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 (ggid,id) values ('this will fail',1);
 
 select * from t1 where ggid='test1';
@@ -353,7 +353,7 @@
 
 replace into t1 (ggid,id) values ('this will work',1);
 replace into t1 (ggid,passwd) values ('test2','this will work');
--- error 1062
+-- error ER_DUP_ENTRY_WITH_KEY_NAME
 update t1 set id=100,ggid='test2' where id=1;
 select * from t1;
 select * from t1 where id=1;
@@ -524,7 +524,7 @@
 create table t1 (id int NOT NULL,id2 int NOT NULL,id3 int NOT NULL,dummy1
char(30),primary key (id,id2),index index_id3 (id3)) engine=innodb;
 insert into t1 values (0,0,0,'ABCDEFGHIJ'),(2,2,2,'BCDEFGHIJK'),(1,1,1,'CDEFGHIJKL');
 LOCK TABLES t1 WRITE;
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values (99,1,2,'D'),(1,1,2,'D');
 select id from t1;
 select id from t1;
@@ -535,7 +535,7 @@
 insert into t1 values (0,0,0,'ABCDEFGHIJ'),(2,2,2,'BCDEFGHIJK'),(1,1,1,'CDEFGHIJKL');
 LOCK TABLES t1 WRITE;
 begin;
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 values (99,1,2,'D'),(1,1,2,'D');
 select id from t1;
 insert ignore into t1 values (100,1,2,'D'),(1,1,99,'D');
@@ -1408,7 +1408,7 @@
 key (rowid), unique(val)) engine=innodb;
 replace into t1 (val) values ('1'),('2');
 replace into t1 (val) values ('1'),('2');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 (val) values ('1'),('2');
 select * from t1;
 drop table t1;
@@ -1421,7 +1421,7 @@
 insert into t1 (val) values (1);
 update t1 set a=2 where a=1;
 # We should get the following error because InnoDB does not update the counter
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 (val) values (1);
 select * from t1;
 drop table t1;
@@ -1877,13 +1877,13 @@
 create table t4 (s1 char(2) binary,primary key (s1)) engine=innodb;
 
 insert into t1 values (0x41),(0x4120),(0x4100);
--- error 1062
+-- error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t2 values (0x41),(0x4120),(0x4100);
 insert into t2 values (0x41),(0x4120);
--- error 1062
+-- error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t3 values (0x41),(0x4120),(0x4100);
 insert into t3 values (0x41),(0x4100);
--- error 1062
+-- error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t4 values (0x41),(0x4120),(0x4100);
 insert into t4 values (0x41),(0x4100);
 select hex(s1) from t1;

--- 1.34/mysql-test/t/insert_select.test	2006-11-13 18:06:41 +02:00
+++ 1.35/mysql-test/t/insert_select.test	2007-01-22 19:08:44 +02:00
@@ -10,7 +10,7 @@
 insert into t1 (bandID,payoutID) VALUES
(1,6),(2,6),(3,4),(4,9),(5,10),(6,1),(7,12),(8,12);
 create table t2 (payoutID SMALLINT UNSIGNED NOT NULL PRIMARY KEY);
 insert into t2 (payoutID) SELECT DISTINCT payoutID FROM t1;
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t2 (payoutID) SELECT payoutID+10 FROM t1;
 insert ignore into t2 (payoutID) SELECT payoutID+10 FROM t1;
 select * from t2;
@@ -101,7 +101,7 @@
 create table t2 (a int not null, b char(10));
 insert into t1 values (1,"t1:1"),(3,"t1:3");
 insert into t2 values (2,"t2:2"), (3,"t2:3");
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 select * from t2;
 select * from t1;
 # REPLACE .. SELECT is not yet supported by PS

--- 1.75/mysql-test/t/myisam.test	2007-01-18 17:33:29 +02:00
+++ 1.76/mysql-test/t/myisam.test	2007-01-22 19:08:44 +02:00
@@ -453,9 +453,9 @@
 insert into t1 (b) values ('a'),('b'),('c');
 select concat(b,'.') from t1;
 update t1 set b='b ' where a=2;
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 update t1 set b='b  ' where a > 1;
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 (b) values ('b');
 select * from t1;
 delete from t1 where b='b';

--- 1.13/mysql-test/t/type_varchar.test	2006-12-05 11:19:51 +02:00
+++ 1.14/mysql-test/t/type_varchar.test	2007-01-22 19:08:44 +02:00
@@ -25,7 +25,7 @@
 select binary v='a' from t1;
 select binary v='a ' from t1;
 insert into t1 values('a');
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 alter table t1 add primary key (v);
 drop table t1;
 create table t1 (v varbinary(20));

--- 1.9/mysql-test/t/ndb_update.test	2006-11-30 16:02:06 +02:00
+++ 1.10/mysql-test/t/ndb_update.test	2007-01-22 19:18:19 +02:00
@@ -23,11 +23,11 @@
 select * from t1 order by pk1;
 UPDATE t1 set pk1 = 4 where pk1 = 1;
 select * from t1 order by pk1;
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 UPDATE t1 set pk1 = 4 where pk1 = 2;
 UPDATE IGNORE t1 set pk1 = 4 where pk1 = 2;
 select * from t1 order by pk1;
--- error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 UPDATE t1 set pk1 = 1, c = 2 where pk1 = 4;
 UPDATE IGNORE t1 set pk1 = 1, c = 2 where pk1 = 4;
 select * from t1 order by pk1;

--- 1.245/mysql-test/r/sp.result	2007-01-18 19:38:43 +02:00
+++ 1.246/mysql-test/r/sp.result	2007-01-22 19:08:44 +02:00
@@ -1493,10 +1493,10 @@
 create procedure h_ee()
 deterministic
 begin
-declare continue handler for 1062 -- ER_DUP_ENTRY
+declare continue handler for 1579 -- ER_DUP_ENTRY_WITH_KEY_NAME
 select 'Outer (bad)' as 'h_ee';
 begin
-declare continue handler for 1062 -- ER_DUP_ENTRY
+declare continue handler for 1579 -- 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 1062 -- ER_DUP_ENTRY
+declare continue handler for 1579 -- 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 1062 -- ER_DUP_ENTRY
+declare continue handler for 1579 -- 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 1062 -- ER_DUP_ENTRY
+declare continue handler for 1579 -- 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 1062 -- ER_DUP_ENTRY
+declare continue handler for 1579 -- 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 1062
+declare continue handler for 1579
 select 'Outer' as 'Handler';
 begin
-declare continue handler for 1062
+declare continue handler for 1579
 select 'Inner' as 'Handler';
 insert into t3 values (1);
 end;

--- 1.213/mysql-test/t/sp.test	2007-01-18 19:38:43 +02:00
+++ 1.214/mysql-test/t/sp.test	2007-01-22 19:08:44 +02:00
@@ -1763,11 +1763,11 @@
 create procedure h_ee()
     deterministic
 begin
-  declare continue handler for 1062 -- ER_DUP_ENTRY
+  declare continue handler for 1579 -- ER_DUP_ENTRY_WITH_KEY_NAME
     select 'Outer (bad)' as 'h_ee';
 
   begin
-    declare continue handler for 1062 -- ER_DUP_ENTRY
+    declare continue handler for 1579 -- 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 1062 -- ER_DUP_ENTRY
+  declare continue handler for 1579 -- 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 1062 -- ER_DUP_ENTRY
+  declare continue handler for 1579 -- 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 1062 -- ER_DUP_ENTRY
+    declare continue handler for 1579 -- 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 1062 -- ER_DUP_ENTRY
+    declare continue handler for 1579 -- ER_DUP_ENTRY_WITH_KEY_NAME
       select 'Inner (good)' as 'h_xe';
 
     insert into t3 values (1);
@@ -4507,7 +4507,7 @@
    select bug12379();
 end|
 
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 select bug12379()|
 select 1|
 # statement-based binlogging will show warning which row-based won't;
@@ -4518,7 +4518,7 @@
 call bug12379_2()|
 --enable_warnings
 select 3|
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 call bug12379_3()|
 select 4|
 
@@ -4600,7 +4600,7 @@
 
 call bug6127()|
 select * from t3|
---error ER_DUP_ENTRY
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 call bug6127()|
 select * from t3|
 set sql_mode=@sm|
@@ -5528,11 +5528,11 @@
 create procedure bug15011()
   deterministic
 begin
-  declare continue handler for 1062
+  declare continue handler for 1579
     select 'Outer' as 'Handler';
 
   begin
-    declare continue handler for 1062
+    declare continue handler for 1579
       select 'Inner' as 'Handler';
 
     insert into t3 values (1);

--- 1.66/BUILD/SETUP.sh	2007-01-07 19:21:39 +02:00
+++ 1.67/BUILD/SETUP.sh	2007-01-22 19:08:43 +02:00
@@ -92,9 +92,9 @@
 # Both C and C++ warnings
   warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W"
   warnings="$warnings -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare"
-  warnings="$warnings -Wwrite-strings"
+  warnings="$warnings -Wwrite-strings -Wunused-function -Wunused-label -Wunused-value
-Wunused-variable -Wshadow"
 # C warnings
-  c_warnings="$warnings -Wunused"
+  c_warnings="$warnings -Wunused-parameter"
 # C++ warnings
   cxx_warnings="$warnings -Woverloaded-virtual -Wsign-promo -Wreorder"
   cxx_warnings="$warnings -Wctor-dtor-privacy -Wnon-virtual-dtor"
Thread
• bk commit into 5.1 tree (monty:1.2423)monty22 Jan