Skip to content

Commit 390522a

Browse files
committed
WL#9306: X Protocol connectivity through unix sockets
Follow up fix: mysqlxtest is missing description of "-v" command line option also connection_require_secure_transport.test uses wrong option when running mysqlxtest. Reviewed-by: Andrzej Religa <[email protected]>
1 parent 1e5d758 commit 390522a

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@ static void ignore_traces_from_libraries(enum loglevel ll, const char *format, v
111111

112112
static void replace_all(std::string &input, const std::string &to_find, const std::string &change_to)
113113
{
114+
if (to_find.empty())
115+
return;
116+
114117
size_t position = input.find(to_find);
115118

116119
while (std::string::npos != position)
@@ -2758,6 +2761,7 @@ class My_command_line_options : public Command_line_options
27582761
std::cout << "--tls-version TLS version to use\n";
27592762
std::cout << "--connect-expired-password Allow expired password\n";
27602763
std::cout << "--quiet Don't print out messages sent\n";
2764+
std::cout << "-vVARIABLE_NAME=VALUE Set variable VARIABLE_NAME from command line\n";
27612765
std::cout << "--fatal-errors=<0|1> Mysqlxtest is started with ignoring or stopping on fatal error\n";
27622766
std::cout << "-B, --bindump Dump binary representation of messages sent, in format suitable for\n";
27632767
std::cout << "--verbose Enable extra verbose messages\n";

rapid/plugin/x/tests/mtr/r/connection_require_secure_transport.result

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ call mtr.add_suppression("Plugin mysqlx reported: .Failed at SSL configuration:
33
call mtr.add_suppression("Plugin mysqlx reported: .SSL_CTX_load_verify_locations failed.");
44
call mtr.add_suppression("Plugin mysqlx reported: ....: Unsuccessful login attempt: Secure transport required. To log in you must use TCP.SSL or UNIX socket connection");
55
Wait for the X Plugin before restarting the server
6+
Mysqlx.Ok {
7+
msg: "bye!"
8+
}
69
ok
710
Test different connection types while secure transport when the server was started with this flag set to ON
811
# restart: --require_secure_transport=ON

rapid/plugin/x/tests/mtr/t/connection_require_secure_transport.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ EOF
4343
call mtr.add_suppression("Plugin mysqlx reported: ....: Unsuccessful login attempt: Secure transport required. To log in you must use TCP.SSL or UNIX socket connection");
4444

4545
--echo Wait for the X Plugin before restarting the server
46-
--exec $MYSQLXTEST -n -uroot --password='' --file=$MYSQL_TMP_DIR/check_connection.tmp 2>&1
46+
--exec $MYSQLXTEST -q -uroot --password='' --file=$MYSQL_TMP_DIR/check_connection.tmp 2>&1
4747

4848
--echo Test different connection types while secure transport when the server was started with this flag set to ON
4949
# Cases when the flag is dynamicly changes is tests in related x test file (for example connection_ssl.test)

0 commit comments

Comments
 (0)