Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1

into eagle.mysql.r18.ru:/home/vva/work/BUG_1427/mysql-4.1

include/mysqld_error.h

@@ -307,4 +307,5 @@
 #define ER_NON_UPDATABLE_TABLE 1288
 #define ER_FEATURE_DISABLED 1289
 #define ER_OPTION_PREVENTS_STATEMENT 1290
-#define ER_ERROR_MESSAGES 291
+#define ER_DUPLICATED_VALUE_IN_TYPE 1291
+#define ER_ERROR_MESSAGES 292

mysql-test/r/create.result

@@ -456,6 +456,20 @@ Field	Type	Null	Key	Default	Extra
 name	varchar(10)	YES		NULL	
 age	smallint(6)	YES		-1	
 drop table t1, t2;
+create table t1(cenum enum('a'), cset set('b'));
+create table t2(cenum enum('a','a'), cset set('b','b'));
+Warnings:
+Error	1291	Column 'cenum' has duplicated value 'a' in ENUM
+Error	1291	Column 'cset' has duplicated value 'b' in SET
+create table t3(cenum enum('a','A','a','c','c'), cset set('b','B','b','d','d'));
+Warnings:
+Error	1291	Column 'cenum' has duplicated value 'a' in ENUM
+Error	1291	Column 'cenum' has duplicated value 'A' in ENUM
+Error	1291	Column 'cenum' has duplicated value 'c' in ENUM
+Error	1291	Column 'cset' has duplicated value 'b' in SET
+Error	1291	Column 'cset' has duplicated value 'B' in SET
+Error	1291	Column 'cset' has duplicated value 'd' in SET
+drop table t1, t2, t3;
 create database test_$1;
 use test_$1;
 select database();

mysql-test/t/create.test

@@ -346,6 +346,15 @@ create table t2(name varchar(10), age smallint default - 1);
 describe t2;
 drop table t1, t2;
 
+#
+# test for bug #1427 "enum allows duplicate values in the list"
+#
+
+create table t1(cenum enum('a'), cset set('b'));
+create table t2(cenum enum('a','a'), cset set('b','b'));
+create table t3(cenum enum('a','A','a','c','c'), cset set('b','B','b','d','d'));
+drop table t1, t2, t3;
+
 #
 # Bug #1209
 #

sql/share/czech/errmsg.txt

@@ -303,3 +303,4 @@ character-set=latin2
 "The target table %-.100s of the %s is not updatable",
 "The '%s' feature was disabled; you need MySQL built with '%s' to have it working",
 "The MySQL server is running with the %s option so it cannot execute this statement",
+"Column '%-.100s' has duplicated value '%-.64s' in %s"

sql/share/danish/errmsg.txt

@@ -297,3 +297,4 @@ character-set=latin1
 "The target table %-.100s of the %s is not updateable",
 "The '%s' feature was disabled; you need MySQL built with '%s' to have it working",
 "The MySQL server is running with the %s option so it cannot execute this statement",
+"Column '%-.100s' has duplicated value '%-.64s' in %s"

sql/share/dutch/errmsg.txt

@@ -305,3 +305,4 @@ character-set=latin1
 "The target table %-.100s of the %s is not updateable",
 "The '%s' feature was disabled; you need MySQL built with '%s' to have it working",
 "The MySQL server is running with the %s option so it cannot execute this statement",
+"Column '%-.100s' has duplicated value '%-.64s' in %s"

sql/share/english/errmsg.txt

@@ -294,3 +294,4 @@ character-set=latin1
 "The target table %-.100s of the %s is not updatable",
 "The '%s' feature was disabled; you need MySQL built with '%s' to have it working",
 "The MySQL server is running with the %s option so it cannot execute this statement",
+"Column '%-.100s' has duplicated value '%-.64s' in %s"

sql/share/estonian/errmsg.txt

@@ -299,3 +299,4 @@ character-set=latin7
 "The target table %-.100s of the %s is not updateable",
 "The '%s' feature was disabled; you need MySQL built with '%s' to have it working",
 "The MySQL server is running with the %s option so it cannot execute this statement",
+"Column '%-.100s' has duplicated value '%-.64s' in %s"

sql/share/french/errmsg.txt

@@ -294,3 +294,4 @@ character-set=latin1
 "The target table %-.100s of the %s is not updateable",
 "The '%s' feature was disabled; you need MySQL built with '%s' to have it working",
 "The MySQL server is running with the %s option so it cannot execute this statement",
+"Column '%-.100s' has duplicated value '%-.64s' in %s"

sql/share/german/errmsg.txt

@@ -306,3 +306,4 @@ character-set=latin1
 "The target table %-.100s of the %s is not updateable",
 "The '%s' feature was disabled; you need MySQL built with '%s' to have it working",
 "The MySQL server is running with the %s option so it cannot execute this statement",
+"Column '%-.100s' has duplicated value '%-.64s' in %s"

sql/share/greek/errmsg.txt

@@ -294,3 +294,4 @@ character-set=greek
 "The target table %-.100s of the %s is not updateable",
 "The '%s' feature was disabled; you need MySQL built with '%s' to have it working",
 "The MySQL server is running with the %s option so it cannot execute this statement",
+"Column '%-.100s' has duplicated value '%-.64s' in %s"

sql/share/hungarian/errmsg.txt

@@ -296,3 +296,4 @@ character-set=latin2
 "The target table %-.100s of the %s is not updateable",
 "The '%s' feature was disabled; you need MySQL built with '%s' to have it working",
 "The MySQL server is running with the %s option so it cannot execute this statement",
+"Column '%-.100s' has duplicated value '%-.64s' in %s"

sql/share/italian/errmsg.txt

@@ -294,3 +294,4 @@ character-set=latin1
 "The target table %-.100s of the %s is not updateable",
 "The '%s' feature was disabled; you need MySQL built with '%s' to have it working",
 "The MySQL server is running with the %s option so it cannot execute this statement",
+"Column '%-.100s' has duplicated value '%-.64s' in %s"

sql/share/japanese/errmsg.txt

@@ -296,3 +296,4 @@ character-set=ujis
 "The target table %-.100s of the %s is not updateable",
 "The '%s' feature was disabled; you need MySQL built with '%s' to have it working",
 "The MySQL server is running with the %s option so it cannot execute this statement",
+"Column '%-.100s' has duplicated value '%-.64s' in %s"

sql/share/korean/errmsg.txt

@@ -294,3 +294,4 @@ character-set=euckr
 "The target table %-.100s of the %s is not updateable",
 "The '%s' feature was disabled; you need MySQL built with '%s' to have it working",
 "The MySQL server is running with the %s option so it cannot execute this statement",
+"Column '%-.100s' has duplicated value '%-.64s' in %s"

sql/share/norwegian-ny/errmsg.txt

@@ -296,3 +296,4 @@ character-set=latin1
 "The target table %-.100s of the %s is not updateable",
 "The '%s' feature was disabled; you need MySQL built with '%s' to have it working",
 "The MySQL server is running with the %s option so it cannot execute this statement",
+"Column '%-.100s' has duplicated value '%-.64s' in %s"

sql/share/norwegian/errmsg.txt

@@ -296,3 +296,4 @@ character-set=latin1
 "The target table %-.100s of the %s is not updateable",
 "The '%s' feature was disabled; you need MySQL built with '%s' to have it working",
 "The MySQL server is running with the %s option so it cannot execute this statement",
+"Column '%-.100s' has duplicated value '%-.64s' in %s"

sql/share/polish/errmsg.txt

@@ -298,3 +298,4 @@ character-set=latin2
 "The target table %-.100s of the %s is not updateable",
 "The '%s' feature was disabled; you need MySQL built with '%s' to have it working",
 "The MySQL server is running with the %s option so it cannot execute this statement",
+"Column '%-.100s' has duplicated value '%-.64s' in %s"

sql/share/portuguese/errmsg.txt

@@ -295,3 +295,4 @@ character-set=latin1
 "The target table %-.100s of the %s is not updateable",
 "The '%s' feature was disabled; you need MySQL built with '%s' to have it working",
 "The MySQL server is running with the %s option so it cannot execute this statement",
+"Column '%-.100s' has duplicated value '%-.64s' in %s"

sql/share/romanian/errmsg.txt

@@ -298,3 +298,4 @@ character-set=latin2
 "The target table %-.100s of the %s is not updateable",
 "The '%s' feature was disabled; you need MySQL built with '%s' to have it working",
 "The MySQL server is running with the %s option so it cannot execute this statement",
+"Column '%-.100s' has duplicated value '%-.64s' in %s"

sql/share/russian/errmsg.txt

@@ -296,3 +296,4 @@ character-set=koi8r
 " %-.100s  %s   ",
 "The '%s' feature was disabled; you need MySQL built with '%s' to have it working",
 "The MySQL server is running with the %s option so it cannot execute this statement",
+"Column '%-.100s' has duplicated value '%-.64s' in %s"

sql/share/serbian/errmsg.txt

@@ -288,3 +288,4 @@ character-set=cp1250
 "The target table %-.100s of the %s is not updatable",
 "The '%s' feature was disabled; you need MySQL built with '%s' to have it working"
 "The MySQL server is running with the %s option so it cannot execute this statement"
+"Column '%-.100s' has duplicated value '%-.64s' in %s"

sql/share/slovak/errmsg.txt

@@ -302,3 +302,4 @@ character-set=latin2
 "The target table %-.100s of the %s is not updateable",
 "The '%s' feature was disabled; you need MySQL built with '%s' to have it working",
 "The MySQL server is running with the %s option so it cannot execute this statement",
+"Column '%-.100s' has duplicated value '%-.64s' in %s"

sql/share/spanish/errmsg.txt

@@ -296,3 +296,4 @@ character-set=latin1
 "The target table %-.100s of the %s is not updateable",
 "The '%s' feature was disabled; you need MySQL built with '%s' to have it working",
 "The MySQL server is running with the %s option so it cannot execute this statement",
+"Column '%-.100s' has duplicated value '%-.64s' in %s"

sql/share/swedish/errmsg.txt

@@ -294,3 +294,4 @@ character-set=latin1
 "'%s' är inte aktiverad; För att aktivera detta måste du bygga om MySQL med '%s' definerad",
 "MySQL är started i --skip-grant-tables mod. Pga av detta kan du inte använda detta program",
 
+"Column '%-.100s' has duplicated value '%-.64s' in %s"

sql/share/ukrainian/errmsg.txt

@@ -299,3 +299,4 @@ character-set=koi8u
 " %-.100s  %s   ",
 "The '%s' feature was disabled; you need MySQL built with '%s' to have it working",
 "The MySQL server is running with the %s option so it cannot execute this statement",
+"Column '%-.100s' has duplicated value '%-.64s' in %s"

sql/sql_table.cc

@@ -342,6 +342,50 @@ static int sort_keys(KEY *a, KEY *b)
 	  0);
 }
 
+/*
+  Check TYPELIB (set or enum) for duplicates
+  
+  SYNOPSIS
+    check_duplicates_in_interval()
+    set_or_name   "SET" or "ENUM" string for warning message
+    name          name of the checked column
+    typelib       list of values for the column
+
+  DESCRIPTION
+    This function prints an warning for each value in list 
+    which has some duplicates on its right
+
+  RETURN VALUES
+    void
+*/
+
+void check_duplicates_in_interval(const char *set_or_name,
+				  const char *name, TYPELIB *typelib)
+{
+  unsigned int old_count= typelib->count;
+  const char **old_type_names= typelib->type_names;
+
+  if (typelib->count <= 1)
+    return;
+
+  old_count= typelib->count;
+  old_type_names= typelib->type_names;
+  const char **cur_value= typelib->type_names;
+  for ( ; typelib->count > 1; cur_value++)
+  {
+    typelib->type_names++;
+    typelib->count--;
+    if (find_type((char*)*cur_value,typelib,1))
+    {
+      push_warning_printf(current_thd,MYSQL_ERROR::WARN_LEVEL_ERROR,
+			  ER_DUPLICATED_VALUE_IN_TYPE,
+			  ER(ER_DUPLICATED_VALUE_IN_TYPE),
+			  name,*cur_value,set_or_name);
+    }
+  }
+  typelib->count= old_count;
+  typelib->type_names= old_type_names;
+}
 
 /*
   Create a table
@@ -546,6 +590,8 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
       if (sql_field->charset->state & MY_CS_BINSORT)
 	sql_field->pack_flag|=FIELDFLAG_BINARY;
       sql_field->unireg_check=Field::INTERVAL_FIELD;
+      check_duplicates_in_interval("ENUM",sql_field->field_name,
+				   sql_field->interval);
       break;
     case FIELD_TYPE_SET:
       sql_field->pack_flag=pack_length_to_packflag(sql_field->pack_length) |
@@ -553,6 +599,8 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
       if (sql_field->charset->state & MY_CS_BINSORT)
 	sql_field->pack_flag|=FIELDFLAG_BINARY;
       sql_field->unireg_check=Field::BIT_FIELD;
+      check_duplicates_in_interval("SET",sql_field->field_name,
+				   sql_field->interval);
       break;
     case FIELD_TYPE_DATE:			// Rest of string types
     case FIELD_TYPE_NEWDATE: