database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-27892 Improve an error message for foreign server exists

Browse Source 
Improve and add more languages for the ERROR 1476: Foreign Server
already exists.
This commit is contained in:
Norio Akagi
2022-05-09 21:08:33 -07:00
committed by GitHub
parent 56fd0d7b06
commit 488e56b50c
4 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/main/create_drop_binlog.result
View File

@ -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');
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: 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;
DROP SERVER IF EXISTS s1; DROP SERVER IF EXISTS s1;
SHOW BINLOG EVENTS; SHOW BINLOG EVENTS;

6
mysql-test/main/create_drop_server.result
View File

@ -7,7 +7,7 @@ server_name username db
server1 user1 test0 server1 user1 test0
CREATE SERVER IF NOT EXISTS server1 FOREIGN DATA WRAPPER mysql OPTIONS (USER 'user2', HOST 'localhost', DATABASE 'test1'); CREATE SERVER IF NOT EXISTS server1 FOREIGN DATA WRAPPER mysql OPTIONS (USER 'user2', HOST 'localhost', DATABASE 'test1');
Warnings: 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; SELECT server_name, username, db FROM mysql.servers;
server_name username db server_name username db
server1 user1 test0 server1 user1 test0
@ -21,10 +21,10 @@ server_name username db
DROP SERVER IF EXISTS server1; 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 'test0');
CREATE SERVER server_1 FOREIGN DATA WRAPPER mysql OPTIONS (USER 'mysqltest_1', HOST 'localhost', DATABASE 'test1'); 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'); CREATE SERVER IF NOT EXISTS server_1 FOREIGN DATA WRAPPER mysql OPTIONS (USER 'mysqltest_1', HOST 'localhost', DATABASE 'test2');
Warnings: 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; SELECT server_name, username, db FROM mysql.servers;
server_name username db server_name username db
server_1 mysqltest_1 test0 server_1 mysqltest_1 test0

2
mysql-test/main/ps_missed_cmds.result
View File

@ -694,7 +694,7 @@ EXECUTE stmt_1;
# results in emitting the error ER_FOREIGN_SERVER_EXISTS # results in emitting the error ER_FOREIGN_SERVER_EXISTS
# since a server with same has just been created. # since a server with same has just been created.
EXECUTE stmt_1; 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 stmt_2;
# Execute the same prepared statement the second time to check that # Execute the same prepared statement the second time to check that
# no internal structures used for handling the 'ALTER SERVER' statement # no internal structures used for handling the 'ALTER SERVER' statement

19
sql/share/errmsg-utf8.txt
View File

@ -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" 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" 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 ER_FOREIGN_SERVER_EXISTS
chi "您正在尝试创建的外来服务器%s已存在" chi "无法创建外部服务器'%s'，因为它已经存在"
eng "The foreign server, %s, you are trying to create already exists" eng "Cannot create foreign server '%s' as it already exists"
ger "Der entfernte Server %s, den Sie versuchen zu erzeugen, existiert schon" fin "Vieraata palvelinta '%s' ei voida luoda, koska se on jo olemassa"
spa "El servidor foráneo %s que intenta crear ya existe" 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 ER_FOREIGN_SERVER_DOESNT_EXIST
chi "您尝试引用的外部服务器名称不存在。数据源错误：%-.64s" chi "您尝试引用的外部服务器名称不存在。数据源错误：%-.64s"
eng "The foreign server name you are trying to reference does not exist. Data source error: %-.64s" eng "The foreign server name you are trying to reference does not exist. Data source error: %-.64s"