mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
192835 commits 2788 branches 343 tags 1.7 GiB
Commit graph

82 commits

Author SHA1 Message Date
Nirbhay Choubey
5add585539 Merged r4014 from codership/5.5 2014-08-12 18:23:53 -04:00
Nirbhay Choubey
f64a0c3f85 Updated WSREP_PATCH_REVNO. 2014-08-06 19:11:55 -04:00
Nirbhay Choubey
97779a2ef0 bzr merge -r4091..4101 codership/5.6/ 2014-06-19 18:48:20 -04:00
Nirbhay Choubey
c29cbac2eb bzr merge -r3985..3997 codership/5.5 2014-06-10 17:00:32 -04:00
Nirbhay Choubey
ab4947463e Merging changes from maria-5.5-galera and 
some test fixes.

bzr merge -r3479..3493 maria-5.5-galera
 2014-05-22 18:31:04 -04:00
Nirbhay Choubey
b981c7a927 Updated WSREP_PATCH_REVNO. 2014-04-18 19:16:46 -04:00
Jan Lindström
fa18dc3944 Merge lp:codership-mysql/5.5 -r3961..3980. 2014-04-16 13:08:29 +03:00
Nirbhay Choubey
0a6924a3f3 Updated WSREP_PATCH_REVNO. 2014-03-25 17:02:57 -04:00
Nirbhay Choubey
899f9801d4 bzr merge -r3946..3968 codership/5.5 2014-03-25 17:01:05 -04:00
Nirbhay Choubey
c3a2394641 * Merged revisions 3945, 3946..3950, 3951..3961 
from codership-mysql/5.5.
* Merged changes in innobase to xtradb.
* Updated WSREP_PATCH_REVNO.
 2014-02-28 13:56:08 -05:00
Nirbhay Choubey
4cb029b38b * Merged the missing revision 3934 from 
codership-mysql/5.5 (missed in the last merge).
* Merged changes from Innodb to xtradb.
* Updated WSREP_PATCH_REVNO
 2014-02-05 00:28:11 -05: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
d2c72da610 The bzr revision visible in @@version_comment should 
represent the last merged revision from codership branch
and not the revision of the MGC tree itself.

Fixed by adding a cmake variable to hold the revision
number of last merged revision from codership branch.
 2014-01-23 15:57:47 -05:00
Nirbhay Choubey
31eaa90a6e Merging revision 3839..3932 from codership-mysql/5.5. 2014-01-09 14:54:57 -05:00
Seppo Jaakola
b098b7a84c bzr merge -r3904..3928 lp:codership-mysql/5.5 
This is now otherwise on level wsrep-25.9, but storage/innobase has not been fully merged
wsrep-5.5 is not good source for that, so we probably have to cherry pick innodb changes from wsrep-5.6
 2013-11-27 00:18:44 +02:00
Nirbhay Choubey
eb29ce250a MDEV-3895 Version naming for MariaDB-Galera builds 
This patch fixes both the reported issues :
(1) Included '-wsrep' to the server version information.

> select @@version;
+-----------------------------+
| @@version                   |
+-----------------------------+
| 5.5.33a-MariaDB-wsrep-debug |
+-----------------------------+

(2) The @@version_comment would no longer have XXXX
in the wsrep version information in case cmake couldn't
determine the current bzr revision.
 2013-11-22 14:30:00 -05:00
Seppo Jaakola
255e20a175 Merged revisions 3418..3424 from mariadb-galera-5.5 2013-10-07 08:57:23 +03:00
Jan Lindström
ac5d1d761a Merged revisions 3916--3921 from lp:~codership/codership-mysql/5.5-23 
------------------------------------------------------------
revno: 3921
fixes bug: https://launchpad.net/bugs/1228149
committer: Alexey Yurchenko <alexey.yurchenko@codership.com>
branch nick: 5.5-23
timestamp: Mon 2013-09-23 18:29:42 +0300
message:
  References lp:1228149 - fixing typos.
------------------------------------------------------------
revno: 3920
committer: Vladislav Klyachin <vladislav.klyachin@codership.com>
branch nick: 5.5-23
timestamp: Fri 2013-09-20 15:43:18 +0400
message:
  References lp:1201893 - remove setenv("WSREP_LOG_DIR") from ha_innodb.cc
------------------------------------------------------------
revno: 3919
tags: wsrep_23.7.6
fixes bug: https://launchpad.net/bugs/1087368
committer: Alexey Yurchenko <alexey.yurchenko@codership.com>
branch nick: 5.5-23
timestamp: Thu 2013-09-19 06:00:43 +0300
message:
  References lp:1087368 - fix to preserve the order of options in case --wsrep-new-cluster is i
n the middle of option list
------------------------------------------------------------
revno: 3918
committer: Alexey Yurchenko <alexey.yurchenko@codership.com>
branch nick: 5.5-23\ 
timestamp: Wed 2013-09-18 23:22:55 +0300
message:
  bumped wsrep patch version number to 7.6
------------------------------------------------------------
revno: 3917
committer: Vladislav Klyachin <vladislav.klyachin@codership.com>
branch nick: 5.5-23
timestamp: Wed 2013-09-18 20:11:39 +0400
message:
  References lp:1218944 - wsrep_sst_rsync now recognizes log_group_home_dir
------------------------------------------------------------
revno: 3916
fixes bug: https://launchpad.net/bugs/1224775
committer: Alexey Yurchenko <alexey.yurchenko@codership.com>
branch nick: 5.5-23
timestamp: Sun 2013-09-15 21:29:57 +0300
message:
  References lp:1224775 - reworked wsrep_recover to create temporary log file in $DATADIR. Plus
 cleaned up that function slightly.
 2013-09-26 17:51:01 +03:00
Jan Lindström
ba3ff50ab2 Merge 10.0 to galera-10.0 2013-09-03 17:50:36 +03:00
Seppo Jaakola
93ed851cc6 References lp:1193079 - bumped wsrep version to 7.5 2013-06-20 21:51:11 +03:00
Seppo Jaakola
2b0f16c577 References: 
https://mariadb.atlassian.net/browse/MDEV-4179
   https://bugs.launchpad.net/codership-mysql/+bug/1130888
   https://bugs.launchpad.net/codership-mysql/+bug/1019473
Merged revisions 3847-3850 from lp:~codership/codership-mysql/5.5-23
 2013-02-26 01:03:21 +02:00
Sergei Golubchik
53f5ea2431 restore changes that were lost in the merge 2013-02-07 19:01:19 +01:00
Seppo Jaakola
e51a884e9c References lp:1115708 - merged with wsrep branch, revision 3845 
bzr merge -r3840..3845 lp:~codership/codership-mysql/5.5-23
 2013-02-05 22:48:40 +02: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
Sergei Golubchik
076f2f322e really disable embedded server in galera builds 2012-09-17 17:42:14 +02:00
Vladislav Vaintroub
02abef584c Fixes for galera build 
- compile with WITH_WSREP on
- fix package name
 2012-09-04 22:13:46 +02: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
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