Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | always build wsrep libraries static | Sergei Golubchik | 2019-08-26 | 1 | -0/+7 |
| | | | | even if -DBUILD_SHARED_LIBS=ON was used | ||||
* | Merge branch '10.3' into 10.4 | Oleksandr Byelkin | 2019-05-19 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| | | |||||
| * | Merge branch '10.0-galera' into 10.1 | Oleksandr Byelkin | 2019-01-31 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-10-30 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Bump WSREP_PATCH_VERSION | Vasil Dimov | 2018-10-10 | 1 | -1/+1 |
| | | | | |||||
| | | * | Bump wsrep patch version to 25.23 | Teemu Ollakka | 2018-02-25 | 1 | -1/+1 |
| | | | | |||||
| | | * | MW-406 Bumped up the wsrep patch version (5.5.57-25.22) | Teemu Ollakka | 2017-10-19 | 1 | -1/+1 |
| | | | | |||||
| | | * | MW-383 Bumped wsrep patch version | Teemu Ollakka | 2017-07-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Jan Lindström <jan.lindstrom@mariadb.com> | ||||
| | | * | Bump WSREP_PATCH_VERSION to 20 | Sachin Setiya | 2017-04-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com> | ||||
| | | * | Update WSREP_PATCH_REVNO. | Nirbhay Choubey | 2016-02-10 | 1 | -1/+1 |
| | | | | |||||
| | | * | Bump WSREP_PATCH_VERSION in cmake/wsrep.cmake to 14 | Philip Stoev | 2016-02-10 | 1 | -1/+1 |
| | | | | |||||
| | | * | Bump WSREP_PATCH_VERSION in cmake/wsrep.cmake to 13 | Philip Stoev | 2016-02-10 | 1 | -1/+1 |
| | | | | |||||
* | | | | cmake-wsrep: friendly error message about missing wsrep_api.h | Daniel Black | 2019-02-13 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this commit the error message is: $ cmake . -DWITH_WSREP=ON -- Running cmake version 3.12.1 -- MariaDB 10.4.3 CMake Error at cmake/wsrep.cmake:36 (FILE): FILE STRINGS file ".../mariadb-server-10.4/wsrep-lib/wsrep-API/v26/wsrep_api.h" cannot be read. Call Stack (most recent call first): CMakeLists.txt:147 (INCLUDE) Having 'git config cmake.update-submodules yes' nicely updates the build without error. $ cmake . -DWITH_WSREP=ON -- Running cmake version 3.12.1 -- MariaDB 10.4.3 Submodule path 'wsrep-lib': checked out 'e7d72ae7f6a6995a21d743389426a963429a1fff' Submodule path 'wsrep-lib/wsrep-API/v26': checked out '75a5f452f2ba07b0f4a3a9a94825fccc71b27398' | ||||
* | | | | cmake/wsrep: allow disabling -DWITH_WSREP=OFF | Daniel Black | 2019-02-12 | 1 | -10/+10 |
| | | | | |||||
* | | | | Galera4 | Brave Galera Crew | 2019-01-23 | 1 | -2/+13 |
|/ / / | |||||
* | | | Merge branch '10.0-galera' into 10.1 | Vicențiu Ciorbaru | 2018-03-19 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Bump wsrep patch version to 25.23 | Teemu Ollakka | 2018-02-25 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'github/10.0-galera' into 10.1 | Sergei Golubchik | 2017-11-10 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | MW-406 Bumped up the wsrep patch version (5.6.37-25.21) | Teemu Ollakka | 2017-11-08 | 1 | -1/+1 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/10.0-galera' into 10.1 | Jan Lindström | 2017-08-21 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | MW-383 Bumped wsrep patch version | Teemu Ollakka | 2017-08-14 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch '10.0-galera' into 10.1 | Sergei Golubchik | 2017-05-26 | 1 | -1/+0 |
|\ \ \ | |/ / | |||||
| * | | Bump WSREP_PATCH_VERSION to 19 | Philip Stoev | 2017-03-15 | 1 | -1/+1 |
| | | | |||||
| * | | Bump WSREP_PATCH_VERSION to 18 | Philip Stoev | 2017-03-14 | 1 | -1/+1 |
| | | | |||||
| * | | Bump WSREP_PATCH_VERSION to 17 | Philip Stoev | 2017-03-12 | 1 | -1/+1 |
| | | | |||||
* | | | Bump WSREP_PATCH_VERSION to 19 | Philip Stoev | 2017-04-06 | 1 | -1/+1 |
| | | | |||||
* | | | Bump WSREP_PATCH_VERSION to 18 | Philip Stoev | 2017-04-06 | 1 | -1/+1 |
| | | | |||||
* | | | Bump WSREP_PATCH_VERSION to 17 | Philip Stoev | 2017-04-06 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch '10.0-galera' into bb-10.1-serg | Nirbhay Choubey | 2016-08-25 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Update WSREP_PATCH_REVNO. | Nirbhay Choubey | 2016-08-21 | 1 | -1/+1 |
| | | | |||||
| * | | Bump WSREP_PATCH_VERSION to 16 | Philip Stoev | 2016-08-21 | 1 | -1/+1 |
| | | | |||||
| * | | Bump WSREP_PATCH_VERSION to 14 | Philip Stoev | 2016-08-21 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch '10.0-galera' into bb-10.1-serg | Nirbhay Choubey | 2016-02-24 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Update WSREP_PATCH_REVNO. | Nirbhay Choubey | 2016-02-23 | 1 | -1/+1 |
| | | | |||||
| * | | Bump WSREP_PATCH_VERSION in cmake/wsrep.cmake to 13 | Philip Stoev | 2016-02-23 | 1 | -1/+1 |
| | | | |||||
| * | | Bump WSREP_PATCH_VERSION in cmake/wsrep.cmake to 12 | Philip Stoev | 2016-02-22 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'github/10.0-galera' into 10.1 | Sergei Golubchik | 2015-11-19 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Update WSREP_PATCH_REVNO | Nirbhay Choubey | 2015-09-10 | 1 | -2/+2 |
| | | | |||||
| * | | Correct WSREP_PATCH_VERSION for 5.6 is 11 | Philip Stoev | 2015-09-09 | 1 | -1/+1 |
| |/ | |||||
| * | Update WSREP_PATCH_REVNO | Nirbhay Choubey | 2015-09-09 | 1 | -2/+2 |
| | | |||||
| * | Bump WSREP_PATCH_VERSION in cmake/wsrep.cmake to 12 | Philip Stoev | 2015-09-09 | 1 | -1/+1 |
| | | |||||
| * | bzr merge -r4015..4026 codership/5.5 | Nirbhay Choubey | 2014-10-09 | 1 | -2/+2 |
| | | |||||
| * | Merged r4014 from codership/5.5 | Nirbhay Choubey | 2014-08-12 | 1 | -1/+1 |
| | | |||||
| * | Updated WSREP_PATCH_REVNO. | Nirbhay Choubey | 2014-08-06 | 1 | -1/+1 |
| | | |||||
| * | bzr merge -r3985..3997 codership/5.5 | Nirbhay Choubey | 2014-06-10 | 1 | -1/+1 |
| | | |||||
| * | Updated WSREP_PATCH_REVNO. | Nirbhay Choubey | 2014-04-18 | 1 | -1/+1 |
| | | |||||
| * | Merge lp:codership-mysql/5.5 -r3961..3980. | Jan Lindström | 2014-04-16 | 1 | -1/+1 |
| | | |||||
| * | * Merged revisions 3945, 3946..3950, 3951..3961 | Nirbhay Choubey | 2014-02-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | from codership-mysql/5.5. * Merged changes in innobase to xtradb. * Updated WSREP_PATCH_REVNO. | ||||
| * | * Merged the missing revision 3934 from | Nirbhay Choubey | 2014-02-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | codership-mysql/5.5 (missed in the last merge). * Merged changes from Innodb to xtradb. * Updated WSREP_PATCH_REVNO |