diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-25 07:58:46 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-25 07:59:25 +0300 |
commit | 9477a2a9ba17c0db362e2bb39d5048e369096f39 (patch) | |
tree | 822c938585709a1bdf2262ece3167f6e0a911e94 /mysql-test/main/disabled.def | |
parent | e3fb8e95692fcb554d83a76c5dd6e0b9a6c62728 (diff) | |
parent | f033fbd9f2366619c52186a1a902066495539141 (diff) | |
download | mariadb-git-9477a2a9ba17c0db362e2bb39d5048e369096f39.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/main/disabled.def')
-rw-r--r-- | mysql-test/main/disabled.def | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/main/disabled.def b/mysql-test/main/disabled.def index fcba3054972..b489139a59f 100644 --- a/mysql-test/main/disabled.def +++ b/mysql-test/main/disabled.def @@ -21,4 +21,3 @@ innodb-wl5522-debug-zip : broken upstream innodb_bug12902967 : broken upstream file_contents : MDEV-6526 these files are not installed anymore max_statement_time : cannot possibly work, depends on timing -cte_recursive : Merge problem (MDEV-15575) |