diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-12-29 13:23:18 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-12-29 13:23:18 +0100 |
| commit | 4a5d25c338a5d1d2cc16343380193d6bf25ae6ae (patch) | |
| tree | 73b84a9c8f3d5e3e3383fa79465b11f9ded512d3 /storage/sphinx | |
| parent | 48dc7cc66ef5b69fcf28ec0b2ecf0338c188cf4e (diff) | |
| parent | c13b5011629b5ff7b969d648265002e4d1ba94c2 (diff) | |
| download | mariadb-git-4a5d25c338a5d1d2cc16343380193d6bf25ae6ae.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'storage/sphinx')
| -rw-r--r-- | storage/sphinx/mysql-test/sphinx/disabled.def | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/sphinx/mysql-test/sphinx/disabled.def b/storage/sphinx/mysql-test/sphinx/disabled.def new file mode 100644 index 00000000000..a85b8b71e52 --- /dev/null +++ b/storage/sphinx/mysql-test/sphinx/disabled.def @@ -0,0 +1,2 @@ +sphinx : MDEV-10986, MDEV-10985 +union-5539 : MDEV-10986, MDEV-10985 |