mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 11:27:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '5.5-galera' into 10.0-galera

Browse source
This commit is contained in:
Nirbhay Choubey 2015-09-09 20:51:39 -04:00
commit fa5f18d673
11 changed files with 497 additions and 244 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmake/wsrep.cmake
View file

@ -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.