diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-06 09:40:39 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-06 09:40:39 +0200 |
| commit | df563e0c037f9b2cdb22e145575f92a121b4b529 (patch) | |
| tree | 31d39796cebcef916eb7e0888537c18f946170ff /storage/myisammrg | |
| parent | e058a251c10350f3727ca1df022dc5786933535b (diff) | |
| parent | bdfe2784d5b73a1fdcdacb3d9adcc9dc71af344b (diff) | |
| download | mariadb-git-df563e0c037f9b2cdb22e145575f92a121b4b529.tar.gz | |
Merge 10.2 into 10.3
main.derived_cond_pushdown: Move all 10.3 tests to the end,
trim trailing white space, and add an "End of 10.3 tests" marker.
Add --sorted_result to tests where the ordering is not deterministic.
main.win_percentile: Add --sorted_result to tests where the
ordering is no longer deterministic.
Diffstat (limited to 'storage/myisammrg')
| -rw-r--r-- | storage/myisammrg/mysql-test/storage_engine/disabled.def | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/myisammrg/mysql-test/storage_engine/disabled.def b/storage/myisammrg/mysql-test/storage_engine/disabled.def index 227e33029d8..55fc952c20e 100644 --- a/storage/myisammrg/mysql-test/storage_engine/disabled.def +++ b/storage/myisammrg/mysql-test/storage_engine/disabled.def @@ -1,3 +1,4 @@ insert_delayed : MDEV-12880 - INSERT DELAYED is not detected as inapplicable to a table under lock lock_concurrent : MDEV-12882 - Assertion failure select_high_prio : MDEV-12885 - MDL_SHARED_READ_ONLY is taken instead of MDL_SHARED_READ +lock : MDEV-17145 (Unexpected ER_LOCK_WAIT_TIMEOUT) |