From ab4947463e68da1a01bd506f8f280ebdea3f1b46 Mon Sep 17 00:00:00 2001 From: Nirbhay Choubey Date: Thu, 22 May 2014 18:31:04 -0400 Subject: Merging changes from maria-5.5-galera and some test fixes. bzr merge -r3479..3493 maria-5.5-galera --- cmake/wsrep.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmake/wsrep.cmake') diff --git a/cmake/wsrep.cmake b/cmake/wsrep.cmake index aabf0020fc2..5057f14792b 100644 --- a/cmake/wsrep.cmake +++ b/cmake/wsrep.cmake @@ -23,7 +23,7 @@ SET(WSREP_PATCH_VERSION "10") # MariaDB addition: Revision number of the last revision merged from # codership branch visible in @@visible_comment. # Branch : codership-mysql/5.5 -SET(WSREP_PATCH_REVNO "3968") # Should be updated on every merge. +SET(WSREP_PATCH_REVNO "3991") # Should be updated on every merge. # MariaDB: Obtain patch revision number: # Update WSREP_PATCH_REVNO if WSREP_REV environment variable is set. -- cgit v1.2.1