revision-id: f7d3c9950377092b260e09599ec1e5b5b34fa250 (mariadb-10.1.32-74-gf7d3c995037) parent(s): ed1d9c802dc3568487f0154df46c71f1bb31782c 74f22939dcb8f3a4d574f84f1296ac77f28a6735 author: Jan Lindström committer: Jan Lindström timestamp: 2018-04-30 07:37:34 +0300 message: Merge branch 'MDEV-15803' of https://github.com/codership/mariadb-server into codership-MDEV-15803 mysql-test/suite/galera/disabled.def | 1 - .../galera/r/galera_var_auto_inc_control_on.result | 18 ++------------ .../galera/t/galera_var_auto_inc_control_on.test | 29 ++++++++++++---------- 3 files changed, 18 insertions(+), 30 deletions(-) diff --cc mysql-test/suite/galera/disabled.def index 738e1236b89,294efa9c444..513f9ac2c88 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@@ -26,5 -26,7 +26,4 @@@ galera_gcache_recover_manytrx : MDEV-13 galera_ssl_upgrade : MDEV-13549 Galera test failures galera.MW-329 : wsrep_local_replays not stable galera.MW-328A : have_deadlocks test not stable - galera_var_auto_inc_control_on : MDEV-15803 Test failure on galera.galera_var_auto_inc_control_on -galera_var_retry_autocommit : MDEV-15794 Test failure on galera.galera_var_retry_autocommit query_cache : MDEV-15805 Test failure on galera.query_cache -