diff options
Diffstat (limited to 'mysql-test/suite/plugins')
| -rw-r--r-- | mysql-test/suite/plugins/t/server_audit.test | 1 | ||||
| -rw-r--r-- | mysql-test/suite/plugins/t/unix_socket.test | 18 |
2 files changed, 2 insertions, 17 deletions
diff --git a/mysql-test/suite/plugins/t/server_audit.test b/mysql-test/suite/plugins/t/server_audit.test index f62980259c0..f63c8022392 100644 --- a/mysql-test/suite/plugins/t/server_audit.test +++ b/mysql-test/suite/plugins/t/server_audit.test @@ -14,6 +14,7 @@ set global server_audit_logging=on; connect (con1,localhost,root,,mysql); connection default; disconnect con1; +--sleep 2 --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT --error ER_ACCESS_DENIED_ERROR connect (con1,localhost,no_such_user,,mysql); diff --git a/mysql-test/suite/plugins/t/unix_socket.test b/mysql-test/suite/plugins/t/unix_socket.test index 5869e2717c9..2c1af9fb1da 100644 --- a/mysql-test/suite/plugins/t/unix_socket.test +++ b/mysql-test/suite/plugins/t/unix_socket.test @@ -1,20 +1,4 @@ ---source include/not_embedded.inc -# If we run this as root, $USER gets authenticated as the `root' user, and we -# get .result differences from CURRENT_USER(). ---source include/not_as_root.inc - -# The previous check verifies that the user does not have root permissions. -# However in some cases tests are run under a user named 'root', -# even although this user does not have real root permissions. -# This test should be skipped in this case, since it does not expect -# that there are records in mysql.user where user=<username> -if ($USER=="root") { - skip Cannot be run by user named 'root' even if it does not have all privileges; -} - -if (!$AUTH_SOCKET_SO) { - skip No auth_socket plugin; -} +--source include/have_unix_socket.inc if (!$USER) { skip USER variable is undefined; |