diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-22 10:11:08 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-22 10:11:08 +0300 |
| commit | 641f09398fdc37c6f3b0ec6731d5f246ecf24866 (patch) | |
| tree | 0c6e4a290119928a42ad6ffe9d4bdb372d5482f1 /mysql-test/suite/maria | |
| parent | f43370baf3b00733ddfe0f704520a07092fc9a0e (diff) | |
| parent | 82d5994520c239da1b6edf1b24e08138ae0c753d (diff) | |
| download | mariadb-git-641f09398fdc37c6f3b0ec6731d5f246ecf24866.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/suite/maria')
8 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/suite/maria/bulk_insert_crash.opt b/mysql-test/suite/maria/bulk_insert_crash.opt index f85a8d9c973..ecc7a8e8d92 100644 --- a/mysql-test/suite/maria/bulk_insert_crash.opt +++ b/mysql-test/suite/maria/bulk_insert_crash.opt @@ -1,2 +1,2 @@ ---skip-stack-trace --skip-core-file +--loose-skip-stack-trace --skip-core-file --default-storage-engine=Aria diff --git a/mysql-test/suite/maria/maria-gis-recovery.opt b/mysql-test/suite/maria/maria-gis-recovery.opt index 58d0d012c54..839411b10b8 100644 --- a/mysql-test/suite/maria/maria-gis-recovery.opt +++ b/mysql-test/suite/maria/maria-gis-recovery.opt @@ -1 +1 @@ ---skip-stack-trace --skip-core-file --loose-aria-log-dir-path=$MYSQLTEST_VARDIR/tmp +--loose-skip-stack-trace --skip-core-file --loose-aria-log-dir-path=$MYSQLTEST_VARDIR/tmp diff --git a/mysql-test/suite/maria/maria-recovery-big-master.opt b/mysql-test/suite/maria/maria-recovery-big-master.opt index d24a11c924f..f5119bbce3f 100644 --- a/mysql-test/suite/maria/maria-recovery-big-master.opt +++ b/mysql-test/suite/maria/maria-recovery-big-master.opt @@ -1 +1 @@ ---skip-stack-trace --skip-core-file --max_allowed_packet=32000000 +--loose-skip-stack-trace --skip-core-file --max_allowed_packet=32000000 diff --git a/mysql-test/suite/maria/maria-recovery-bitmap-master.opt b/mysql-test/suite/maria/maria-recovery-bitmap-master.opt index 425fda95086..590d44a6d12 100644 --- a/mysql-test/suite/maria/maria-recovery-bitmap-master.opt +++ b/mysql-test/suite/maria/maria-recovery-bitmap-master.opt @@ -1 +1 @@ ---skip-stack-trace --skip-core-file +--loose-skip-stack-trace --skip-core-file diff --git a/mysql-test/suite/maria/maria-recovery-master.opt b/mysql-test/suite/maria/maria-recovery-master.opt index 58d0d012c54..839411b10b8 100644 --- a/mysql-test/suite/maria/maria-recovery-master.opt +++ b/mysql-test/suite/maria/maria-recovery-master.opt @@ -1 +1 @@ ---skip-stack-trace --skip-core-file --loose-aria-log-dir-path=$MYSQLTEST_VARDIR/tmp +--loose-skip-stack-trace --skip-core-file --loose-aria-log-dir-path=$MYSQLTEST_VARDIR/tmp diff --git a/mysql-test/suite/maria/maria-recovery-rtree-ft-master.opt b/mysql-test/suite/maria/maria-recovery-rtree-ft-master.opt index 425fda95086..590d44a6d12 100644 --- a/mysql-test/suite/maria/maria-recovery-rtree-ft-master.opt +++ b/mysql-test/suite/maria/maria-recovery-rtree-ft-master.opt @@ -1 +1 @@ ---skip-stack-trace --skip-core-file +--loose-skip-stack-trace --skip-core-file diff --git a/mysql-test/suite/maria/maria-recovery2-master.opt b/mysql-test/suite/maria/maria-recovery2-master.opt index ca9560676a5..eeb6de091fd 100644 --- a/mysql-test/suite/maria/maria-recovery2-master.opt +++ b/mysql-test/suite/maria/maria-recovery2-master.opt @@ -1 +1 @@ ---skip-stack-trace --skip-core-file --loose-aria-log-dir-path=$MYSQLTEST_VARDIR/tmp --myisam-recover-options= +--loose-skip-stack-trace --skip-core-file --loose-aria-log-dir-path=$MYSQLTEST_VARDIR/tmp --myisam-recover-options= diff --git a/mysql-test/suite/maria/maria-recovery3-master.opt b/mysql-test/suite/maria/maria-recovery3-master.opt index 58d0d012c54..839411b10b8 100644 --- a/mysql-test/suite/maria/maria-recovery3-master.opt +++ b/mysql-test/suite/maria/maria-recovery3-master.opt @@ -1 +1 @@ ---skip-stack-trace --skip-core-file --loose-aria-log-dir-path=$MYSQLTEST_VARDIR/tmp +--loose-skip-stack-trace --skip-core-file --loose-aria-log-dir-path=$MYSQLTEST_VARDIR/tmp |