[MDEV-6247] Merge Galera into 10.1 Created: 2014-05-16  Updated: 2017-12-21  Resolved: 2014-08-27

Status: Closed
Project: MariaDB Server
Component/s: None
Fix Version/s: 10.1.1

Type: Task Priority: Critical
Reporter: Jan Lindström (Inactive) Assignee: Jan Lindström (Inactive)
Resolution: Fixed Votes: 0
Labels: galera, innodb

Attachments: File galera-10.1.diff     File galera-10.1.diff    
Issue Links:
Duplicate
duplicates MDEV-5665 Apply galera patches to the server tree Closed

 Description   

Currently MariaDB-galera is a separate patched tree of MariaDB.

It would be easier to maintain, easier to distribute, and easier to use if they would be merged into the main MariaDB source tree, so that any MariaDB-server package would be supporting galera.

Applying patches is easy. We just need to review them and ensure that they will have no effect of the server whatsoever when galera is disabled.

 Comments   
Comment by Jan Lindström (Inactive) [ 2014-06-19 ]

galera -> 10.1 merge diff.

Comment by Jan Lindström (Inactive) [ 2014-08-06 ]

New patch based on 10.0.12 lp:maria/maria-10.0-galra up to revision 3867.

Comment by Jan Lindström (Inactive) [ 2014-08-06 ]

Code pushed to following branch:

jan@jan-GE70-0NC-0ND ~/mysql/10.1-galera $ git branch
 
  10.1
 
* bb-10.1-galera

Thus clone 10.1 and do git checkout bb-10.1-galera.

Comment by Jan Lindström (Inactive) [ 2014-08-27 ]

Review done by Michael Widenius, Seppo Jaakkola and Jan Lindström.

Comment by Jan Lindström (Inactive) [ 2014-08-27 ]

commit ab150128ce78fd363f6041277862686a61730b2b
Merge: 9534fd8 20e20f6
Author: Jan Lindström <jan.lindstrom@skysql.com>
Date: Wed Aug 27 13:15:37 2014 +0300

MDEV-6247: Merge 10.0-galera to 10.1.

Merged lp:maria/maria-10.0-galera up to revision 3880.

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.

Generated at Thu Feb 08 07:10:27 UTC 2024 using Jira 8.20.16#820016-sha1:9d11dbea5f4be3d4cc21f03a88dd11d8c8687422.