Fix error messages after merge from 3.23

include/mysqld_error.h

@@ -211,10 +211,10 @@
 #define ER_DROP_DB_WITH_READ_LOCK 1208
 #define ER_CREATE_DB_WITH_READ_LOCK 1209
 #define ER_WRONG_ARGUMENTS 1210
-#define ER_CONNECT_TO_MASTER 1211
-#define ER_QUERY_ON_MASTER 1212
-#define ER_ERROR_WHEN_EXECUTING_COMMAND 1213
-#define ER_WRONG_USAGE 1214
-#define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1215
-#define ER_NO_PERMISSION_TO_CREATE_USER 1216
+#define ER_NO_PERMISSION_TO_CREATE_USER 1211
+#define ER_CONNECT_TO_MASTER 1212
+#define ER_QUERY_ON_MASTER 1213
+#define ER_ERROR_WHEN_EXECUTING_COMMAND 1214
+#define ER_WRONG_USAGE 1215
+#define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1216
 #define ER_ERROR_MESSAGES 217

mysql-test/t/fulltext.test

@@ -73,11 +73,12 @@ CREATE TABLE t3 (
 );
 
 --error 1210
-select * from t2 having MATCH inhalt AGAINST (t1.id);
+select * from t2 where MATCH inhalt AGAINST (t2.inhalt);
 --error 1210
-select * from t2 having MATCH ticket AGAINST ('foobar');
+select * from t2 where MATCH inhalt AGAINST (t2.inhalt);
+--error 1191
+select * from t2 where MATCH ticket AGAINST ('foobar');
 --error 1210
-select * from t2,t3 having MATCH (t2.inhalt,t3.inhalt) AGAINST ('foobar');
+select * from t2,t3 where MATCH (t2.inhalt,t3.inhalt) AGAINST ('foobar');
 
 drop table t1,t2,t3;
-

mysql-test/t/union.test

@@ -19,11 +19,13 @@ select 't1',b,count(*) from t1 group by b UNION select 't2',b,count(*) from t2 g
 explain select a,b from t1 union all select a,b from t2;
 
 # Test some error conditions with UNION
---error 1214
+--error 1215
 select a,b from t1 into outfile 'skr' union select a,b from t2;
---error 1214
-select a,b from t1 order by a union select a,b from t2;
+
 --error 1215
+select a,b from t1 order by a union select a,b from t2;
+
+--error 1216
 select a,b from t1 union select a from t2;
 create table t3 select a,b from t1 union all select a,b from t2;
 insert into t3 select a,b from t1 union all select a,b from t2;

sql/share/czech/errmsg.txt

@@ -221,9 +221,9 @@
 "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",
 "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",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/english/errmsg.txt

@@ -153,7 +153,7 @@
 "You have an error in your SQL syntax",
 "Delayed insert thread couldn't get requested lock for table %-.64s",
 "Too many delayed threads in use",
-"Aborted connection %ld to db: '%-.64s' user: '%-.32s' (%-.64s) - see http://www.mysql.com/doc/C/o/Communication_errors.html",
+"Aborted connection %ld to db: '%-.64s' user: '%-.32s' (%-.64s)",
 "Got a packet bigger than 'max_allowed_packet'",
 "Got a read error from the connection pipe",
 "Got an error from fcntl()",
@@ -185,7 +185,7 @@
 "Got error %d during ROLLBACK",
 "Got error %d during FLUSH_LOGS",
 "Got error %d during CHECKPOINT",
-"Aborted connection %ld to db: '%-.64s' user: '%-.32s' host: `%-.64s' (%-.64s) - see http://www.mysql.com/doc/C/o/Communication_errors.html",
+"Aborted connection %ld to db: '%-.64s' user: '%-.32s' host: `%-.64s' (%-.64s)",
 "The handler for the table does not support binary table dump",
 "Binlog closed, cannot RESET MASTER",
 "Failed rebuilding the index of  dumped table '%-.64s'",
@@ -212,9 +212,9 @@
 "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",
 "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",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/estonian/errmsg.txt

@@ -216,9 +216,9 @@
 "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",
 "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",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/french/errmsg.txt

@@ -212,9 +212,9 @@
 "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",
 "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",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/german/errmsg.txt

@@ -215,9 +215,9 @@
 "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",
 "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",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/greek/errmsg.txt

@@ -212,9 +212,9 @@
 "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",
 "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",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/hungarian/errmsg.txt

@@ -214,9 +214,9 @@
 "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",
 "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",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/italian/errmsg.txt

@@ -212,9 +212,9 @@
 "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",
 "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",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/japanese/errmsg.txt

@@ -214,9 +214,9 @@
 "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",
 "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",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/korean/errmsg.txt

@@ -212,9 +212,9 @@
 "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",
 "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",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/norwegian-ny/errmsg.txt

@@ -214,9 +214,9 @@
 "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",
 "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",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/norwegian/errmsg.txt

@@ -214,9 +214,9 @@
 "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",
 "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",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/polish/errmsg.txt

@@ -216,9 +216,9 @@
 "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",
 "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",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/portuguese/errmsg.txt

@@ -206,15 +206,15 @@
 "Não conseguiu criar 'thread' de 'slave'. Verifique os recursos do sistema",
 "Usuário '%-.64s' já possui 'max_user_connections' conexões ativas",
 "Você pode usar apenas expressões de constante com 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",
+"Excedido tempo de espera (timeout) do travamento",
+"O número total de travamentos excede o tamanho de travamento da tabela",
+"Travamentos de atualização não podem ser obtidos durante um READ UNCOMMITTED na transação",
+"DROP DATABASE não permitido enquanto uma 'thread' está assegurando um travamento global de leitura",
+"CREATE DATABASE não permitido enquanto uma 'thread' está assegurando um travamento global de leitura",
 "Wrong arguments to %s",
+"%-.32s@%-.64s is not allowed to create new users",
 "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",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/romanian/errmsg.txt

@@ -216,9 +216,9 @@
 "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",
 "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",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/russian/errmsg.txt

@@ -215,9 +215,9 @@
 "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",
 "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",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/slovak/errmsg.txt

@@ -220,9 +220,9 @@
 "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",
 "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",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/spanish/errmsg.txt

@@ -213,9 +213,9 @@
 "DROP DATABASE no permitido mientras un thread está ejerciendo un bloqueo de lectura global",
 "CREATE DATABASE no permitido mientras un thread está ejerciendo un bloqueo de lectura global",
 "Wrong arguments to %s",
+"%-.32s@%-.64s is not allowed to create new users",
 "Error de coneccion a master: %-128s",
 "Error executando el query en master: %-128%",
 "Error de %s: %-128%",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/swedish/errmsg.txt

@@ -212,9 +212,9 @@
 "DROP DATABASE är inte tillåtet när man har ett globalt läs-lås",
 "CREATE DATABASE är inte tillåtet när man har ett globalt läs-lås",
 "Felaktiga argument till %s",
+"%-.32s@%-.64s har inte rättigheter att skapa nya användare",
 "Fick fel vid anslutning till master: %-.128s",
 "Fick fel vid utförande av command på mastern: %-.128s",
 "Fick fel vid utförande av %s: %-.128s",
 "Felaktig använding av %s and %s",
 "SELECT kommandona har olika antal kolumner"
-"%-.32s@%-.64s is not allowed to create new users",