diff options
author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-05-22 18:31:04 -0400 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-05-22 18:31:04 -0400 |
commit | ab4947463e68da1a01bd506f8f280ebdea3f1b46 (patch) | |
tree | 75ec757acf0955e19d1fac0f3fcac2a6593e0a2f /cmake/wsrep.cmake | |
parent | 0bf3ed12a5338f0db4b652f839fee93a28d39195 (diff) | |
download | mariadb-git-ab4947463e68da1a01bd506f8f280ebdea3f1b46.tar.gz |
Merging changes from maria-5.5-galera and
some test fixes.
bzr merge -r3479..3493 maria-5.5-galera
Diffstat (limited to 'cmake/wsrep.cmake')
-rw-r--r-- | cmake/wsrep.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
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. |