New error messages for MATCH and UNION

include/mysqld_error.h

@@ -210,9 +210,10 @@
 #define ER_READ_ONLY_TRANSACTION 1207
 #define ER_DROP_DB_WITH_READ_LOCK 1208
 #define ER_CREATE_DB_WITH_READ_LOCK 1209
-#define ER_CONNECT_TO_MASTER 1210
+#define ER_WRONG_ARGUMENTS 1210
-#define ER_QUERY_ON_MASTER 1211
+#define ER_CONNECT_TO_MASTER 1211
-#define ER_ERROR_WHEN_EXECUTING_COMMAND 1212
+#define ER_QUERY_ON_MASTER 1212
-#define ER_WRONG_USAGE 1213
+#define ER_ERROR_WHEN_EXECUTING_COMMAND 1213
-#define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1214
+#define ER_WRONG_USAGE 1214
-#define ER_ERROR_MESSAGES 215
+#define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1215
+#define ER_ERROR_MESSAGES 216

sql/share/czech/errmsg.txt

@@ -220,6 +220,7 @@
 "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",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/danish/errmsg.txt

@@ -214,6 +214,7 @@
 "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",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/dutch/errmsg.txt

@@ -211,6 +211,7 @@
 "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",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/english/errmsg.txt

@@ -211,6 +211,7 @@
 "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",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/estonian/errmsg.txt

@@ -215,6 +215,7 @@
 "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",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/french/errmsg.txt

@@ -211,6 +211,7 @@
 "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",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/german/errmsg.txt

@@ -214,6 +214,7 @@
 "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",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/greek/errmsg.txt

@@ -211,6 +211,7 @@
 "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",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/hungarian/errmsg.txt

@@ -213,6 +213,7 @@
 "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",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/italian/errmsg.txt

@@ -211,6 +211,7 @@
 "I lock di aggiornamento non possono essere acquisiti durante una transazione 'READ UNCOMMITTED'",
 "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",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/japanese/errmsg.txt

@@ -213,6 +213,7 @@
 "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",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/korean/errmsg.txt

@@ -211,6 +211,7 @@
 "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",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/norwegian-ny/errmsg.txt

@@ -213,6 +213,7 @@
 "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",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/norwegian/errmsg.txt

@@ -213,6 +213,7 @@
 "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",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/polish/errmsg.txt

@@ -215,6 +215,7 @@
 "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",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/portuguese/errmsg.txt

@@ -211,6 +211,7 @@
 "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",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/romanian/errmsg.txt

@@ -215,6 +215,7 @@
 "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",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/russian/errmsg.txt

@@ -214,6 +214,7 @@
 "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",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/slovak/errmsg.txt

@@ -219,6 +219,7 @@
 "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",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",

sql/share/spanish/errmsg.txt

@@ -212,6 +212,7 @@
 "Bloqueos de actualizaci<63>n no pueden ser adqueridos durante una transici<63>n READ UNCOMMITTED",
 "DROP DATABASE no permitido mientras un thread est<73> ejerciendo un bloqueo de lectura global",
 "CREATE DATABASE no permitido mientras un thread est<73> ejerciendo un bloqueo de lectura global",
+"Wrong arguments to %s",
 "Error de coneccion a master: %-128s",
 "Error executando el query en master: %-128%",
 "Error de %s: %-128%",

sql/share/swedish/errmsg.txt

@@ -211,6 +211,7 @@
 "Updaterings-l<>s kan inte g<>ras n<>r man anv<6E>nder READ UNCOMMITTED",
 "DROP DATABASE <20>r inte till<6C>tet n<>r man har ett globalt l<>s-l<>s",
 "CREATE DATABASE <20>r inte till<6C>tet n<>r man har ett globalt l<>s-l<>s",
+"Felaktiga argument till %s",
 "Fick fel vid anslutning till master: %-.128s",
 "Fick fel vid utf<74>rande av command p<> mastern: %-.128s",
 "Fick fel vid utf<74>rande av %s: %-.128s",