diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-09-09 20:51:39 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-09-09 20:51:39 -0400 |
| commit | fa5f18d6734249aa326d6296c9b9c2338cb33b10 (patch) | |
| tree | 63233fb5a049d4683cc6faa910875702a7836d8c /cmake | |
| parent | f533b2b462b5b73630245172b627506d36f95b39 (diff) | |
| parent | 37ae601a8766f37cdd919efc801133d2a8cfaf70 (diff) | |
| download | mariadb-git-fa5f18d6734249aa326d6296c9b9c2338cb33b10.tar.gz | |
Merge branch '5.5-galera' into 10.0-galera
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/wsrep.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/wsrep.cmake b/cmake/wsrep.cmake index d52097b9046..7740a4608f6 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 "12") # MariaDB addition: Revision number of the last revision merged from # codership branch visible in @@visible_comment. -# Branch : codership-mysql/5.6 -SET(WSREP_PATCH_REVNO "4144") # Should be updated on every merge. +# Branch : https://github.com/codership/mysql-wsrep/tree/5.5 +SET(WSREP_PATCH_REVNO "4f81026") # Should be updated on every merge. # MariaDB: Obtain patch revision number: # Update WSREP_PATCH_REVNO if WSREP_REV environment variable is set. |