Merge branch 'mysql-8.4' into mysql-trunk

Change-Id: I477cbe5fb62865276d395014f90fd48bca4de62e

Author: zmur

mysql-test/collections/default.weekly-ndbcluster

@@ -17,7 +17,9 @@ perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=90 --debug
 # ps-protocol
 perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=90 --debug-server  --comment=ndbcluster_ps --vardir=var-ndbcluster-ps --ps-protocol --suite=ndbcluster
 # with security features in ndb cluster: encrypted backup, TDE, TLS.
-perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=90 --debug-server  --comment=ndbcluster-sec --vardir=var-ndbcluster-sec --suite=ndbcluster --defaults-extra-file=suite/ndb/secure.cnf
+# on el7 and solaris no support for NDB TLS
+perl mysql-test-run.pl --exclude-platform=_el7-|_solaris11- --force --timer  --big-test --testcase-timeout=90 --debug-server  --comment=ndbcluster-sec --vardir=var-ndbcluster-sec --suite=ndbcluster --defaults-extra-file=suite/ndb/secure.cnf
+perl mysql-test-run.pl --platform=_el7-|_solaris11- --force --timer  --big-test --testcase-timeout=90 --debug-server  --comment=ndbcluster-sec-notls --vardir=var-ndbcluster-sec-notls --suite=ndbcluster --defaults-extra-file=suite/ndb/secure-notls.cnf
 
 # 3. Run the suites that are not part of the default - funcs_2, stress, jp, nist
 perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=60 --debug-server  --comment=funcs2-debug  --vardir=var-funcs2-big  --suite=funcs_2

mysql-test/collections/default.weekly.basic

@@ -15,7 +15,9 @@ perl mysql-test-run.pl --debug-server --force --timer --testcase-timeout=60 --su
 # If no Ndb support, no tests will be attempted.
 perl mysql-test-run.pl --debug-server --force --timer --testcase-timeout=60 --suite-timeout=600  --comment=ndb  --vardir=var-ndb  --report-features --no-skip --with-ndb-only
 # with security features in ndb cluster: encrypted backup, TDE, TLS.
-perl mysql-test-run.pl --debug-server --force --timer --testcase-timeout=60 --suite-timeout=600  --comment=ndb-sec  --vardir=var-ndb-sec  --report-features --no-skip --with-ndb-only --defaults-extra-file=suite/ndb/secure.cnf
+# on el7 and solaris no support for NDB TLS
+perl mysql-test-run.pl --exclude-platform=_el7-|_solaris11- --debug-server --force --timer --testcase-timeout=60 --suite-timeout=600  --comment=ndb-sec  --vardir=var-ndb-sec  --report-features --no-skip --with-ndb-only --defaults-extra-file=suite/ndb/secure.cnf
+perl mysql-test-run.pl --platform=_el7-|_solaris11- --debug-server --force --timer --testcase-timeout=60 --suite-timeout=600  --comment=ndb-sec-notls  --vardir=var-ndb-sec-notls  --report-features --no-skip --with-ndb-only --defaults-extra-file=suite/ndb/secure-notls.cnf
 
 ############END OF SECTION1(DEFAULT SUITES) ######################
 

mysql-test/suite/ndb/secure-notls.cnf

@@ -0,0 +1,2 @@
+!include encrypted_backup.cnf
+!include encrypted_filesystem.cnf