Skip to content

Commit

Permalink
MDEV-27892 Improve an error message for foreign server exists
Browse files Browse the repository at this point in the history
Improve and add more languages for the ERROR 1476: Foreign Server
already exists.
  • Loading branch information
rdtr authored and grooverdan committed May 24, 2022
1 parent 3dd3dcc commit af86949
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 7 deletions.
2 changes: 1 addition & 1 deletion mysql-test/main/create_drop_binlog.result
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions mysql-test/main/create_drop_server.result
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
18 changes: 15 additions & 3 deletions sql/share/errmsg-utf8.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6257,9 +6257,21 @@ ER_AMBIGUOUS_FIELD_TERM
eng "First character of the FIELDS TERMINATED string is ambiguous; please use non-optional and non-empty FIELDS ENCLOSED BY"
ger "Das erste Zeichen der Zeichenkette FIELDS TERMINATED ist mehrdeutig; bitte benutzen Sie nicht optionale und nicht leere FIELDS ENCLOSED BY"
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"
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"
Expand Down

0 comments on commit af86949

Please sign in to comment.