Skip to content

Commit 488e56b

Browse files
authored
MDEV-27892 Improve an error message for foreign server exists
Improve and add more languages for the ERROR 1476: Foreign Server already exists.
1 parent 56fd0d7 commit 488e56b

File tree

4 files changed

+20
-9
lines changed

4 files changed

+20
-9
lines changed

mysql-test/main/create_drop_binlog.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ DROP SERVER s1;
142142
CREATE SERVER IF NOT EXISTS s1 FOREIGN DATA WRAPPER mysql OPTIONS (USER 'root', HOST 'localhost', DATABASE 'test');
143143
CREATE SERVER IF NOT EXISTS s1 FOREIGN DATA WRAPPER mysql OPTIONS (USER 'root', HOST 'localhost', DATABASE 'test');
144144
Warnings:
145-
Note 1476 The foreign server, s1, you are trying to create already exists
145+
Note 1476 Cannot create foreign server 's1' as it already exists
146146
DROP SERVER IF EXISTS s1;
147147
DROP SERVER IF EXISTS s1;
148148
SHOW BINLOG EVENTS;

mysql-test/main/create_drop_server.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ server_name username db
77
server1 user1 test0
88
CREATE SERVER IF NOT EXISTS server1 FOREIGN DATA WRAPPER mysql OPTIONS (USER 'user2', HOST 'localhost', DATABASE 'test1');
99
Warnings:
10-
Note 1476 The foreign server, server1, you are trying to create already exists
10+
Note 1476 Cannot create foreign server 'server1' as it already exists
1111
SELECT server_name, username, db FROM mysql.servers;
1212
server_name username db
1313
server1 user1 test0
@@ -21,10 +21,10 @@ server_name username db
2121
DROP SERVER IF EXISTS server1;
2222
CREATE SERVER server_1 FOREIGN DATA WRAPPER mysql OPTIONS (USER 'mysqltest_1', HOST 'localhost', DATABASE 'test0');
2323
CREATE SERVER server_1 FOREIGN DATA WRAPPER mysql OPTIONS (USER 'mysqltest_1', HOST 'localhost', DATABASE 'test1');
24-
ERROR HY000: The foreign server, server_1, you are trying to create already exists
24+
ERROR HY000: Cannot create foreign server 'server_1' as it already exists
2525
CREATE SERVER IF NOT EXISTS server_1 FOREIGN DATA WRAPPER mysql OPTIONS (USER 'mysqltest_1', HOST 'localhost', DATABASE 'test2');
2626
Warnings:
27-
Note 1476 The foreign server, server_1, you are trying to create already exists
27+
Note 1476 Cannot create foreign server 'server_1' as it already exists
2828
SELECT server_name, username, db FROM mysql.servers;
2929
server_name username db
3030
server_1 mysqltest_1 test0

mysql-test/main/ps_missed_cmds.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ EXECUTE stmt_1;
694694
# results in emitting the error ER_FOREIGN_SERVER_EXISTS
695695
# since a server with same has just been created.
696696
EXECUTE stmt_1;
697-
ERROR HY000: The foreign server, s, you are trying to create already exists
697+
ERROR HY000: Cannot create foreign server 's' as it already exists
698698
EXECUTE stmt_2;
699699
# Execute the same prepared statement the second time to check that
700700
# no internal structures used for handling the 'ALTER SERVER' statement

sql/share/errmsg-utf8.txt

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6450,10 +6450,21 @@ ER_AMBIGUOUS_FIELD_TERM
64506450
ger "Das erste Zeichen der Zeichenkette FIELDS TERMINATED ist mehrdeutig; bitte benutzen Sie nicht optionale und nicht leere FIELDS ENCLOSED BY"
64516451
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"
64526452
ER_FOREIGN_SERVER_EXISTS
6453-
chi "您正在尝试创建的外来服务器%s已存在"
6454-
eng "The foreign server, %s, you are trying to create already exists"
6455-
ger "Der entfernte Server %s, den Sie versuchen zu erzeugen, existiert schon"
6456-
spa "El servidor foráneo %s que intenta crear ya existe"
6453+
chi "无法创建外部服务器'%s',因为它已经存在"
6454+
eng "Cannot create foreign server '%s' as it already exists"
6455+
fin "Vieraata palvelinta '%s' ei voida luoda, koska se on jo olemassa"
6456+
fre "Impossible de créer le serveur étranger '%s' car il existe déjà"
6457+
ger "Der auswärtige Server '%s' kann nicht erstellt werden, da er bereits vorhanden ist"
6458+
greek "Δεν είναι δυνατή η δημιουργία ξένου διακομιστή '%s' επειδή υπάρχει ήδη"
6459+
ita "Impossibile creare il server esterno '%s' poiché esiste già"
6460+
jpn "外部サーバー '%s'は既に存在するため、作成できません"
6461+
nla "Kan geen externe server '%s' maken omdat deze al bestaat"
6462+
nor "Kan ikke opprette utenlandsk server '%s' fordi den allerede eksisterer"
6463+
pol "Nie można utworzyć obcego serwera '%s', ponieważ już istnieje"
6464+
por "Não foi possível criar o servidor externo '%s' porque ele já existe"
6465+
rus "Невозможно создать сторонний сервер '%s', так как он уже существует"
6466+
spa "No se puede crear el servidor externo '%s' porque ya existe"
6467+
swe "Det gick inte att skapa främmande server '%s' eftersom den redan finns"
64576468
ER_FOREIGN_SERVER_DOESNT_EXIST
64586469
chi "您尝试引用的外部服务器名称不存在。数据源错误:%-.64s"
64596470
eng "The foreign server name you are trying to reference does not exist. Data source error: %-.64s"

0 commit comments

Comments
 (0)