Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | cleanups done as part of adding encryption | Monty | 2015-02-10 | 1 | -5/+12 |
* | Merge 10.0-galera into 10.1 | Sergei Golubchik | 2015-02-06 | 3 | -9/+3 |
|\ | |||||
| * | maria-10.0.16 merge | Nirbhay Choubey | 2015-01-26 | 3 | -35/+49 |
| |\ | |||||
| * | | MDEV-7319 : Galera bootstrap (/etc/init.d/mysql bootstrap) | Nirbhay Choubey | 2014-12-20 | 1 | -1/+2 |
| * | | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 1 | -5/+10 |
| |\ \ | |||||
| * \ \ | bzr merge -rtag:mariadb-10.0.14 maria/10.0/ | Nirbhay Choubey | 2014-09-28 | 1 | -5/+2 |
| |\ \ \ | |||||
| * | | | | Moved wsrep_slave_threads to optional settings. | Nirbhay Choubey | 2014-09-24 | 1 | -1/+1 |
| * | | | | Updated config files: | Nirbhay Choubey | 2014-09-23 | 5 | -368/+1 |
| * | | | | bzr merge -r4104..4120 codership/5.6/ | Nirbhay Choubey | 2014-08-12 | 1 | -1/+4 |
| * | | | | bzr merge -r4346 maria/10.0 (maria-10.0.13) | Nirbhay Choubey | 2014-08-11 | 3 | -4/+16 |
| |\ \ \ \ | |||||
| * | | | | | MDEV-6495: local merge from maria-5.5-galera. | Nirbhay Choubey | 2014-08-05 | 1 | -1/+1 |
| * | | | | | Local merge of patch for MDEV-3896 from maria-5.5-galera. | Nirbhay Choubey | 2014-07-21 | 1 | -0/+16 |
| * | | | | | bzr merge -rtag:mariadb-10.0.12 maria/10.0 | Nirbhay Choubey | 2014-06-19 | 1 | -2/+1 |
| |\ \ \ \ \ | |||||
| * | | | | | | bzr merge -r3985..3991 codership/5.5 | Nirbhay Choubey | 2014-05-21 | 1 | -1/+1 |
| * | | | | | | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 16 | -0/+21 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | MDEV#6132: yum update for MGC-10.0 fails (10.0.7 -> 10.0.10)mariadb-galera-10.0.10 | Nirbhay Choubey | 2014-04-17 | 1 | -1/+1 |
| * | | | | | | | Merging mariadb-10.0.10. | Nirbhay Choubey | 2014-04-08 | 3 | -4/+4 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merging revision from codership-mysql/5.5 (r3928..3968) and | Nirbhay Choubey | 2014-03-27 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | bzr merge -r3946..3968 codership/5.5 | Nirbhay Choubey | 2014-03-25 | 1 | -0/+1 |
| * | | | | | | | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 5 | -68/+96 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | MDEV#5759 Init script contains syntax error | Nirbhay Choubey | 2014-02-27 | 1 | -1/+5 |
| * | | | | | | | | | * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera. | Nirbhay Choubey | 2014-01-30 | 1 | -1/+8 |
| * | | | | | | | | | Merge MariaDB-10.0.7 revision 3961. | Jan Lindström | 2014-01-25 | 4 | -18/+43 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 6 | -117/+61 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Merged revisions 3418..3424 from mariadb-galera-5.5 | Seppo Jaakola | 2013-10-07 | 1 | -0/+2 |
| * | | | | | | | | | | | Merged revisions 3411..3417 from mariadb-galera-5.5 | Seppo Jaakola | 2013-10-07 | 2 | -1/+133 |
| * | | | | | | | | | | | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 21 | -22/+489 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merged with lp:maria revision #3766 | Seppo Jaakola | 2013-07-13 | 3 | -59/+127 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 3 | -5/+77 |
* | | | | | | | | | | | | | | Merge branch '10.0' into merge-wip | Sergei Golubchik | 2015-01-31 | 2 | -24/+36 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | 5.5 merge | Sergei Golubchik | 2015-01-21 | 1 | -12/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | MDEV-7368 : SLES: Failed to start mysql.service: Unit | Nirbhay Choubey | 2015-01-14 | 2 | -24/+36 |
| | * | | | | | | | | | | | | | mysql-5.5.41 merge | Sergei Golubchik | 2014-12-19 | 1 | -12/+14 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | Rpm 4.9 and newer is more strict regarding weekday in %changelog | Balasubramanian Kandasamy | 2014-10-23 | 1 | -12/+12 |
| | | * | | | | | | | | | | | | | Fix changelog entries build failure | Balasubramanian Kandasamy | 2014-10-21 | 1 | -0/+2 |
| * | | | | | | | | | | | | | | | MDEV-7368 : SLES: Failed to start mysql.service: Unit | Nirbhay Choubey | 2015-01-14 | 2 | -24/+36 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | 5.5.40+ merge | Sergei Golubchik | 2014-10-09 | 1 | -5/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | remove mariadb.pc file again, it cannot be added in a GA versionmariadb-5.5.40 | Sergei Golubchik | 2014-10-08 | 2 | -26/+0 |
| | * | | | | | | | | | | | | packaging issues: | Sergei Golubchik | 2014-10-07 | 1 | -1/+1 |
| | * | | | | | | | | | | | | mysql-5.5.40 | Sergei Golubchik | 2014-10-06 | 1 | -5/+10 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | Add my.cnf.d to regular rpm for EL7 build | Balasubramanian Kandasamy | 2014-08-20 | 1 | -1/+6 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | Corrected typo | Balasubramanian Kandasamy | 2014-08-12 | 1 | -1/+1 |
| | | | * | | | | | | | | | | | Experimental testing | Balasubramanian Kandasamy | 2014-08-12 | 1 | -1/+2 |
| | | | * | | | | | | | | | | | Experimental testing for patch | Balasubramanian Kandasamy | 2014-08-12 | 1 | -1/+1 |
| | | | * | | | | | | | | | | | Added my.cnf.d directory, removed mysql-5.5-libmysqlclient-symbols.patch | Balasubramanian Kandasamy | 2014-08-12 | 3 | -983/+2 |
| | | | * | | | | | | | | | | | Add patch mysql-5.5-libmysqlclient-symbols.patch for el7 | Balasubramanian Kandasamy | 2014-08-12 | 3 | -1/+986 |
| | | * | | | | | | | | | | | | - Merge from mysql-5.5.39-ol7-release branch | Balasubramanian Kandasamy | 2014-08-06 | 1 | -3/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | |||||
| | | | * | | | | | | | | | | | Updated for el7 regular rpms | Balasubramanian Kandasamy | 2014-08-04 | 1 | -3/+3 |
| | | * | | | | | | | | | | | | Bug#19172145 - Remove perl(GD) and dtrace dependencies and bench fix | Balasubramanian Kandasamy | 2014-07-09 | 1 | -1/+6 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | MDEV-5749 Please add a .pc file to MariaDB for easy use via pkg-config | Sergei Golubchik | 2014-10-02 | 2 | -0/+26 |