Nirbhay Choubey
02ba2bfdb4
Merging revision from codership-mysql/5.5 (r3928..3968) and
...
codership-mysql/5.6 (r4021..4065).
- Also contains fixes for some build failures.
2014-03-27 16:26:00 -04:00
Nirbhay Choubey
b5871a51e9
* bzr merge -r4027..4061 codership/5.6
...
* Merged Innodb changes to xtradb
2014-03-26 11:12:38 -04:00
Nirbhay Choubey
899f9801d4
bzr merge -r3946..3968 codership/5.5
2014-03-25 17:01:05 -04:00
Nirbhay Choubey
3c0b3babd9
bzr merge -r3928..3932 codership/5.5
2014-03-25 13:39:12 -04:00
Nirbhay Choubey
4a6be51f78
* Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.
...
* Fixed Debian/Ubuntu dist files.
* Fixed some compiler warnings.
2014-01-30 12:45:38 -05:00
Nirbhay Choubey
31eaa90a6e
Merging revision 3839..3932 from codership-mysql/5.5.
2014-01-09 14:54:57 -05:00
Jan Lindström
ed26f70126
MDEV-443: Galera: Server crashes on flushing tables for SST if started with character_set_server utf16 or utf32 or ucs2, and with wsrep_sst_method=rsync
...
Analysis: In SST Galera directly calls parser using current client character
set. Similarly in BF Galera uses client character set to apply. However,
there are character sets that are not currently supported by the parser.
Fix: If currenct client character set is one of those that is not supported
by the parser, temporally set character set to latin1 before we enter
parser and restore it after we have parsed.
2013-12-04 13:46:28 +02:00
Seppo Jaakola
496e22cf3b
merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6
...
and a number of fixes to make this buildable.
Run also few short multi-master high conflict rate tests, with no issues
2013-12-04 10:32:43 +02:00
Seppo Jaakola
a2594e96f7
Merges from lp:codership-mysql/5.5 up to rev #3893 , this changes to wsrep API #24
2013-11-26 16:48:30 +02:00
Seppo Jaakola
2b4183f10b
bzr merge -r3890..3891 lp:codership-mysql/5.5
2013-11-06 00:29:37 +02:00
Seppo Jaakola
f222e7d471
Merge fixes, now at level 3430 in mariadb-galera-5.5
2013-10-07 11:35:19 +03:00
Seppo Jaakola
06a7eeb992
Merged revisions 3411..3417 from mariadb-galera-5.5
2013-10-07 00:18:26 +03:00
Jan Lindström
ba3ff50ab2
Merge 10.0 to galera-10.0
2013-09-03 17:50:36 +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
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
800fa186e3
merged with codership-mysql up to revision 3839
...
bzr merge -r3810..3839 lp:codership-mysql/5.5
2013-02-05 17:54:42 +02: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
fc6cd855e9
References: lp:1066784 - Merged revisions 3810-3827 from lp:codership-mysql
2012-11-28 17:38:32 +02: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
Seppo Jaakola
8e84b9e740
Merged in change sets 3772-3779 from lp:codership-mysql/5.5
2012-08-30 12:22:37 +03:00
Seppo Jaakola
ebfa24b1d2
References lp:1034621 - Merge up to mysql-5.5.25 level
...
merged codership-mysql/5.5 revisions: bzr diff -r3759..3767
merged codership-mysql/5.5 revisions: bzr diff -r3768..3771
2012-08-09 01:47:21 +03:00
Seppo Jaakola
33ffe0dd29
References lp:1011983
...
Merged from codership-mysql/5.5 changes revisions 3743-3756
2012-06-12 10:55:11 +03:00
Seppo Jaakola
f96fd3f40f
Added wsrep specific files
2012-04-26 13:09:06 +03:00
