diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
commit | a2a2e32c02643a0cec111511220227703fda1cd5 (patch) | |
tree | 69cc2b631234c2a8e026b9cd4d72676c61c594df /mysql-test/collections | |
parent | Releasing progress-linux version 1:10.11.8-1~progress7.99u1. (diff) | |
download | mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.tar.xz mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.zip |
Merging upstream version 1:11.4.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mysql-test/collections')
-rw-r--r-- | mysql-test/collections/buildbot_suites.bat | 2 | ||||
-rw-r--r-- | mysql-test/collections/smoke_test | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/collections/buildbot_suites.bat b/mysql-test/collections/buildbot_suites.bat index 13ea5ddb..86a2c08f 100644 --- a/mysql-test/collections/buildbot_suites.bat +++ b/mysql-test/collections/buildbot_suites.bat @@ -1,6 +1,6 @@ if "%MTR_PARALLEL%"=="" set MTR_PARALLEL=%NUMBER_OF_PROCESSORS% perl mysql-test-run.pl --force --suite-timeout=120 --max-test-fail=10 --retry=3 --suite=^ -vcol,gcol,perfschema,^ +vcol,gcol,period,perfschema,^ main,^ innodb,^ versioning,^ diff --git a/mysql-test/collections/smoke_test b/mysql-test/collections/smoke_test index deaf38be..6a949f03 100644 --- a/mysql-test/collections/smoke_test +++ b/mysql-test/collections/smoke_test @@ -30,7 +30,6 @@ handler.interface heap.heap innodb.innodb innodb.autoinc_persist -innodb.innodb_defrag_binlog innodb.innodb_mysql innodb.monitor innodb.purge |