Sergei Golubchik
6afe013cde
always build wsrep libraries static
...
even if -DBUILD_SHARED_LIBS=ON was used
2019-08-26 23:33:42 +02:00
Oleksandr Byelkin
c07325f932
Merge branch '10.3' into 10.4
2019-05-19 20:55:37 +02:00
Vicențiu Ciorbaru
cb248f8806
Merge branch '5.5' into 10.1
2019-05-11 22:19:05 +03:00
Daniel Black
4f5c65367a
cmake-wsrep: friendly error message about missing wsrep_api.h
...
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'
2019-02-13 11:36:03 +11:00
Daniel Black
b2dd88f095
cmake/wsrep: allow disabling -DWITH_WSREP=OFF
2019-02-12 15:59:05 +11:00
Oleksandr Byelkin
560799ebd8
Merge branch '10.0-galera' into 10.1
2019-01-31 09:34:34 +01:00
Brave Galera Crew
36a2a185fe
Galera4
2019-01-23 15:30:00 +04:00
Jan Lindström
b0fe082b36
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-10-30 13:22:52 +02:00
Vasil Dimov
f500399421
Bump WSREP_PATCH_VERSION
2018-10-10 13:36:05 +03:00
Vicențiu Ciorbaru
24b353162f
Merge branch '10.0-galera' into 10.1
2018-03-19 15:21:01 +02:00
Teemu Ollakka
7bd95307f2
Bump wsrep patch version to 25.23
2018-02-25 21:24:12 +02:00
Teemu Ollakka
7cec685758
Bump wsrep patch version to 25.23
2018-02-25 21:01:34 +02:00
Sergei Golubchik
2a4e4335c4
Merge branch 'github/10.0-galera' into 10.1
2017-11-10 01:38:03 +01:00
Teemu Ollakka
736d75d455
MW-406 Bumped up the wsrep patch version (5.6.37-25.21)
2017-11-08 14:59:30 +02:00
Teemu Ollakka
2864c37d6c
MW-406 Bumped up the wsrep patch version (5.5.57-25.22)
2017-10-19 09:35:10 +03:00
Jan Lindström
c23efc7d50
Merge remote-tracking branch 'origin/10.0-galera' into 10.1
2017-08-21 13:35:00 +03:00
Teemu Ollakka
b5323054af
MW-383 Bumped wsrep patch version
2017-08-14 14:41:50 +03:00
Teemu Ollakka
970859a599
MW-383 Bumped wsrep patch version
...
Signed-off-by: Jan Lindström <jan.lindstrom@mariadb.com>
2017-07-20 14:17:45 +03:00
Sergei Golubchik
f42e08f951
Merge branch '10.0-galera' into 10.1
2017-05-26 19:21:19 +02:00
Sachin Setiya
fce9a0c46a
Bump WSREP_PATCH_VERSION to 20
...
Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com>
2017-04-18 11:55:04 +05:30
Philip Stoev
adc151fdaf
Bump WSREP_PATCH_VERSION to 19
2017-04-06 15:41:54 +05:30
Philip Stoev
8aa5356d86
Bump WSREP_PATCH_VERSION to 18
2017-04-06 15:41:54 +05:30
Philip Stoev
3de28b42b4
Bump WSREP_PATCH_VERSION to 17
2017-04-06 15:41:54 +05:30
Philip Stoev
25070d2a2c
Bump WSREP_PATCH_VERSION to 19
2017-03-15 00:07:37 +05:30
Philip Stoev
e29d7b1d0b
Bump WSREP_PATCH_VERSION to 18
2017-03-14 11:19:48 +05:30
Philip Stoev
15298689cb
Bump WSREP_PATCH_VERSION to 17
2017-03-12 14:24:57 +05:30
Nirbhay Choubey
90266e8a0e
Merge branch '10.0-galera' into bb-10.1-serg
2016-08-25 15:39:39 -04:00
Nirbhay Choubey
f381ad5230
Update WSREP_PATCH_REVNO.
2016-08-21 20:13:51 -04:00
Philip Stoev
2e56c7f3cd
Bump WSREP_PATCH_VERSION to 16
2016-08-21 16:20:08 -04:00
Philip Stoev
f3444c4a43
Bump WSREP_PATCH_VERSION to 14
2016-08-21 16:17:05 -04:00
Nirbhay Choubey
cceec7858f
Merge branch '10.0-galera' into bb-10.1-serg
2016-02-24 01:21:40 -05:00
Nirbhay Choubey
0fd9d5a656
Update WSREP_PATCH_REVNO.
2016-02-23 21:24:00 -05:00
Philip Stoev
b9c42d7a47
Bump WSREP_PATCH_VERSION in cmake/wsrep.cmake to 13
2016-02-23 13:24:49 -05:00
Philip Stoev
5ebf6ce7aa
Bump WSREP_PATCH_VERSION in cmake/wsrep.cmake to 12
2016-02-22 23:57:37 -05:00
Nirbhay Choubey
b83de1151a
Update WSREP_PATCH_REVNO.
2016-02-10 18:04:08 -05:00
Philip Stoev
a6d0903764
Bump WSREP_PATCH_VERSION in cmake/wsrep.cmake to 14
2016-02-10 17:48:35 -05:00
Philip Stoev
403a8bf8df
Bump WSREP_PATCH_VERSION in cmake/wsrep.cmake to 13
2016-02-10 17:47:54 -05:00
Sergei Golubchik
7f19330c59
Merge branch 'github/10.0-galera' into 10.1
2015-11-19 17:48:36 +01:00
Nirbhay Choubey
f479b5a16e
Update WSREP_PATCH_REVNO
2015-09-10 00:29:06 -04:00
Philip Stoev
f7885fb631
Correct WSREP_PATCH_VERSION for 5.6 is 11
2015-09-09 23:08:00 -04:00
Nirbhay Choubey
37ae601a87
Update WSREP_PATCH_REVNO
2015-09-09 18:54:14 -04:00
Philip Stoev
760b0c4758
Bump WSREP_PATCH_VERSION in cmake/wsrep.cmake to 12
2015-09-09 17:03:53 -04:00
Nirbhay Choubey
903cfde149
MDEV-7067: Server outputs Galera (WSREP) information, even if Galera is disabled
...
* mysqld_safe: Since wsrep_on variable is mandatory in 10.1, skip wsrep
position recovery if its OFF.
* mysqld: Remove "-wsrep" from server version
* mysqld: Remove wsrep patch version from @@version_comment
* mysqld: Introduce @@wsrep_patch_version
2015-05-29 11:26:46 -04:00
Sergei Golubchik
8e7649867f
Merge 10.0-galera into 10.1
2015-02-06 16:14:23 +01:00
Nirbhay Choubey
542968cf0a
bzr merge -r4015..4026 codership/5.5
2014-10-09 18:28:14 -04:00
Sergei Golubchik
3620910eea
cleanup: galera merge, simple changes
2014-10-01 23:38:27 +02:00
Nirbhay Choubey
9a57de86be
bzr merge -r4123..4144 codership/5.6
2014-09-30 18:06:15 -04:00
Nirbhay Choubey
236cc6cd49
wsrep-related changes: removed some unnecessary files & minor modifications.
2014-09-25 20:59:15 -04:00
Jan Lindström
df4dd593f2
MDEV-6247: Merge 10.0-galera to 10.1.
...
Merged lp:maria/maria-10.0-galera up to revision 3879.
Added a new functions to handler API to forcefully abort_transaction,
producing fake_trx_id, get_checkpoint and set_checkpoint for XA. These
were added for future possiblity to add more storage engines that
could use galera replication.
2014-08-26 15:43:46 +03:00
Nirbhay Choubey
ef4cbd8aec
Updated WSREP_PATCH_REVNO.
2014-08-12 18:26:45 -04:00
