fixed error message

include/mysqld_error.h

@@ -109,7 +109,7 @@
 #define ER_CANT_REMOVE_ALL_FIELDS 1090
 #define ER_CANT_DROP_FIELD_OR_KEY 1091
 #define ER_INSERT_INFO 1092
-#define ER_INSERT_TABLE_USED 1093
+#define ER_UPDATE_TABLE_USED 1093
 #define ER_NO_SUCH_THREAD 1094
 #define ER_KILL_DENIED_ERROR 1095
 #define ER_NO_TABLES_USED 1096

mysql-test/r/subselect.result

@@ -412,7 +412,7 @@ a	b
 1	11
 2	12
 update t1 set b= (select b from t1);
-INSERT TABLE 't1' isn't allowed in FROM table list
+You can't specify target table 't1' for update in FROM clause
 update t1 set b= (select b from t2);
 Subselect returns more than 1 record
 update t1 set b= (select b from t2 where t1.a = t2.a);
@@ -435,7 +435,7 @@ select * from t1 where b = (select b from t2 where t1.a = t2.a);
 a	b
 2	12
 delete from t1 where b = (select b from t1);
-INSERT TABLE 't1' isn't allowed in FROM table list
+You can't specify target table 't1' for update in FROM clause
 delete from t1 where b = (select b from t2);
 Subselect returns more than 1 record
 delete from t1 where b = (select b from t2 where t1.a = t2.a);
@@ -462,7 +462,7 @@ a	b
 22	11
 2	12
 delete t11.*, t12.* from t11,t12 where t11.a = t12.a and t11.b = (select b from t12 where t11.a = t12.a);
-INSERT TABLE 't12' isn't allowed in FROM table list
+You can't specify target table 't12' for update in FROM clause
 delete t11.*, t12.* from t11,t12 where t11.a = t12.a and t11.b = (select b from t2);
 Subselect returns more than 1 record
 delete t11.*, t12.* from t11,t12 where t11.a = t12.a and t11.b = (select b from t2 where t11.a = t2.a);
@@ -481,7 +481,7 @@ create table t3 (a int);
 insert into t2 values (1);
 insert into t3 values (1),(2);
 INSERT INTO t1 (x) VALUES ((SELECT x FROM t1));
-INSERT TABLE 't1' isn't allowed in FROM table list
+You can't specify target table 't1' for update in FROM clause
 INSERT INTO t1 (x) VALUES ((SELECT a FROM t3));
 Subselect returns more than 1 record
 INSERT INTO t1 (x) VALUES ((SELECT a FROM t2));
@@ -502,7 +502,7 @@ x
 3
 3
 INSERT INTO t1 (x) select (SELECT SUM(x)+2 FROM t1) FROM t2;
-INSERT TABLE 't1' isn't allowed in FROM table list
+You can't specify target table 't1' for update in FROM clause
 INSERT DELAYED INTO t1 (x) VALUES ((SELECT SUM(x) FROM t2));
 select * from t1;
 x
@@ -520,7 +520,7 @@ insert into t3 values (1),(2);
 select * from t1;
 x	y
 replace into t1 (x, y) VALUES ((SELECT x FROM t1), (SELECT a+1 FROM t2));
-INSERT TABLE 't1' isn't allowed in FROM table list
+You can't specify target table 't1' for update in FROM clause
 replace into t1 (x, y) VALUES ((SELECT a FROM t3), (SELECT a+1 FROM t2));
 Subselect returns more than 1 record
 replace into t1 (x, y) VALUES ((SELECT a FROM t2), (SELECT a+1 FROM t2));
@@ -584,7 +584,7 @@ SELECT * FROM t WHERE id IN (SELECT 5 UNION SELECT 2);
 id
 2
 INSERT INTO t VALUES ((SELECT * FROM t));
-INSERT TABLE 't' isn't allowed in FROM table list
+You can't specify target table 't' for update in FROM clause
 SELECT * FROM t;
 id
 1

sql/share/czech/errmsg.txt

@@ -103,7 +103,7 @@ v/*
 "Nen-B mon vymazat vechny poloky s ALTER TABLE. Pouijte DROP TABLE",
 "Nemohu zru-Bit '%-.64s' (provst DROP). Zkontrolujte, zda neexistuj zznamy/kle",
 "Z-Bznam: %ld  Zdvojench: %ld  Varovn: %ld",
-"INSERT TABLE '%-.64s' nen-B dovoleno v seznamu tabulek FROM",
+"You can't specify target table '%-.64s' for update in FROM clause",
 "Nezn-Bm identifikace threadu: %lu",
 "Nejste vlastn-Bkem threadu %lu",
 "Nejsou pou-Bity dn tabulky",

sql/share/danish/errmsg.txt

@@ -97,7 +97,7 @@
 "Man kan ikke slette alle felter med ALTER TABLE. Brug DROP TABLE i stedet.",
 "Kan ikke udføre DROP '%-.64s'. Undersøg om feltet/nøglen eksisterer.",
 "Poster: %ld  Ens: %ld  Advarsler: %ld",
-"INSERT TABLE '%-.64s' er ikke tilladt i FROM tabel liste",
+"You can't specify target table '%-.64s' for update in FROM clause",
 "Ukendt tråd id: %lu",
 "Du er ikke ejer af tråden %lu",
 "Ingen tabeller i brug",

sql/share/dutch/errmsg.txt

@@ -105,7 +105,7 @@
 "Het is niet mogelijk alle velden te verwijderen met ALTER TABLE. Gebruik a.u.b. DROP TABLE hiervoor!",
 "Kan '%-.64s' niet weggooien. Controleer of het veld of de zoeksleutel daadwerkelijk bestaat.",
 "Records: %ld  Dubbel: %ld  Waarschuwing: %ld",
-"INSERT TABLE '%-.64s' is niet toegestaan in de FROM tabel-lijst",
+"You can't specify target table '%-.64s' for update in FROM clause",
 "Onbekend thread id: %lu",
 "U bent geen bezitter van thread %lu",
 "Geen tabellen gebruikt.",

sql/share/english/errmsg.txt

@@ -94,7 +94,7 @@
 "You can't delete all columns with ALTER TABLE. Use DROP TABLE instead",
 "Can't DROP '%-.64s'. Check that column/key exists",
 "Records: %ld  Duplicates: %ld  Warnings: %ld",
-"INSERT TABLE '%-.64s' isn't allowed in FROM table list",
+"You can't specify target table '%-.64s' for update in FROM clause",
 "Unknown thread id: %lu",
 "You are not owner of thread %lu",
 "No tables used",

sql/share/estonian/errmsg.txt

@@ -99,7 +99,7 @@
 "ALTER TABLE kasutades ei saa kustutada kiki tulpasid. Kustuta tabel DROP TABLE abil",
 "Ei suuda kustutada '%-.64s'. Kontrolli kas tulp/vti eksisteerib",
 "Kirjeid: %ld  Kattuvaid: %ld  Hoiatusi: %ld",
-"INSERT TABLE '%-.64s' ei ole lubatud FROM tabelite nimekirjas",
+"You can't specify target table '%-.64s' for update in FROM clause",
 "Tundmatu lim: %lu",
 "Ei ole lime %lu omanik",
 "htegi tabelit pole kasutusel",

sql/share/french/errmsg.txt

@@ -94,7 +94,7 @@
 "Vous ne pouvez effacer tous les champs avec ALTER TABLE. Utilisez DROP TABLE",
 "Ne peut effacer (DROP) '%-.64s'. Vérifiez s'il existe",
 "Enregistrements: %ld  Doublons: %ld  Avertissements: %ld",
-"INSERT TABLE '%-.64s' n'est pas permis dans FROM liste des tables",
+"You can't specify target table '%-.64s' for update in FROM clause",
 "Numéro de tâche inconnu: %lu",
 "Vous n'êtes pas propriétaire de la tâche no: %lu",
 "Aucune table utilisée",

sql/share/german/errmsg.txt

@@ -97,7 +97,7 @@
 "Mit ALTER TABLE können nicht alle Felder auf einmal gelöscht werden. Verwende DROP TABLE stattdessen.",
 "Kann '%-.64s' nicht löschen (DROP). Existiert das Feld/der Schlüssel?",
 "Datensätze: %ld  Duplikate: %ld  Warnungen: %ld",
-"INSERT TABLE '%-.64s' nicht erlaubt im FROM Abschnitt.",
+"You can't specify target table '%-.64s' for update in FROM clause",
 "Unbekannte Thread-ID: %lu",
 "Nicht Besitzer des Threads %lu.",
 "Keine Tabellen in Verwendung.",

sql/share/greek/errmsg.txt

@@ -94,7 +94,7 @@
 "         ALTER TABLE.   DROP TABLE",
 "   (DROP) '%-.64s'.     / ",
 ": %ld  : %ld  : %ld",
-"INSERT TABLE '%-.64s'    FROM table list",
+"You can't specify target table '%-.64s' for update in FROM clause",
 " thread id: %lu",
 "  owner  thread %lu",
 "  ",

sql/share/hungarian/errmsg.txt

@@ -96,7 +96,7 @@
 "Az osszes mezo nem torolheto az ALTER TABLE-lel. Hasznalja a DROP TABLE-t helyette",
 "A DROP '%-.64s' nem lehetseges. Ellenorizze, hogy a mezo/kulcs letezik-e",
 "Rekordok: %ld  Duplikalva: %ld  Warnings: %ld",
-"INSERT TABLE '%-.64s' nem engedelyezett a FROM table listabol",
+"You can't specify target table '%-.64s' for update in FROM clause",
 "Ervenytelen szal (thread) id: %lu",
 "A %lu thread-nek mas a tulajdonosa",
 "Nincs hasznalt tabla",

sql/share/italian/errmsg.txt

@@ -94,7 +94,7 @@
 "Non si possono cancellare tutti i campi con una ALTER TABLE. Utilizzare DROP TABLE",
 "Impossibile cancellare '%-.64s'. Controllare che il campo chiave esista",
 "Records: %ld  Duplicati: %ld  Avvertimenti: %ld",
-"INSERT TABLE '%-.64s' non e` permesso nella FROM table list",
+"You can't specify target table '%-.64s' for update in FROM clause",
 "Thread id: %lu sconosciuto",
 "Utente non proprietario del thread %lu",
 "Nessuna tabella usata",

sql/share/japanese/errmsg.txt

@@ -96,7 +96,7 @@
 "ALTER TABLE で全ての column は削除できません. DROP TABLE を使用してください",
 "'%-.64s' を破棄できませんでした. Check that column/key exists",
 "レコード数: %ld  重複数: %ld  Warnings: %ld",
-"INSERT TABLE '%-.64s' isn't allowed in FROM table list",
+"You can't specify target table '%-.64s' for update in FROM clause",
 "thread id: %lu はありません",
 "thread %lu のオーナーではありません",
 "No tables used",

sql/share/korean/errmsg.txt

@@ -94,7 +94,7 @@
 "ALTER TABLE 명령으로는 모든 칼럼을 지울 수 없습니다. DROP TABLE 명령을 이용하세요.",
 "'%-.64s'를 DROP할 수 없습니다. 칼럼이나 키가 존재하는지 채크하세요.",
 "레코드: %ld개  중복: %ld개  경고: %ld개",
-"INSERT TABLE '%-.64s' 는 FROM 테이블 list에서 허가되지 않았습니다.",
+"You can't specify target table '%-.64s' for update in FROM clause",
 "알수 없는 쓰레드 id: %lu",
 "쓰레드(Thread) %lu의 소유자가 아닙니다.",
 "어떤 테이블도 사용되지 않았습니다.",

sql/share/norwegian-ny/errmsg.txt

@@ -96,7 +96,7 @@
 "Ein kan ikkje slette alle felt med ALTER TABLE. Bruk DROP TABLE istadenfor.",
 "Kan ikkje DROP '%-.64s'. Undersk om felt/nkkel eksisterar.",
 "Postar: %ld  Like: %ld  tvaringar: %ld",
-"INSERT TABLE '%-.64s' er ikkje tillate i FROM tabell liste",
+"You can't specify target table '%-.64s' for update in FROM clause",
 "Ukjent trd id: %lu",
 "Du er ikkje eigar av trd %lu",
 "Ingen tabellar i bruk",

sql/share/norwegian/errmsg.txt

@@ -96,7 +96,7 @@
 "En kan ikke slette alle felt med ALTER TABLE. Bruk DROP TABLE isteden.",
 "Kan ikke DROP '%-.64s'. Undersøk om felt/nøkkel eksisterer.",
 "Poster: %ld  Like: %ld  Advarsler: %ld",
-"INSERT TABLE '%-.64s' er ikke tillatt i FROM tabell liste",
+"You can't specify target table '%-.64s' for update in FROM clause",
 "Ukjent tråd id: %lu",
 "Du er ikke eier av tråden %lu",
 "Ingen tabeller i bruk",

sql/share/polish/errmsg.txt

@@ -98,7 +98,7 @@
 "Nie mona usun? wszystkich pl wykorzystuj?c ALTER TABLE. W zamian uyj DROP TABLE",
 "Nie mona wykona operacji DROP '%-.64s'. Sprawd, czy to pole/klucz istnieje",
 "Rekordw: %ld  Duplikatw: %ld  Ostrzee: %ld",
-"Operacja INSERT TABLE '%-.64s' nie jest dozwolona w li?cie tabel w FROM",
+"You can't specify target table '%-.64s' for update in FROM clause",
 "Nieznany identyfikator w?tku: %lu",
 "Nie jeste? wa?cicielem w?tku %lu",
 "Nie ma adej uytej tabeli",

sql/share/portuguese/errmsg.txt

@@ -94,7 +94,7 @@
 "Você não pode deletar todas as colunas com ALTER TABLE. Use DROP TABLE em seu lugar",
 "Não se pode fazer DROP '%-.64s'. Confira se esta coluna/chave existe",
 "Registros: %ld - Duplicados: %ld - Avisos: %ld",
-"INSERT TABLE '%-.64s' não é permitido na lista de tabelas contidas em FROM",
+"You can't specify target table '%-.64s' for update in FROM clause",
 "'Id' de 'thread' %lu desconhecido",
 "Você não é proprietário da 'thread' %lu",
 "Nenhuma tabela usada",

sql/share/romanian/errmsg.txt

@@ -98,7 +98,7 @@
 "Nu poti sterge toate coloanele cu ALTER TABLE. Foloseste DROP TABLE in schimb",
 "Nu pot sa DROP '%-.64s'. Verifica daca coloana/cheia exista",
 "Recorduri: %ld  Duplicate: %ld  Atentionari (warnings): %ld",
-"INSERT TABLE '%-.64s' nu este permis in lista FROM de tabele",
+"You can't specify target table '%-.64s' for update in FROM clause",
 "Id-ul: %lu thread-ului este necunoscut",
 "Nu sinteti proprietarul threadului %lu",
 "Nici o tabela folosita",

sql/share/russian/errmsg.txt

@@ -97,7 +97,7 @@
 "     ALTER TABLE.  DROP TABLE",
 "   '%-.64s'. ,   / ",
 ": %ld  : %ld  : %ld",
-"INSERT TABLE '%-.64s'     FROM TABLE",
+"      '%-.64s'     FROM",
 " : %lu",
 "    %lu",
 "  ",

sql/share/serbian/errmsg.txt

@@ -100,7 +100,7 @@
 "Ne moete da izbriete sve kolone pomou komande 'ALTER TABLE'. Upotrebite komandu 'DROP TABLE' ako elite to da uradite",
 "Ne mogu da izvrim komandu drop 'DROP' na '%-.64s'. Proverite da li ta kolona (odnosno klju) postoji",
 "Slogova: %ld  Duplikata: %ld  Upozorenja: %ld",
-"Komanda 'INSERT TABLE' na '%-.64s' nije dozvoljena u listi 'FROM' tabela",
+"You can't specify target table '%-.64s' for update in FROM clause",
 "Nepoznat thread identifikator: %lu",
 "Vi niste vlasnik thread-a %lu",
 "Nema upotrebljenih tabela",

sql/share/slovak/errmsg.txt

@@ -102,7 +102,7 @@
 "One nemem zmaza all fields with ALTER TABLE. Use DROP TABLE instead",
 "Nemem zrui (DROP) '%-.64s'. Skontrolujte, i neexistuj zznamy/ke",
 "Zznamov: %ld  Opakovanch: %ld  Varovania: %ld",
-"INSERT TABLE '%-.64s' nie je dovolen v zozname tabuliek FROM",
+"You can't specify target table '%-.64s' for update in FROM clause",
 "Neznma identifikcia vlkna: %lu",
 "Nie ste vlastnkom vlkna %lu",
 "Nie je pouit iadna tabuka",

sql/share/spanish/errmsg.txt

@@ -95,7 +95,7 @@
 "No puede borrar todos los campos con ALTER TABLE. Usa DROP TABLE para hacerlo",
 "No puedo ELIMINAR '%-.64s'. compuebe que el campo/clave existe",
 "Registros: %ld  Duplicados: %ld  Peligros: %ld",
-"INSERT TABLE '%-.64s' no esta permitido en FROM tabla lista",
+"You can't specify target table '%-.64s' for update in FROM clause",
 "Identificador del thread: %lu  desconocido",
 "Tu no eres el propietario del thread%lu",
 "No ha tablas usadas",

sql/share/swedish/errmsg.txt

@@ -94,7 +94,7 @@
 "Man kan inte radera alla fält med ALTER TABLE. Använd DROP TABLE istället",
 "Kan inte ta bort '%-.64s'. Kontrollera att fältet/nyckel finns",
 "Rader: %ld  Dubletter: %ld  Varningar: %ld",
-"INSERT table '%-.64s' får inte finnas i FROM tabell-listan",
+"You can't specify target table '%-.64s' for update in FROM clause",
 "Finns inget thread med id %lu",
 "Du är inte ägare till thread %lu",
 "Inga tabeller angivna",

sql/share/ukrainian/errmsg.txt

@@ -99,7 +99,7 @@
 "   Ӧ æ   ALTER TABLE.    DROP TABLE",
 "  DROP '%-.64s'. צ,   / դ",
 "Ӧ: %ld  ̦Ԧ: %ld  : %ld",
-"INSERT TABLE '%-.64s'    ̦ FROM TABLE",
+" '%-.64s'  ͦ    ̦  FROM",
 "צ Ʀ Ǧ: %lu",
 "   Ǧ %lu",
 "  ",

sql/sql_delete.cc

@@ -54,7 +54,7 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order,
   if (find_real_table_in_list(table_list->next, 
 			      table_list->db, table_list->real_name))
   {
-    my_error(ER_INSERT_TABLE_USED, MYF(0), table_list->real_name);
+    my_error(ER_UPDATE_TABLE_USED, MYF(0), table_list->real_name);
     DBUG_RETURN(-1);
   }
 

sql/sql_insert.cc

@@ -182,7 +182,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list,
   if (find_real_table_in_list(table_list->next, 
 			      table_list->db, table_list->real_name))
   {
-    my_error(ER_INSERT_TABLE_USED, MYF(0), table_list->real_name);
+    my_error(ER_UPDATE_TABLE_USED, MYF(0), table_list->real_name);
     goto abort;
   }
 

sql/sql_parse.cc

@@ -1646,7 +1646,7 @@ mysql_execute_command(THD *thd)
       if (!(lex->create_info.options & HA_LEX_CREATE_TMP_TABLE) &&
 	  find_real_table_in_list(tables->next, tables->db, tables->real_name))
       {
-	net_printf(thd,ER_INSERT_TABLE_USED,tables->real_name);
+	net_printf(thd,ER_UPDATE_TABLE_USED,tables->real_name);
 	DBUG_VOID_RETURN;
       }
       if (tables->next)
@@ -2021,7 +2021,7 @@ mysql_execute_command(THD *thd)
 
     if (find_real_table_in_list(tables->next, tables->db, tables->real_name))
     {
-      net_printf(thd,ER_INSERT_TABLE_USED,tables->real_name);
+      net_printf(thd,ER_UPDATE_TABLE_USED,tables->real_name);
       DBUG_VOID_RETURN;
     }
 
@@ -2122,7 +2122,7 @@ mysql_execute_command(THD *thd)
       {
 	if (find_real_table_in_list(t->table_list->next, t->db, t->real_name))
 	{
-	  my_error(ER_INSERT_TABLE_USED, MYF(0), t->real_name);
+	  my_error(ER_UPDATE_TABLE_USED, MYF(0), t->real_name);
 	  res= -1;
 	  break;
 	}

sql/sql_update.cc

@@ -89,7 +89,7 @@ int mysql_update(THD *thd,
   if (find_real_table_in_list(table_list->next, 
 			      table_list->db, table_list->real_name))
   {
-    my_error(ER_INSERT_TABLE_USED, MYF(0), table_list->real_name);
+    my_error(ER_UPDATE_TABLE_USED, MYF(0), table_list->real_name);
     DBUG_RETURN(-1);
   }