merged

BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
  Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/share/russian/errmsg.txt:
  merged (partially translated)

include/mysqld_error.h

@@ -222,4 +222,5 @@
 #define ER_CANT_UPDATE_WITH_READLOCK 1219
 #define ER_MIXING_NOT_ALLOWED 1220
 #define ER_DUP_ARGUMENT 1221
-#define ER_ERROR_MESSAGES 222
+#define ER_TABLE_CANT_HANDLE_FULLTEXT 1222
+#define ER_ERROR_MESSAGES 223

sql/ha_berkeley.h

@@ -90,7 +90,7 @@ class ha_berkeley: public handler
 		    HA_REC_NOT_IN_SEQ |
 		    HA_KEYPOS_TO_RNDPOS | HA_READ_ORDER | HA_LASTKEY_ORDER |
 		    HA_LONGLONG_KEYS | HA_NULL_KEY | HA_HAVE_KEY_READ_ONLY |
-		    HA_BLOB_KEY | HA_NOT_EXACT_COUNT |
+		    HA_BLOB_KEY | HA_NOT_EXACT_COUNT | HA_NO_FULLTEXT_KEY |
 		    HA_PRIMARY_KEY_IN_READ_INDEX | HA_DROP_BEFORE_CREATE |
 		    HA_AUTO_PART_KEY),
     changed_rows(0),last_dup_key((uint) -1),version(0),using_ignore(0)

sql/ha_heap.h

@@ -35,7 +35,7 @@ class ha_heap: public handler
   ulong option_flag() const
   { return (HA_READ_RND_SAME | HA_NO_INDEX | HA_ONLY_WHOLE_INDEX |
 	    HA_WRONG_ASCII_ORDER | HA_KEYPOS_TO_RNDPOS | HA_NO_BLOBS |
-	    HA_REC_NOT_IN_SEQ); }
+	    HA_REC_NOT_IN_SEQ | HA_NO_FULLTEXT_KEY); }
   uint max_record_length() const { return HA_MAX_REC_LENGTH; }
   uint max_keys()          const { return MAX_KEY; }
   uint max_key_parts()     const { return MAX_REF_PARTS; }

sql/ha_innobase.h

@@ -79,7 +79,7 @@ class ha_innobase: public handler
 			  HA_KEYPOS_TO_RNDPOS | HA_LASTKEY_ORDER |
 			  HA_HAVE_KEY_READ_ONLY | HA_READ_NOT_EXACT_KEY |
 			  HA_LONGLONG_KEYS | HA_NULL_KEY |
-			  HA_NOT_EXACT_COUNT |
+			  HA_NOT_EXACT_COUNT | HA_NO_FULLTEXT_KEY |
 			  HA_NO_WRITE_DELAYED |
 			  HA_PRIMARY_KEY_IN_READ_INDEX |
 			  HA_DROP_BEFORE_CREATE |

sql/ha_isam.h

@@ -30,11 +30,11 @@ class ha_isam: public handler
 
  public:
   ha_isam(TABLE *table): handler(table), file(0),
-    int_option_flag(HA_READ_NEXT+HA_READ_PREV+HA_READ_RND_SAME+
-		    HA_KEYPOS_TO_RNDPOS+ HA_READ_ORDER+ HA_LASTKEY_ORDER+
-		    HA_HAVE_KEY_READ_ONLY+HA_READ_NOT_EXACT_KEY+
-		    HA_LONGLONG_KEYS+HA_KEY_READ_WRONG_STR + HA_DUPP_POS +
-		    HA_NOT_DELETE_WITH_CACHE)
+    int_option_flag(HA_READ_NEXT | HA_READ_PREV | HA_READ_RND_SAME |
+		    HA_KEYPOS_TO_RNDPOS | HA_READ_ORDER | HA_LASTKEY_ORDER |
+		    HA_HAVE_KEY_READ_ONLY | HA_READ_NOT_EXACT_KEY |
+		    HA_LONGLONG_KEYS | HA_KEY_READ_WRONG_STR | HA_DUPP_POS |
+		    HA_NOT_DELETE_WITH_CACHE | HA_NO_FULLTEXT_KEY)
     {}
   ~ha_isam() {}
   const char *table_type() const { return "ISAM"; }

sql/ha_isammrg.h

@@ -32,7 +32,8 @@ class ha_isammrg: public handler
   ~ha_isammrg() {}
   const char *table_type() const { return "MRG_ISAM"; }
   const char **bas_ext() const;
-  ulong option_flag() const { return HA_READ_RND_SAME+HA_KEYPOS_TO_RNDPOS+HA_REC_NOT_IN_SEQ;}
+  ulong option_flag() const { return HA_READ_RND_SAME | HA_KEYPOS_TO_RNDPOS
+                                   | HA_REC_NOT_IN_SEQ  | HA_NO_FULLTEXT_KEY;}
   uint max_record_length() const { return HA_MAX_REC_LENGTH; }
   uint max_keys()          const { return 0; }
   uint max_key_parts()     const { return 0; }

sql/ha_myisammrg.h

@@ -35,7 +35,7 @@ class ha_myisammrg: public handler
   ulong option_flag() const
     { return (HA_REC_NOT_IN_SEQ | HA_READ_NEXT |
 	      HA_READ_PREV | HA_READ_RND_SAME |
-	      HA_HAVE_KEY_READ_ONLY | 
+	      HA_HAVE_KEY_READ_ONLY | HA_NO_FULLTEXT_KEY |
 	      HA_KEYPOS_TO_RNDPOS | HA_READ_ORDER |
 	      HA_LASTKEY_ORDER | HA_READ_NOT_EXACT_KEY |
 	      HA_LONGLONG_KEYS | HA_NULL_KEY | HA_BLOB_KEY); }

sql/share/czech/errmsg.txt

@@ -232,3 +232,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",

sql/share/danish/errmsg.txt

@@ -226,3 +226,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",

sql/share/dutch/errmsg.txt

@@ -229,3 +229,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",

sql/share/english/errmsg.txt

@@ -223,3 +223,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",

sql/share/estonian/errmsg.txt

@@ -227,3 +227,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",

sql/share/french/errmsg.txt

@@ -223,3 +223,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",

sql/share/german/errmsg.txt

@@ -226,3 +226,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"Der verwendete Tabellentyp unterstützt keine FULLTEXT-Indexe",

sql/share/greek/errmsg.txt

@@ -223,3 +223,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",

sql/share/hungarian/errmsg.txt

@@ -225,3 +225,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",

sql/share/italian/errmsg.txt

@@ -223,3 +223,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",

sql/share/japanese/errmsg.txt

@@ -225,3 +225,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",

sql/share/korean/errmsg.txt

@@ -223,3 +223,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",

sql/share/norwegian-ny/errmsg.txt

@@ -225,3 +225,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",

sql/share/norwegian/errmsg.txt

@@ -225,3 +225,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",

sql/share/polish/errmsg.txt

@@ -227,3 +227,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",

sql/share/portuguese/errmsg.txt

@@ -223,3 +223,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",

sql/share/romanian/errmsg.txt

@@ -227,3 +227,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",

sql/share/russian/errmsg.txt

@@ -208,21 +208,22 @@
 "    master info,  persmissions   master.info",
 "    SLAVE,   ",
 "User %-.64s has already more than 'max_user_connections' active connections",
-"You may only use constant expressions with SET",
+" SET     ",
 "Lock wait timeout exceeded",
 "The total number of locks exceeds the lock table size",
 "Update locks cannot be acquired during a READ UNCOMMITTED transaction",
 "DROP DATABASE not allowed while thread is holding global read lock",
 "CREATE DATABASE not allowed while thread is holding global read lock",
-"Wrong arguments to %s",
-"%-.32s@%-.64s is not allowed to create new users",
-"Incorrect table definition; All MERGE tables must be in the same database",
+"   %s",
+"%-.32s@%-.64s     ",
+"  ;    MERGE     ",
 "Deadlock found when trying to get lock; Try restarting transaction",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
-"Error when executing command %s: %-.128s",
-"Wrong usage of %s and %s",
-"The used SELECT statements have a different number of columns",
+"    %s: %-.128s",
+"  %s  %s",
+" SELECT'    ",
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"      FULLTEXT ",

sql/share/slovak/errmsg.txt

@@ -231,3 +231,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",

sql/share/spanish/errmsg.txt

@@ -224,3 +224,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",

sql/share/swedish/errmsg.txt

@@ -223,3 +223,4 @@
 "Kan inte utföra kommandot emedan du har ett READ lås",
 "Blandning av transaktionella och icke-transaktionella tabeller är inaktiverat",
 "Option '%s' användes två gånger",
+"The used table type doesn't support FULLTEXT indexes",

sql/share/ukrainian/errmsg.txt

@@ -228,3 +228,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"  æ  Цդ FULLTEXT Ӧ",

sql/sql_table.cc

@@ -424,6 +424,15 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
     key_info->key_parts=(uint8) key->columns.elements;
     key_info->key_part=key_part_info;
 
+    if (key->type == Key::FULLTEXT)
+    {
+      if (file->option_flag() & HA_NO_FULLTEXT_KEY)
+      {
+        my_error(ER_TABLE_CANT_HANDLE_FULLTEXT, MYF(0));
+        DBUG_RETURN(-1);
+      }
+    }
+
     List_iterator<key_part_spec> cols(key->columns);
     for (uint column_nr=0 ; (column=cols++) ; column_nr++)
     {
@@ -439,13 +448,8 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
 			column->field_name);
 	DBUG_RETURN(-1);
       }
-      if (key->type == Key::FULLTEXT &&
-          (file->option_flag() & HA_NO_FULLTEXT_KEY))
-      {
-        my_printf_error(ER_WRONG_KEY_COLUMN, ER(ER_WRONG_KEY_COLUMN), MYF(0),
-                        column->field_name);
-        DBUG_RETURN(-1);
-      }
+      if (key->type == Key::FULLTEXT)
+        column->length=1; /* ft-code ignores it anyway :-) */
       if (f_is_blob(sql_field->pack_flag))
       {
 	if (!(file->option_flag() & HA_BLOB_KEY))
@@ -455,10 +459,6 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
 	  DBUG_RETURN(-1);
 	}
 	if (!column->length)
-	{
-          if (key->type == Key::FULLTEXT)
-            column->length=1; /* ft-code ignores it anyway :-) */
-          else
 	{
           my_printf_error(ER_BLOB_KEY_WITHOUT_LENGTH,
                           ER(ER_BLOB_KEY_WITHOUT_LENGTH),MYF(0),
@@ -466,7 +466,6 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
           DBUG_RETURN(-1);
 	}
       }
-      }
       if (!(sql_field->flags & NOT_NULL_FLAG))
       {
 	if (key->type == Key::PRIMARY)