diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-08-01 19:57:36 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-08-01 19:57:36 +0200 |
| commit | 6ed4a283fd18a3dbbd7042edb61e12fbd1e3f366 (patch) | |
| tree | 8e85e872502f73ea456bf2d290d6e0c86547af71 /mysql-test/suite/mtr2 | |
| parent | bd39599668691415c42ada6022f567a753769a1c (diff) | |
| download | mariadb-git-6ed4a283fd18a3dbbd7042edb61e12fbd1e3f366.tar.gz | |
MDEV-399 Combinations defined in the base suite cannot be skipped by overlay
When appliying parent combinations to the overlay,
filter them through the %skip_combinations using the overlayed filename
Diffstat (limited to 'mysql-test/suite/mtr2')
| -rw-r--r-- | mysql-test/suite/mtr2/combinations | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/suite/mtr2/combinations b/mysql-test/suite/mtr2/combinations new file mode 100644 index 00000000000..b26eab8ce1d --- /dev/null +++ b/mysql-test/suite/mtr2/combinations @@ -0,0 +1,5 @@ +[1st] +lock-wait-timeout=5 + +[2nd] +lock-wait-timeout=3 |