1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MW-406 Bumped up the wsrep patch version (5.6.37-25.21)

Browse Source
This commit is contained in:
Teemu Ollakka 2017-09-18 16:22:32 +03:00 committed by Jan Lindström
parent b5802888e3
commit 736d75d455
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/wsrep.cmake
View File

@ -18,7 +18,7 @@
# so WSREP_VERSION is produced regardless # so WSREP_VERSION is produced regardless
# Set the patch version # Set the patch version
SET(WSREP_PATCH_VERSION "20") SET(WSREP_PATCH_VERSION "21")
# MariaDB addition: Revision number of the last revision merged from # MariaDB addition: Revision number of the last revision merged from
# codership branch visible in @@visible_comment. # codership branch visible in @@visible_comment.

3
sql/sql_parse.cc
View File

@ -2598,7 +2598,8 @@ mysql_execute_command(THD *thd)
} /* endif unlikely slave */ } /* endif unlikely slave */
#endif #endif
#ifdef WITH_WSREP #ifdef WITH_WSREP
if (WSREP(thd)) { if (WSREP(thd))
{
/* /*
change LOCK TABLE WRITE to transaction change LOCK TABLE WRITE to transaction
*/ */