From 736d75d4550c2d2330043c0e381186980e06e70d Mon Sep 17 00:00:00 2001 From: Teemu Ollakka Date: Mon, 18 Sep 2017 16:22:32 +0300 Subject: [PATCH] MW-406 Bumped up the wsrep patch version (5.6.37-25.21) --- cmake/wsrep.cmake | 2 +- sql/sql_parse.cc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/wsrep.cmake b/cmake/wsrep.cmake index 1bd1ca51b35..cc6627d1eea 100644 --- a/cmake/wsrep.cmake +++ b/cmake/wsrep.cmake @@ -18,7 +18,7 @@ # so WSREP_VERSION is produced regardless # Set the patch version -SET(WSREP_PATCH_VERSION "20") +SET(WSREP_PATCH_VERSION "21") # MariaDB addition: Revision number of the last revision merged from # codership branch visible in @@visible_comment. diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index b09fa1e7b17..6fe25961e65 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2598,7 +2598,8 @@ mysql_execute_command(THD *thd) } /* endif unlikely slave */ #endif #ifdef WITH_WSREP - if (WSREP(thd)) { + if (WSREP(thd)) + { /* change LOCK TABLE WRITE to transaction */