diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-19 15:23:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-19 15:23:21 +0300 |
| commit | d71a8855eef34e5792b4939ee5e88e6625080d91 (patch) | |
| tree | ed4d5b9916395132fa56675eb58a9229d0672bbe /mysql-test/main/disabled.def | |
| parent | 419385dbf10453b17a370fd9e5bd934d09e0b440 (diff) | |
| parent | 66c14d3a8d31e877ede75d23f96dc61a4aa12971 (diff) | |
| download | mariadb-git-d71a8855eef34e5792b4939ee5e88e6625080d91.tar.gz | |
Merge 10.2 to 10.3
Temporarily disable main.cte_recursive due to hang in
an added test related to MDEV-15575.
Diffstat (limited to 'mysql-test/main/disabled.def')
| -rw-r--r-- | mysql-test/main/disabled.def | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/main/disabled.def b/mysql-test/main/disabled.def index b489139a59f..fcba3054972 100644 --- a/mysql-test/main/disabled.def +++ b/mysql-test/main/disabled.def @@ -21,3 +21,4 @@ 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) |