revision-id: 62aaabfe56816af15f381d166173c276511d9080 (mariadb-10.1.32-23-g62aaabfe568) parent(s): 32b9e0dab7fbc6e9c24fa94266d02f2489207ceb afbd45a791a4a8cde19e0b3d5b883f79a2ccc305 author: Jan Lindström committer: Jan Lindström timestamp: 2018-04-05 17:17:46 +0300 message: Merge branch '10.1' into bb-10.1-galera 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(-)