Merge branch '10.4' into 10.5

3 files changed, 2 insertions, 17 deletions

diff --git a/mysql-test/suite/plugins/r/multiauth,aix.rdiff b/mysql-test/suite/plugins/r/multiauth,aix.rdiff
deleted file mode 100644
index 0a2570cbd89..00000000000
--- a/mysql-test/suite/plugins/r/multiauth,aix.rdiff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/mysql-test/suite/plugins/r/multiauth.result b/mysql-test/suite/plugins/r/multiauth.result
-index aed46ac8964..24bb0a24f03 100644
---- a/mysql-test/suite/plugins/r/multiauth.result
-+++ b/mysql-test/suite/plugins/r/multiauth.result
-@@ -181,7 +181,8 @@ show create user mysqltest1;
- CREATE USER for mysqltest1@%
- CREATE USER `mysqltest1`@`%` IDENTIFIED VIA ed25519 USING 'F4aF8bw7130VaRbdLCl4f/P/wkjDmgJXwWvpJ5gmsZc'
- # no plugin = failure
--mysqltest: Could not open connection 'default': 1045 Plugin client_ed25519 could not be loaded: <PLUGINDIR>/no/client_ed25519.so: cannot open shared object file: No such file or directory
-+mysqltest: Could not open connection 'default': 1045 Plugin client_ed25519 could not be loaded: Could not load module <PLUGINDIR>/no/client_ed25519.so.
-+System error: No such file or directory
- alter user mysqltest1 identified via ed25519 as password("good") OR mysql_native_password as password("works");
- show create user mysqltest1;
- CREATE USER for mysqltest1@%
diff --git a/mysql-test/suite/plugins/r/multiauth.result b/mysql-test/suite/plugins/r/multiauth.result
index 8ae45d1fb9f..73241619008 100644
--- a/mysql-test/suite/plugins/r/multiauth.result
+++ b/mysql-test/suite/plugins/r/multiauth.result
@@ -181,7 +181,7 @@ show create user mysqltest1;
 CREATE USER for mysqltest1@%
 CREATE USER `mysqltest1`@`%` IDENTIFIED VIA ed25519 USING 'F4aF8bw7130VaRbdLCl4f/P/wkjDmgJXwWvpJ5gmsZc'
 # no plugin = failure
-mysqltest: Could not open connection 'default': 1045 Plugin client_ed25519 could not be loaded: <PLUGINDIR>/no/client_ed25519.so: cannot open shared object file: No such file or directory
+mysqltest: Could not open connection 'default': 1045 Plugin client_ed25519 could not be loaded: no such file
 alter user mysqltest1 identified via ed25519 as password("good") OR mysql_native_password as password("works");
 show create user mysqltest1;
 CREATE USER for mysqltest1@%
diff --git a/mysql-test/suite/plugins/t/multiauth.test b/mysql-test/suite/plugins/t/multiauth.test
index f0eea21ee76..4bf3424ee9d 100644
--- a/mysql-test/suite/plugins/t/multiauth.test
+++ b/mysql-test/suite/plugins/t/multiauth.test
@@ -1,5 +1,4 @@
 --source include/not_ubsan.inc
---source include/platform.inc
 
 let $REGEX_VERSION_ID=/$mysql_get_server_version/VERSION_ID/;
 let $REGEX_PASSWORD_LAST_CHANGED=/password_last_changed": [0-9]*/password_last_changed": #/;
@@ -187,7 +186,7 @@ eval $dreplace, mysqltest1;
 create user mysqltest1 identified via ed25519 as password("good");
 show create user mysqltest1;
 --echo # no plugin = failure
---replace_result $plugindir <PLUGINDIR>
+--replace_regex /loaded: .*client_ed25519.so: cannot open shared object file: No such file or directory/loaded: no such file/ /loaded: Cannot open.*client_ed25519.so./loaded: no such file/ /loaded: .*Could not load module.*directory/loaded: no such file/
 --error 1
 --exec $try_auth -u mysqltest1 -pgood --plugin-dir=$plugindir/no
 alter user mysqltest1 identified via ed25519 as password("good") OR mysql_native_password as password("works");