Nirbhay Choubey
34d86ac9ff
MDEV-6594: Use separate domain_id for Galera transactions
2015-02-27 22:33:41 -05:00
Sergei Golubchik
4bb49d84a9
correct handling on defaults[-extra]-file is SST scripts
...
pass --defaults-file and --defaults-extra-file
(whatever was specified, or none)
from mysqld down to SST scripts.
parse these options in SST scripts and pass them down
to mysqldump, my_print_defaults, and xtrabackup
2014-10-01 23:38:27 +02: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
c29cbac2eb
bzr merge -r3985..3997 codership/5.5
2014-06-10 17:00:32 -04:00
Nirbhay Choubey
90ead99572
bzr merge -r3980..3984 codership/5.5
2014-06-10 16:33:57 -04:00
Jan Lindström
fa18dc3944
Merge lp:codership-mysql/5.5 -r3961..3980.
2014-04-16 13:08:29 +03:00
Seppo Jaakola
fca065f95c
Merged with lp:~codership/codership-mysql/5.5-23, up to revision 3903
2013-08-21 17:17:30 +03:00
Seppo Jaakola
527ce30cf3
References: MDEV-4572 - merge with lp:codership-mysql/5.5-23 revisions 3874..3878
2013-06-15 16:15:45 +03:00
Seppo Jaakola
9d1546fe2c
References: MDEV-4572 - merge with lp:codership-mysql/5.5-23 revisions 3858..3867
2013-05-25 12:22:57 +03:00
Seppo Jaakola
9da9a242fa
remerging wsrep files from lp:codership-mysql
2013-02-05 16:54:50 +02:00
Seppo Jaakola
e0c6a87b99
re-merging wsrep files from lp:codership-mysql
2013-02-05 15:48:54 +02:00
Seppo Jaakola
42b69efd5d
References lp:1051808 - merged with lp:codership-mysql 5.5.27 based trunk
...
patched with: bzr diff lp:codership-mysql/5.5 -r3790..3793
2012-09-18 22:49:13 +03:00
Seppo Jaakola
0892c7ec5d
References lp:1051808 - merged with lp:codership-mysql 5.5.27 based trunk
...
patched with: bzr diff lp:codership-mysql/5.5 -r3779..3790
2012-09-17 11:34:57 +03:00
