summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorNorio Akagi <redtree.dev1112@gmail.com>2022-05-09 21:08:33 -0700
committerDaniel Black <daniel@mariadb.org>2022-05-24 10:57:13 +1000
commitaf869493b4879b5c70db8005dadf59990c98014d (patch)
tree04c1fdf5baad29a9a28c7750e39be1854d25024b /mysql-test
parent3dd3dccb8e58053d063cb5a2299bf3964fa999cc (diff)
downloadmariadb-git-af869493b4879b5c70db8005dadf59990c98014d.tar.gz
MDEV-27892 Improve an error message for foreign server exists
Improve and add more languages for the ERROR 1476: Foreign Server already exists.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/main/create_drop_binlog.result2
-rw-r--r--mysql-test/main/create_drop_server.result6
2 files changed, 4 insertions, 4 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