diff options
author | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-10-09 18:28:14 -0400 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-10-09 18:28:14 -0400 |
commit | 542968cf0a68070d7b45859a3148a602e2089a35 (patch) | |
tree | 889399fd2c19496137b61cb7e9131d371763ee09 /cmake/wsrep.cmake | |
parent | 068fb8569f2300e4a5c08413a756417d923ecf5f (diff) | |
download | mariadb-git-542968cf0a68070d7b45859a3148a602e2089a35.tar.gz |
bzr merge -r4015..4026 codership/5.5
Diffstat (limited to 'cmake/wsrep.cmake')
-rw-r--r-- | cmake/wsrep.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/wsrep.cmake b/cmake/wsrep.cmake index 97eb47fc587..50698b7bb8f 100644 --- a/cmake/wsrep.cmake +++ b/cmake/wsrep.cmake @@ -18,12 +18,12 @@ # so WSREP_VERSION is produced regardless # Set the patch version -SET(WSREP_PATCH_VERSION "10") +SET(WSREP_PATCH_VERSION "11") # 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 "4014") # Should be updated on every merge. +SET(WSREP_PATCH_REVNO "4026") # Should be updated on every merge. # MariaDB: Obtain patch revision number: # Update WSREP_PATCH_REVNO if WSREP_REV environment variable is set. |