| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge tag 'mariadb-10.0.26' into 10.0-galera | Nirbhay Choubey | 2016-06-24 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge commit from 10.1: | Jan Lindström | 2016-06-20 | 1 | -1/+1 |
| * | | Merge tag 'mariadb-10.0.24' into 10.0-galera | Nirbhay Choubey | 2016-02-23 | 1 | -2/+13 |
| |\ \ | |/ | |||||
| | * | Backported fix for ccache | Monty | 2016-01-03 | 1 | -2/+13 |
| * | | Merge tag 'mariadb-10.0.22' into 10.0-galera | Nirbhay Choubey | 2015-10-31 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | fix build on sol10-64 | Sergei Golubchik | 2015-10-22 | 1 | -1/+1 |
| * | | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 18 | -15/+24 |
| |\ \ | |/ | |||||
| | * | 5.5 merge | Sergei Golubchik | 2014-05-09 | 18 | -15/+24 |
| | |\ | |||||
| | | * | mysql-5.5.37 selective merge | Sergei Golubchik | 2014-03-27 | 18 | -15/+24 |
| | | |\ | |||||
| | | | * | Updated/added copyright header. Added line "use is subject to license terms" | Murthy Narkedimilli | 2014-02-17 | 20 | -15/+26 |
| * | | | | References: https://mariadb.atlassian.net/browse/MDEV-5908 - | Seppo Jaakola | 2014-03-20 | 1 | -0/+0 |
| * | | | | Merge MariaDB-10.0.7 revision 3961. | Jan Lindström | 2014-01-25 | 1 | -3/+3 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Percona-Server-5.6.14-rel62.0 merge | Sergei Golubchik | 2013-12-22 | 1 | -3/+3 |
| * | | | | Added missing files | Seppo Jaakola | 2014-01-17 | 5 | -0/+71 |
| * | | | | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 2 | -32/+8 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | merge 10.0-base -> 10.0 | unknown | 2013-09-26 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * \ \ | merge 5.5 -> 10.0-base | unknown | 2013-09-25 | 1 | -1/+1 |
| | | |\ \ \ | | | |/ / | |||||
| | | | * | | MDEV-5062 : disable jemalloc by default everywhere, except Linux and OSX. | Vladislav Vaintroub | 2013-09-24 | 1 | -1/+1 |
| | * | | | | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 2 | -32/+8 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | 5.5 merge and fixes for compiler/test errors | Sergei Golubchik | 2013-09-18 | 2 | -32/+8 |
| | | |\ \ \ | | | |/ / | |||||
| | | | * | | fix BUILD/compile-solaris-amd64 to produce working binaries | Sergei Golubchik | 2013-09-13 | 1 | -5/+5 |
| | | | * | | tokudb buildbot fixes | Sergei Golubchik | 2013-09-12 | 1 | -30/+6 |
| | | | * | | Percona-Server-5.5.33-rel31.1.tar.gz | Sergei Golubchik | 2013-09-07 | 1 | -2/+2 |
| * | | | | | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 35 | -42/+42 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -2/+1 |
| | |\ \ \ \ | | |/ / / | |/| | | | |||||
| | | * | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -2/+1 |
| | * | | | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 35 | -40/+41 |
| | |\ \ \ \ | | | |/ / | | |/| | | |||||
| | | * | | | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 35 | -40/+41 |
| | | |\ \ \ | | | | |/ | | | |/| | |||||
| | | | * | | Correcting the permissions of the executable files. | Murthy Narkedimilli | 2013-03-20 | 37 | -0/+0 |
| | | | * | | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER | Murthy Narkedimilli | 2013-03-19 | 41 | -48/+48 |
| * | | | | | Merged with lp:maria revision #3766 | Seppo Jaakola | 2013-07-13 | 14 | -14/+26 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 14 | -14/+26 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | - Solaris fixes: | Michael Widenius | 2013-05-15 | 2 | -3/+2 |
| | | * | | | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 14 | -14/+26 |
| | | |\ \ \ | | | |/ / | |||||
| | | | * | | Updated/added copyright headers | Murthy Narkedimilli | 2013-02-26 | 18 | -18/+34 |
| | | | |\ \ | |||||
| | | | | * | | Updated/added copyright headers. | Murthy Narkedimilli | 2013-02-25 | 23 | -23/+23 |
| * | | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -1/+1 |
| |/ / / / / | |||||
| * | | | | | Fixed errors and compiler warnings found by buildbot | Michael Widenius | 2013-05-05 | 2 | -3/+2 |
| | |_|_|/ |/| | | | |||||
| * | | | | 5.5 merge | Sergei Golubchik | 2013-01-29 | 2 | -1/+14 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Buildbot fixes and cleanups: | Michael Widenius | 2013-01-11 | 2 | -1/+14 |
| * | | | | Implementation of Multi-source replication (MDEV:253) | Michael Widenius | 2012-09-28 | 1 | -1/+1 |
| * | | | | Automatic merge | Michael Widenius | 2012-09-22 | 1 | -0/+6 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Fix for MDEV-533: Confusing error code when doing auto-increment insert for o... | Michael Widenius | 2012-09-18 | 1 | -0/+6 |
| * | | | | Fixed build failures found by buildbot | Michael Widenius | 2012-06-05 | 2 | -1/+3 |
| |/ / / | |||||
| * | | | Cleanups: | Michael Widenius | 2012-03-20 | 1 | -0/+1 |
| * | | | disable safemalloc for valgrind builds. | Sergei Golubchik | 2012-02-23 | 1 | -1/+0 |
| * | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 9 | -2/+120 |
| |\ \ \ | |||||
| | * \ \ | Merge with 5.2. | Michael Widenius | 2011-12-11 | 10 | -3/+156 |
| | |\ \ \ | |||||
| | | * \ \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 10 | -3/+156 |
| | | |\ \ \ | |||||
| | | | * \ \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 10 | -3/+156 |
| | | | |\ \ \ | | | | | |/ | | | | |/| | |||||
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |