| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | | | Merge tag 'mariadb-5.5.44' into 5.5-galera | Nirbhay Choubey | 2015-06-21 | 4 | -100/+100 | |
| | | |\ \ \ \ \ | ||||||
| | | * \ \ \ \ \ | Merge tag 'mariadb-5.5.43' into 5.5-galera | Nirbhay Choubey | 2015-05-04 | 1 | -4/+4 | |
| | | |\ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ | Merge branch '5.5' into 5.5-galera | Nirbhay Choubey | 2015-02-18 | 7 | -61/+52 | |
| | | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | Add cmake check for getifaddrs. | Nirbhay Choubey | 2015-01-27 | 1 | -0/+1 | |
| | | * | | | | | | | | Merge revisions from maria/5.5 (5.5.41) | Nirbhay Choubey | 2014-12-22 | 5 | -81/+102 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ | Merge revisions from maria/5.5 | Nirbhay Choubey | 2014-12-16 | 2 | -2/+2 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | MDEV-7204: mariadb-galera-server el7 rpms packaging | Nirbhay Choubey | 2014-12-09 | 1 | -1/+3 | |
| | | * | | | | | | | | | | bzr merge -r4015..4026 codership/5.5 | Nirbhay Choubey | 2014-10-09 | 1 | -2/+2 | |
| | | * | | | | | | | | | | bzr merge -rtag:mariadb-5.5.40 maria/5.5 | Nirbhay Choubey | 2014-10-09 | 4 | -107/+61 | |
| | | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | Merged r4014 from codership/5.5 | Nirbhay Choubey | 2014-08-12 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | Updated WSREP_PATCH_REVNO. | Nirbhay Choubey | 2014-08-06 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | Local merge of mariadb-5.5.39 | Nirbhay Choubey | 2014-08-06 | 3 | -32/+44 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | bzr merge -r3985..3997 codership/5.5 | Nirbhay Choubey | 2014-06-10 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | | bzr merge -rtag:mariadb-5.5.38 maria/5.5 | Nirbhay Choubey | 2014-06-10 | 2 | -4/+2 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | Added rsync to galera server's debian/rpm dependency list. | Nirbhay Choubey | 2014-05-29 | 1 | -2/+2 | |
| | | * | | | | | | | | | | | | | MDEV#6211: MariaDB-Galera-server uses 'socat', but 'socat' is | Nirbhay Choubey | 2014-05-25 | 1 | -5/+2 | |
| | | * | | | | | | | | | | | | | MDEV#5925: New mariadb-galera-test packages | Nirbhay Choubey | 2014-05-12 | 1 | -2/+3 | |
| | | * | | | | | | | | | | | | | Updated WSREP_PATCH_REVNO. | Nirbhay Choubey | 2014-04-18 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | | | Merge lp:codership-mysql/5.5 -r3961..3980. | Jan Lindström | 2014-04-16 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | | | Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154. | Jan Lindström | 2014-04-16 | 5 | -16/+26 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | MDEV#5903 mariadb-galera tree builds too many rpm packagesmariadb-galera-5.5.36a | Nirbhay Choubey | 2014-03-20 | 1 | -3/+1 | |
| | | * | | | | | | | | | | | | | | * Merged revisions 3945, 3946..3950, 3951..3961 | Nirbhay Choubey | 2014-02-28 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | | | | Merge from maria/5.5 (-rtag:mariadb-5.5.36). | Nirbhay Choubey | 2014-02-25 | 4 | -31/+149 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | * Merged the missing revision 3934 from | Nirbhay Choubey | 2014-02-05 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | | | | | Merge of maria/5.5 into maria-5.5-galera. | Nirbhay Choubey | 2014-01-29 | 3 | -21/+36 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | The bzr revision visible in @@version_comment should | Nirbhay Choubey | 2014-01-23 | 1 | -17/+8 | |
| | | * | | | | | | | | | | | | | | | | Merging revision 3839..3932 from codership-mysql/5.5. | Nirbhay Choubey | 2014-01-09 | 2 | -8/+1 | |
| | | * | | | | | | | | | | | | | | | | Merge with MariaDB 5.5.34. | Jan Lindström | 2013-11-25 | 3 | -8/+24 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | MDEV-3895 Version naming for MariaDB-Galera builds | Nirbhay Choubey | 2013-11-22 | 1 | -7/+21 | |
| | | * | | | | | | | | | | | | | | | | | revert the change for auto-rpm-packages for plugins. | Sergei Golubchik | 2013-09-27 | 1 | -11/+1 | |
| | | * | | | | | | | | | | | | | | | | | mariadb-5.5.33a merge | Jan Lindström | 2013-09-27 | 1 | -4/+13 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | Merged revisions 3916--3921 from lp:~codership/codership-mysql/5.5-23 | Jan Lindström | 2013-09-26 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | | | | | | | | fix broken (after merge) galera deb packaging | Sergei Golubchik | 2013-09-18 | 1 | -2/+2 | |
| | | * | | | | | | | | | | | | | | | | | | cmake error on osx | Sergei Golubchik | 2013-09-18 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | | | | | | | | mariadb-5.5.33 merge | Sergei Golubchik | 2013-09-18 | 7 | -13/+108 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32 | Seppo Jaakola | 2013-08-21 | 4 | -14/+19 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | Merged FreeBSD compatibility changes (up to revision 3893 in lp:~codership/c... | Seppo Jaakola | 2013-08-07 | 2 | -0/+27 | |
| | | * | | | | | | | | | | | | | | | | | | | | References lp:1193079 - bumped wsrep version to 7.5 | Seppo Jaakola | 2013-06-20 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | | | | | | | | | | References: MDEV-4572 - merge with mariaDB 5.5.31 | Seppo Jaakola | 2013-05-26 | 10 | -21/+37 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | References: MDEV-4572 - merge with mariaDB 5.5.30 | Seppo Jaakola | 2013-05-24 | 3 | -17/+28 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | References: | Seppo Jaakola | 2013-02-26 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | restore changes that were lost in the merge | Sergei Golubchik | 2013-02-07 | 1 | -2/+2 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | References lp:1115708 - merged with wsrep branch, revision 3845 | Seppo Jaakola | 2013-02-05 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | References lp:1115708 - merged with lp:mariadb/5.5 revision 3657 | Seppo Jaakola | 2013-02-05 | 8 | -17/+65 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | merged with codership-mysql up to revision 3839 | Seppo Jaakola | 2013-02-05 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | remerging wsrep files from lp:codership-mysql | Seppo Jaakola | 2013-02-05 | 1 | -0/+59 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | re-merging wsrep files from lp:codership-mysql | Seppo Jaakola | 2013-02-05 | 1 | -59/+0 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | References: lp:1066784 - Merged with MariaDB 5.5.28a | Seppo Jaakola | 2012-11-30 | 1 | -1/+1 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | References: lp:1066784 - Merged revisions 3810-3827 from lp:codership-mysql | Seppo Jaakola | 2012-11-28 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | References lp:1066784 - bzr merge lp:maria/5.5 (rev: 3562) | Seppo Jaakola | 2012-10-24 | 4 | -5/+14 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |