Skip to content

Commit e0fc6dc

Browse files
author
Alexander Barkov
authored
Merge pull request #244 from hholzgra/hartmut-MDEV-726
MDEV-726 - CREATE and ALTER SERVER need to lowercase host name
2 parents 4504986 + 86637b2 commit e0fc6dc

File tree

3 files changed

+19
-0
lines changed

3 files changed

+19
-0
lines changed

mysql-test/r/create_drop_server.result

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,12 @@ SELECT server_name, username, db FROM mysql.servers;
3535
server_name username db
3636
server_1 mysqltest_1 test4
3737
DROP SERVER server_1;
38+
CREATE SERVER server_1 FOREIGN DATA WRAPPER mysql OPTIONS (USER 'Remote', HOST 'Server.Example.Com', DATABASE 'test');
39+
SELECT Host FROM mysql.servers WHERE Server_Name = 'server_1';
40+
Host
41+
server.example.com
42+
ALTER SERVER server_1 OPTIONS(HOST 'Server.Example.Org');
43+
SELECT Host FROM mysql.servers WHERE Server_Name = 'server_1';
44+
Host
45+
server.example.org
46+
DROP SERVER server_1;

mysql-test/t/create_drop_server.test

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,12 @@ CREATE OR REPLACE SERVER IF NOT EXISTS server_1 FOREIGN DATA WRAPPER mysql OPTIO
2323
CREATE OR REPLACE SERVER server_1 FOREIGN DATA WRAPPER mysql OPTIONS (USER 'mysqltest_1', HOST 'localhost', DATABASE 'test4');
2424
SELECT server_name, username, db FROM mysql.servers;
2525
DROP SERVER server_1;
26+
27+
28+
# MDEV-726 convert host names to lowercase
29+
30+
CREATE SERVER server_1 FOREIGN DATA WRAPPER mysql OPTIONS (USER 'Remote', HOST 'Server.Example.Com', DATABASE 'test');
31+
SELECT Host FROM mysql.servers WHERE Server_Name = 'server_1';
32+
ALTER SERVER server_1 OPTIONS(HOST 'Server.Example.Org');
33+
SELECT Host FROM mysql.servers WHERE Server_Name = 'server_1';
34+
DROP SERVER server_1;

sql/sql_yacc.yy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2684,6 +2684,7 @@ server_option:
26842684
{
26852685
MYSQL_YYABORT_UNLESS(Lex->server_options.host.str == 0);
26862686
Lex->server_options.host= $2;
2687+
my_casedn_str(system_charset_info, Lex->server_options.host.str);
26872688
}
26882689
| DATABASE TEXT_STRING_sys
26892690
{

0 commit comments

Comments
 (0)