diff options
author | Sergei Golubchik <serg@mariadb.org> | 2016-05-04 15:23:26 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2016-05-04 15:23:26 +0200 |
commit | 87e3e67f434628768b5125fbab7e8862fa60da1a (patch) | |
tree | df19b8bcac9988d83270ed1da05f765bfc4e8624 /debian | |
parent | 80da57cc4f0c717ee3e01ac5abccc859b88a2fbf (diff) | |
parent | cee9ab9d85a8d75290b0d60bc7af26c8cf179a1d (diff) | |
download | mariadb-git-87e3e67f434628768b5125fbab7e8862fa60da1a.tar.gz |
Merge branch '10.0' into 10.1
Diffstat (limited to 'debian')
-rw-r--r-- | debian/mariadb-test-10.1.dirs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/debian/mariadb-test-10.1.dirs b/debian/mariadb-test-10.1.dirs index 1a488d98195..b21c5b780f7 100644 --- a/debian/mariadb-test-10.1.dirs +++ b/debian/mariadb-test-10.1.dirs @@ -44,8 +44,6 @@ usr/share/mysql/mysql-test/suite/jp/r usr/share/mysql/mysql-test/suite/jp/include usr/share/mysql/mysql-test/suite/jp/std_data usr/share/mysql/mysql-test/suite/maria -usr/share/mysql/mysql-test/suite/maria/t -usr/share/mysql/mysql-test/suite/maria/r usr/share/mysql/mysql-test/suite/funcs_2 usr/share/mysql/mysql-test/suite/funcs_2/lib usr/share/mysql/mysql-test/suite/funcs_2/t |