diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-02-28 13:56:08 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-02-28 13:56:08 -0500 |
| commit | c3a2394641e2f7b199977bcf699ad64c1bb1367f (patch) | |
| tree | f8867141b6f645065820a14eb74562778ca8d0e4 /cmake/wsrep.cmake | |
| parent | ae6e1548cbda6cb1509f84edb57786c9520a7a6e (diff) | |
| download | mariadb-git-c3a2394641e2f7b199977bcf699ad64c1bb1367f.tar.gz | |
* Merged revisions 3945, 3946..3950, 3951..3961
from codership-mysql/5.5.
* Merged changes in innobase to xtradb.
* Updated WSREP_PATCH_REVNO.
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 391cf505313..a5ca4508da4 100644 --- a/cmake/wsrep.cmake +++ b/cmake/wsrep.cmake @@ -23,7 +23,7 @@ SET(WSREP_PATCH_VERSION "9") # 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 "3944") # Should be updated on every merge. +SET(WSREP_PATCH_REVNO "3961") # Should be updated on every merge. # MariaDB: Obtain patch revision number: # Update WSREP_PATCH_REVNO if WSREP_REV environment variable is set. |