diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-10-15 12:59:13 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-15 12:59:13 +0200 |
| commit | f62c12b405ba7ec80b8e2490856b83c6f5899211 (patch) | |
| tree | 010605c7f145da6ea6ac14b39abc4cf700d619b1 /mysql-test/disabled.def | |
| parent | f947f73b2b6d2bd246b81a9038224d2a85777520 (diff) | |
| parent | f1afc003eefe0aafd3e070c7453d9e029d8445a8 (diff) | |
| download | mariadb-git-f62c12b405ba7ec80b8e2490856b83c6f5899211.tar.gz | |
Merge 10.0.14 into 10.1
Diffstat (limited to 'mysql-test/disabled.def')
| -rw-r--r-- | mysql-test/disabled.def | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/disabled.def b/mysql-test/disabled.def index d2e839fa39a..c0aed63e8be 100644 --- a/mysql-test/disabled.def +++ b/mysql-test/disabled.def @@ -21,4 +21,5 @@ ssl_crl_clients_valid : broken upstream ssl_crl : broken upstream ssl_crl_clrpath : broken upstream innodb-wl5522-debug-zip : broken upstream -innodb_bug12902967 : broken upstream
\ No newline at end of file +innodb_bug12902967 : broken upstream +file_contents : MDEV-6526 these files are not installed anymore |