revision-id: 9c810ff82fd48390f2d014e3dbf6907a38d2eb82 (mariadb-10.1.32-23-g9c810ff82fd) parent(s): 32b9e0dab7fbc6e9c24fa94266d02f2489207ceb e2e1483dd2e7b2b038a862a1f52d6ed220ef348d author: Jan Lindström committer: Jan Lindström timestamp: 2018-04-05 17:15:02 +0300 message: Merge branch '10.1' of github.com:MariaDB/server into 10.1 mysql-test/suite/galera/disabled.def | 1 - mysql-test/suite/galera/r/MW-284.result | 3 +++ mysql-test/suite/galera/t/MW-284.test | 9 ++++++++- sql/sql_parse.cc | 6 ++++-- 4 files changed, 15 insertions(+), 4 deletions(-) diff --cc mysql-test/suite/galera/disabled.def index 8024d9cd452,76e6d588be3..96cafe25fba --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@@ -24,7 -25,23 +24,6 @@@ galera_gcache_recover : MDEV-13549 Gale galera_gcache_recover_full_gcache : MDEV-13549 Galera test failures galera_gcache_recover_manytrx : MDEV-13549 Galera test failures galera_ist_mysqldump : MDEV-13549 Galera test failures -mysql-wsrep#31 : MDEV-13549 Galera test failures -galera_wsrep_desync_wsrep_on : MDEV-13549 Galera test failures galera_ssl_upgrade : MDEV-13549 Galera test failures - MW-284 : MDEV-13549 Galera test failures 10.1 -mysql-wsrep#33 : MDEV-13549 Galera test failures -galera_var_auto_inc_control_on : MDEV-13549 Galera test failures -MW-44 : MDEV-13549 Galera test failures -galera_var_retry_autocommit : MDEV-13549 Galera test failures -pxc-421 : MDEV-13549 Galera test failures -lp1376747-2 : MDEV-13549 Galera test failures -lp1376747 : MDEV-13549 Galera test failures -galera_toi_ddl_nonconflicting : MDEV-13549 Galera test failures -galera_parallel_simple : MDEV-13549 Galera test failures -galera_admin : MDEV-13549 Galera test failures -galera_pc_ignore_sb : MDEV-13549 Galera test failures 10.1 -galera_lock_table : MDEV-13549 Galera test failures 10.1 -galera_gtid : MDEV-13549 Galera test failures 10.1 -galera_unicode_identifiers : MDEV-13549 Galera test failures 10.1 -galera.galera_gcs_fc_limit : MDEV-13549 Galera test failures 10.1 galera.MW-329 : wsrep_local_replays not stable galera.MW-328A : have_deadlocks test not stable