Delete duplicate error message names

include/mysqld_error.h:
  Delete duplicate error names
include/sql_state.h:
  Delete duplicate error names
myisam/ft_dump.c:
  Delete wrong patch
myisam/myisamchk.c:
  Delete wrong patch
mysql-test/r/query_cache.result:
  Fix after deleting duplicated error messages
mysql-test/t/create.test:
  Fix after deleting duplicated error messages
mysql-test/t/fulltext.test:
  Fix after deleting duplicated error messages
mysql-test/t/key_cache.test:
  Fix after deleting duplicated error messages
sql/share/czech/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/danish/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/dutch/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/english/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/estonian/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/french/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/german/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/greek/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/hungarian/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/italian/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/japanese/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/korean/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/norwegian-ny/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/norwegian/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/polish/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/portuguese/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/romanian/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/russian/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/serbian/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/slovak/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/spanish/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/swedish/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/ukrainian/errmsg.txt:
  Fix after deleting duplicated error messages
sql/sql_db.cc:
  Fix after deleting duplicated error messages
sql/sql_parse.cc:
  Fix after deleting duplicated error messages
sql/sql_table.cc:
  Fix after deleting duplicated error messages
tests/client_test.c:
  CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS

23 files changed, 0 insertions, 69 deletions

diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index dffaf98197f..c40765ebf94 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -291,9 +291,6 @@ character-set=latin2
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
 "SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect table name '%-.100s'",
-"Incorrect database name '%-.100s'",
-"Incorrect column name '%-.100s'",
 "Incorrect index name '%-.100s'",
 "Incorrect catalog name '%-.100s'",
 "Query cache failed to set size %lu, new query cache size is %lu",
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index ebf7a2c3f84..98540e1bd0a 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -285,9 +285,6 @@ character-set=latin1
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
 "SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect table name '%-.100s'",
-"Incorrect database name '%-.100s'",
-"Incorrect column name '%-.100s'",
 "Incorrect index name '%-.100s'",
 "Incorrect catalog name '%-.100s'",
 "Query cache failed to set size %lu, new query cache size is %lu",
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index 7d94c907ae3..44c9399b821 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -293,9 +293,6 @@ character-set=latin1
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
 "SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect table name '%-.100s'",
-"Incorrect database name '%-.100s'",
-"Incorrect column name '%-.100s'",
 "Incorrect index name '%-.100s'",
 "Incorrect catalog name '%-.100s'",
 "Query cache failed to set size %lu, new query cache size is %lu",
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 891e23ad917..e4f7c27610b 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -282,9 +282,6 @@ character-set=latin1
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
 "It is recommended to use --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL. Otherwise you will get problems if you get an unexpected slave's mysqld restart",
 "SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect table name '%-.100s'",
-"Incorrect database name '%-.100s'",
-"Incorrect column name '%-.100s'",
 "Incorrect index name '%-.100s'",
 "Incorrect catalog name '%-.100s'",
 "Query cache failed to set size %lu, new query cache size is %lu",
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index f6b416f49fb..dec488567ff 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -287,9 +287,6 @@ character-set=latin7
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
 "SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect table name '%-.100s'",
-"Incorrect database name '%-.100s'",
-"Incorrect column name '%-.100s'",
 "Incorrect index name '%-.100s'",
 "Incorrect catalog name '%-.100s'",
 "Query cache failed to set size %lu, new query cache size is %lu",
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index c6a47091d54..c41c927d539 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -282,9 +282,6 @@ character-set=latin1
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
 "SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect table name '%-.100s'",
-"Incorrect database name '%-.100s'",
-"Incorrect column name '%-.100s'",
 "Incorrect index name '%-.100s'",
 "Incorrect catalog name '%-.100s'",
 "Query cache failed to set size %lu, new query cache size is %lu",
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index fe49d1c1e66..0425a709950 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -294,9 +294,6 @@ character-set=latin1
 "Falscher Parameter oder falsche Kombination von Parametern fЭr START SLAVE UNTIL",
 "Es wird empfohlen, mit --skip-slave-start zu starten, wenn mit START SLAVE UNTIL eine Schritt-fЭr-Schritt-Replikation ausgefЭhrt wird. Ansonsten gibt es Probleme, wenn der Slave-Server unerwartet neu startet",
 "SQL-Thread soll nicht gestartet werden. Daher werden UNTIL-Optionen ignoriert",
-"Incorrect table name '%-.100s'",
-"Incorrect database name '%-.100s'",
-"Incorrect column name '%-.100s'",
 "Incorrect index name '%-.100s'",
 "Incorrect catalog name '%-.100s'",
 "Query cache failed to set size %lu, new query cache size is %lu",
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index 3f6f2e5f5b2..3cf5bbf592d 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -282,9 +282,6 @@ character-set=greek
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
 "SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect table name '%-.100s'",
-"Incorrect database name '%-.100s'",
-"Incorrect column name '%-.100s'",
 "Incorrect index name '%-.100s'",
 "Incorrect catalog name '%-.100s'",
 "Query cache failed to set size %lu, new query cache size is %lu",
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index 7776655d0b9..f1b719ba716 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -284,9 +284,6 @@ character-set=latin2
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
 "SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect table name '%-.100s'",
-"Incorrect database name '%-.100s'",
-"Incorrect column name '%-.100s'",
 "Incorrect index name '%-.100s'",
 "Incorrect catalog name '%-.100s'",
 "Query cache failed to set size %lu, new query cache size is %lu",
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index dc4392a0ed8..ed39950e9f1 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -282,9 +282,6 @@ character-set=latin1
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
 "SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect table name '%-.100s'",
-"Incorrect database name '%-.100s'",
-"Incorrect column name '%-.100s'",
 "Incorrect index name '%-.100s'",
 "Incorrect catalog name '%-.100s'",
 "Query cache failed to set size %lu, new query cache size is %lu",
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index 101c6a22430..9760cd3f9e8 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -284,9 +284,6 @@ character-set=ujis
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
 "SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect table name '%-.100s'",
-"Incorrect database name '%-.100s'",
-"Incorrect column name '%-.100s'",
 "Incorrect index name '%-.100s'",
 "Incorrect catalog name '%-.100s'",
 "Query cache failed to set size %lu, new query cache size is %lu",
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index 0337ad97a21..10eed3bb2de 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -282,9 +282,6 @@ character-set=euckr
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
 "SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect table name '%-.100s'",
-"Incorrect database name '%-.100s'",
-"Incorrect column name '%-.100s'",
 "Incorrect index name '%-.100s'",
 "Incorrect catalog name '%-.100s'",
 "Query cache failed to set size %lu, new query cache size is %lu",
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index 549961aef23..7149eea8b10 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -284,9 +284,6 @@ character-set=latin1
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
 "SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect table name '%-.100s'",
-"Incorrect database name '%-.100s'",
-"Incorrect column name '%-.100s'",
 "Incorrect index name '%-.100s'",
 "Incorrect catalog name '%-.100s'",
 "Query cache failed to set size %lu, new query cache size is %lu",
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index f1ff1a15415..dc96d39f8dc 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -284,9 +284,6 @@ character-set=latin1
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
 "SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect table name '%-.100s'",
-"Incorrect database name '%-.100s'",
-"Incorrect column name '%-.100s'",
 "Incorrect index name '%-.100s'",
 "Incorrect catalog name '%-.100s'",
 "Query cache failed to set size %lu, new query cache size is %lu",
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index f3c9c929c28..b2b2e52ad75 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -286,9 +286,6 @@ character-set=latin2
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
 "SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect table name '%-.100s'",
-"Incorrect database name '%-.100s'",
-"Incorrect column name '%-.100s'",
 "Incorrect index name '%-.100s'",
 "Incorrect catalog name '%-.100s'",
 "Query cache failed to set size %lu, new query cache size is %lu",
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index 3bbf1d5468f..c4a150d79bf 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -283,9 +283,6 @@ character-set=latin1
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
 "SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect table name '%-.100s'",
-"Incorrect database name '%-.100s'",
-"Incorrect column name '%-.100s'",
 "Incorrect index name '%-.100s'",
 "Incorrect catalog name '%-.100s'",
 "Query cache failed to set size %lu, new query cache size is %lu",
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index 1222240621c..dce141da20a 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -286,9 +286,6 @@ character-set=latin2
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
 "SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect table name '%-.100s'",
-"Incorrect database name '%-.100s'",
-"Incorrect column name '%-.100s'",
 "Incorrect index name '%-.100s'",
 "Incorrect catalog name '%-.100s'",
 "Query cache failed to set size %lu, new query cache size is %lu",
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index 1df627ebe7c..27c1b49f4f0 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -284,9 +284,6 @@ character-set=koi8r
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
 "SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect table name '%-.100s'",
-"Incorrect database name '%-.100s'",
-"Incorrect column name '%-.100s'",
 "Incorrect index name '%-.100s'",
 "Incorrect catalog name '%-.100s'",
 "Кеш запросов не может установить размер %lu, новый размер кеша зпросов - %lu",
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt
index ebac72233b3..5311fa016dc 100644
--- a/sql/share/serbian/errmsg.txt
+++ b/sql/share/serbian/errmsg.txt
@@ -277,9 +277,6 @@ character-set=cp1250
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
 "SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect table name '%-.100s'",
-"Incorrect database name '%-.100s'",
-"Incorrect column name '%-.100s'",
 "Incorrect index name '%-.100s'",
 "Incorrect catalog name '%-.100s'",
 "Query cache failed to set size %lu, new query cache size is %lu",
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 552d71805e1..9355e8fc0c4 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -290,9 +290,6 @@ character-set=latin2
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
 "SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect table name '%-.100s'",
-"Incorrect database name '%-.100s'",
-"Incorrect column name '%-.100s'",
 "Incorrect index name '%-.100s'",
 "Incorrect catalog name '%-.100s'",
 "Query cache failed to set size %lu, new query cache size is %lu",
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index a4f590d45e8..3cdcc3967d7 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -284,9 +284,6 @@ character-set=latin1
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
 "SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect table name '%-.100s'",
-"Incorrect database name '%-.100s'",
-"Incorrect column name '%-.100s'",
 "Incorrect index name '%-.100s'",
 "Incorrect catalog name '%-.100s'",
 "Query cache failed to set size %lu, new query cache size is %lu",
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index 15a1562e4a0..17dcdb89ae6 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -282,9 +282,6 @@ character-set=latin1
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
 "SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect table name '%-.100s'",
-"Incorrect database name '%-.100s'",
-"Incorrect column name '%-.100s'",
 "Incorrect index name '%-.100s'",
 "Incorrect catalog name '%-.100s'",
 "Storleken av "Query cache" kunde inte sДttas till %lu, ny storlek Дr %lu",
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index 71fddf604c9..99a09afde6c 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -287,9 +287,6 @@ character-set=koi8u
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
 "SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect table name '%-.100s'",
-"Incorrect database name '%-.100s'",
-"Incorrect column name '%-.100s'",
 "Incorrect index name '%-.100s'",
 "Incorrect catalog name '%-.100s'",
 "Кеш запит╕в неспроможен встановити розм╕р %lu, новий розм╕р кеша запит╕в - %lu",