MDEV-27892 Improve an error message for foreign server existsbb-10.7-MDEV-27892

Improve and add more languages for the ERROR 1476: Foreign Server
already exists.

4 files changed, 20 insertions, 9 deletions

diff --git a/mysql-test/main/create_drop_binlog.result b/mysql-test/main/create_drop_binlog.result
index 4a8c75a3dae..30ccc116a85 100644
--- a/mysql-test/main/create_drop_binlog.result
+++ b/mysql-test/main/create_drop_binlog.result
@@ -142,7 +142,7 @@ DROP SERVER s1;
 CREATE SERVER IF NOT EXISTS s1 FOREIGN DATA WRAPPER mysql OPTIONS (USER 'root', HOST 'localhost', DATABASE 'test');
 CREATE SERVER IF NOT EXISTS s1 FOREIGN DATA WRAPPER mysql OPTIONS (USER 'root', HOST 'localhost', DATABASE 'test');
 Warnings:
-Note	1476	The foreign server, s1, you are trying to create already exists
+Note	1476	Cannot create foreign server 's1' as it already exists
 DROP SERVER IF EXISTS s1;
 DROP SERVER IF EXISTS s1;
 SHOW BINLOG EVENTS;
diff --git a/mysql-test/main/create_drop_server.result b/mysql-test/main/create_drop_server.result
index 4f5d13b3541..dc3c5eefbf8 100644
--- a/mysql-test/main/create_drop_server.result
+++ b/mysql-test/main/create_drop_server.result
@@ -7,7 +7,7 @@ server_name	username	db
 server1	user1	test0
 CREATE SERVER IF NOT EXISTS server1 FOREIGN DATA WRAPPER mysql OPTIONS (USER 'user2', HOST 'localhost', DATABASE 'test1');
 Warnings:
-Note	1476	The foreign server, server1, you are trying to create already exists
+Note	1476	Cannot create foreign server 'server1' as it already exists
 SELECT server_name, username, db FROM mysql.servers;
 server_name	username	db
 server1	user1	test0
@@ -21,10 +21,10 @@ server_name	username	db
 DROP SERVER IF EXISTS server1;
 CREATE SERVER server_1 FOREIGN DATA WRAPPER mysql OPTIONS (USER 'mysqltest_1', HOST 'localhost', DATABASE 'test0');
 CREATE SERVER server_1 FOREIGN DATA WRAPPER mysql OPTIONS (USER 'mysqltest_1', HOST 'localhost', DATABASE 'test1');
-ERROR HY000: The foreign server, server_1, you are trying to create already exists
+ERROR HY000: Cannot create foreign server 'server_1' as it already exists
 CREATE SERVER IF NOT EXISTS server_1 FOREIGN DATA WRAPPER mysql OPTIONS (USER 'mysqltest_1', HOST 'localhost', DATABASE 'test2');
 Warnings:
-Note	1476	The foreign server, server_1, you are trying to create already exists
+Note	1476	Cannot create foreign server 'server_1' as it already exists
 SELECT server_name, username, db FROM mysql.servers;
 server_name	username	db
 server_1	mysqltest_1	test0
diff --git a/mysql-test/main/ps_missed_cmds.result b/mysql-test/main/ps_missed_cmds.result
index ce3b6acc898..d377a359666 100644
--- a/mysql-test/main/ps_missed_cmds.result
+++ b/mysql-test/main/ps_missed_cmds.result
@@ -694,7 +694,7 @@ EXECUTE stmt_1;
 # results in emitting the error ER_FOREIGN_SERVER_EXISTS
 # since a server with same has just been created.
 EXECUTE stmt_1;
-ERROR HY000: The foreign server, s, you are trying to create already exists
+ERROR HY000: Cannot create foreign server 's' as it already exists
 EXECUTE stmt_2;
 # Execute the same prepared statement the second time to check that
 # no internal structures used for handling the 'ALTER SERVER' statement
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 156f47b4c7e..2d33a7f8f8f 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -6450,10 +6450,21 @@ ER_AMBIGUOUS_FIELD_TERM
         ger "Das erste Zeichen der Zeichenkette FIELDS TERMINATED ist mehrdeutig; bitte benutzen Sie nicht optionale und nicht leere FIELDS ENCLOSED BY"
         spa "El primer carácter de la cadena de los FIELDS TERMINATED es ambiguo; por favor, use FIELDS ENCLOSED BY no opcionales y no vacíos"
 ER_FOREIGN_SERVER_EXISTS
-        chi "您正在尝试创建的外来服务器%s已存在"
-        eng "The foreign server, %s, you are trying to create already exists"
-        ger "Der entfernte Server %s, den Sie versuchen zu erzeugen, existiert schon"
-        spa "El servidor foráneo %s que intenta crear ya existe"
+        chi "无法创建外部服务器'%s'，因为它已经存在"
+        eng "Cannot create foreign server '%s' as it already exists"
+        fin "Vieraata palvelinta '%s' ei voida luoda, koska se on jo olemassa"
+        fre "Impossible de créer le serveur étranger '%s' car il existe déjà"
+        ger "Der auswärtige Server '%s' kann nicht erstellt werden, da er bereits vorhanden ist"
+        greek "Δεν είναι δυνατή η δημιουργία ξένου διακομιστή '%s' επειδή υπάρχει ήδη"
+        ita "Impossibile creare il server esterno '%s' poiché esiste già"
+        jpn "外部サーバー '%s'は既に存在するため、作成できません"
+        nla "Kan geen externe server '%s' maken omdat deze al bestaat"
+        nor "Kan ikke opprette utenlandsk server '%s' fordi den allerede eksisterer"
+        pol "Nie można utworzyć obcego serwera '%s', ponieważ już istnieje"
+        por "Não foi possível criar o servidor externo '%s' porque ele já existe"
+        rus "Невозможно создать сторонний сервер '%s', так как он уже существует"
+        spa "No se puede crear el servidor externo '%s' porque ya existe"
+        swe "Det gick inte att skapa främmande server '%s' eftersom den redan finns"
 ER_FOREIGN_SERVER_DOESNT_EXIST
         chi "您尝试引用的外部服务器名称不存在。数据源错误：%-.64s"
         eng "The foreign server name you are trying to reference does not exist. Data source error:  %-.64s"