try harder to link unix_socket plugin statically

fix unix_socket tests to work if unix_socket is a built-in

8 files changed, 9 insertions, 44 deletions

diff --git a/mysql-test/include/have_unix_socket.inc b/mysql-test/include/have_unix_socket.inc
index 4246b138e9d..7be828ac384 100644
--- a/mysql-test/include/have_unix_socket.inc
+++ b/mysql-test/include/have_unix_socket.inc
@@ -1,7 +1,8 @@
 --source include/not_embedded.inc
 
-if (!$AUTH_SOCKET_SO) {
-  skip No unix_socket plugin;
+if (`select count(*) = 0 from information_schema.plugins where plugin_name = 'unix_socket' and plugin_status='active'`)
+{
+  --skip Needs unix_socket plugin
 }
 
 if (!$USER) {
diff --git a/mysql-test/include/have_unix_socket.opt b/mysql-test/include/have_unix_socket.opt
new file mode 100644
index 00000000000..460e3a26ae2
--- /dev/null
+++ b/mysql-test/include/have_unix_socket.opt
@@ -0,0 +1 @@
+--plugin-load-add=$AUTH_SOCKET_SO --loose-enable-unix-socket
diff --git a/mysql-test/main/failed_auth_unixsocket.result b/mysql-test/main/failed_auth_unixsocket.result
index eb02479431b..98057c02b74 100644
--- a/mysql-test/main/failed_auth_unixsocket.result
+++ b/mysql-test/main/failed_auth_unixsocket.result
@@ -1,13 +1,7 @@
 update mysql.global_priv set priv=json_insert(priv, '$.plugin', 'unix_socket');
 flush privileges;
 connect(localhost,USER,,test,MASTER_PORT,MASTER_SOCKET);
-ERROR HY000: Plugin 'unix_socket' is not loaded
-ERROR HY000: Plugin 'unix_socket' is not loaded
-install plugin unix_socket soname 'auth_socket.so';
-flush privileges;
-connect(localhost,USER,,test,MASTER_PORT,MASTER_SOCKET);
 ERROR 28000: Access denied for user 'USER'@'localhost'
 ERROR 28000: Access denied for user 'USER'@'localhost'
 update mysql.global_priv set priv=json_compact(json_remove(priv, '$.plugin'));
 flush privileges;
-uninstall plugin unix_socket;
diff --git a/mysql-test/main/failed_auth_unixsocket.test b/mysql-test/main/failed_auth_unixsocket.test
index 01fb09e1c46..0dcc050a463 100644
--- a/mysql-test/main/failed_auth_unixsocket.test
+++ b/mysql-test/main/failed_auth_unixsocket.test
@@ -14,29 +14,13 @@ let $replace=Access denied for user '$USER';
 --echo connect(localhost,USER,,test,MASTER_PORT,MASTER_SOCKET);
 --replace_result $replace "Access denied for user 'USER'"
 --disable_query_log
---error ER_PLUGIN_IS_NOT_LOADED
-connect (fail,localhost,$USER);
---enable_query_log
-
---replace_result $replace "Access denied for user 'USER'"
---error ER_PLUGIN_IS_NOT_LOADED
-change_user $USER;
-
-eval install plugin unix_socket soname '$AUTH_SOCKET_SO';
-flush privileges;
-
---echo connect(localhost,USER,,test,MASTER_PORT,MASTER_SOCKET);
---replace_result $replace "Access denied for user 'USER'"
---disable_query_log
 --error ER_ACCESS_DENIED_NO_PASSWORD_ERROR
 connect (fail,localhost,$USER);
 --enable_query_log
 
---replace_result  $replace "Access denied for user 'USER'"
+--replace_result $replace "Access denied for user 'USER'"
 --error ER_ACCESS_DENIED_NO_PASSWORD_ERROR
 change_user $USER;
 
 update mysql.global_priv set priv=json_compact(json_remove(priv, '$.plugin'));
 flush privileges;
-uninstall plugin unix_socket;
-
diff --git a/mysql-test/suite/plugins/r/multiauth.result b/mysql-test/suite/plugins/r/multiauth.result
index d10744daf89..2fbea2ca0ee 100644
--- a/mysql-test/suite/plugins/r/multiauth.result
+++ b/mysql-test/suite/plugins/r/multiauth.result
@@ -1,4 +1,3 @@
-install soname 'auth_socket';
 install soname 'auth_ed25519';
 create user USER         identified via unix_socket OR mysql_native_password as password("GOOD");
 create user mysqltest1 identified via unix_socket OR mysql_native_password as password("good");
@@ -190,5 +189,4 @@ select user(), current_user(), database();
 user()	current_user()	database()
 mysqltest1@localhost	mysqltest1@%	test
 drop user mysqltest1;
-uninstall soname 'auth_socket';
 uninstall soname 'auth_ed25519';
diff --git a/mysql-test/suite/plugins/r/unix_socket.result b/mysql-test/suite/plugins/r/unix_socket.result
index 0e08794fbe6..a725583f201 100644
--- a/mysql-test/suite/plugins/r/unix_socket.result
+++ b/mysql-test/suite/plugins/r/unix_socket.result
@@ -1,4 +1,3 @@
-install plugin unix_socket soname 'auth_socket.so';
 #
 # with named user
 #
@@ -28,4 +27,3 @@ USER@localhost	@%	test
 #
 delete from mysql.user where user='';
 FLUSH PRIVILEGES;
-uninstall plugin unix_socket;
diff --git a/mysql-test/suite/plugins/t/multiauth.test b/mysql-test/suite/plugins/t/multiauth.test
index 083fefd6756..166ae30d3c7 100644
--- a/mysql-test/suite/plugins/t/multiauth.test
+++ b/mysql-test/suite/plugins/t/multiauth.test
@@ -10,7 +10,6 @@ if (!$AUTH_ED25519_SO) {
 }
 
 --let $plugindir=`SELECT @@global.plugin_dir`
-install soname 'auth_socket';
 install soname 'auth_ed25519';
 
 --let $try_auth=$MYSQL_TEST < $MYSQLTEST_VARDIR/tmp/peercred_test.txt 2>&1
@@ -192,6 +191,5 @@ show create user mysqltest1;
 --exec $try_auth -u mysqltest1 -pworks --plugin-dir=$plugindir/no
 drop user mysqltest1;
 
-uninstall soname 'auth_socket';
 uninstall soname 'auth_ed25519';
 --remove_file $MYSQLTEST_VARDIR/tmp/peercred_test.txt
diff --git a/mysql-test/suite/plugins/t/unix_socket.test b/mysql-test/suite/plugins/t/unix_socket.test
index bd0323c0274..9bb56aae290 100644
--- a/mysql-test/suite/plugins/t/unix_socket.test
+++ b/mysql-test/suite/plugins/t/unix_socket.test
@@ -1,13 +1,5 @@
 --source include/have_unix_socket.inc
 
-if (!$USER) {
-  skip USER variable is undefined;
-}
-
-let $plugindir=`SELECT @@global.plugin_dir`;
-
-eval install plugin unix_socket soname '$AUTH_SOCKET_SO';
-
 --echo #
 --echo # with named user
 --echo #
@@ -26,13 +18,13 @@ EOF
 --echo #
 --echo # name match = ok
 --echo #
---exec $MYSQL_TEST -u $USER --plugin-dir=$plugindir < $MYSQLTEST_VARDIR/tmp/peercred_test.txt
+--exec $MYSQL_TEST -u $USER < $MYSQLTEST_VARDIR/tmp/peercred_test.txt
 
 --echo #
 --echo # name does not match = failure
 --echo #
 --error 1
---exec $MYSQL_TEST -u foobar --plugin-dir=$plugindir < $MYSQLTEST_VARDIR/tmp/peercred_test.txt
+--exec $MYSQL_TEST -u foobar < $MYSQLTEST_VARDIR/tmp/peercred_test.txt
 
 --let $replace=drop user $USER
 --replace_result $replace "drop user USER"
@@ -45,16 +37,15 @@ grant SELECT ON test.* TO '' identified via unix_socket;
 --echo #
 --echo # name match = ok
 --echo #
---exec $MYSQL_TEST -u $USER --plugin-dir=$plugindir < $MYSQLTEST_VARDIR/tmp/peercred_test.txt
+--exec $MYSQL_TEST -u $USER < $MYSQLTEST_VARDIR/tmp/peercred_test.txt
 
 --echo #
 --echo # name does not match = failure
 --echo #
 --error 1
---exec $MYSQL_TEST -u foobar --plugin-dir=$plugindir < $MYSQLTEST_VARDIR/tmp/peercred_test.txt
+--exec $MYSQL_TEST -u foobar < $MYSQLTEST_VARDIR/tmp/peercred_test.txt
 
 # restoring mysql.user to the original state.
 delete from mysql.user where user='';
 FLUSH PRIVILEGES;
-uninstall plugin unix_socket;
 --remove_file $MYSQLTEST_VARDIR/tmp/peercred_test.txt