summaryrefslogtreecommitdiff
path: root/support-files
Commit message (Expand)AuthorAgeFilesLines
* cleanups done as part of adding encryptionMonty2015-02-101-5/+12
* Merge 10.0-galera into 10.1Sergei Golubchik2015-02-063-9/+3
|\
| * maria-10.0.16 mergeNirbhay Choubey2015-01-263-35/+49
| |\
| * | MDEV-7319 : Galera bootstrap (/etc/init.d/mysql bootstrap)Nirbhay Choubey2014-12-201-1/+2
| * | bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-051-5/+10
| |\ \
| * \ \ bzr merge -rtag:mariadb-10.0.14 maria/10.0/Nirbhay Choubey2014-09-281-5/+2
| |\ \ \
| * | | | Moved wsrep_slave_threads to optional settings.Nirbhay Choubey2014-09-241-1/+1
| * | | | Updated config files:Nirbhay Choubey2014-09-235-368/+1
| * | | | bzr merge -r4104..4120 codership/5.6/Nirbhay Choubey2014-08-121-1/+4
| * | | | bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-113-4/+16
| |\ \ \ \
| * | | | | MDEV-6495: local merge from maria-5.5-galera.Nirbhay Choubey2014-08-051-1/+1
| * | | | | Local merge of patch for MDEV-3896 from maria-5.5-galera.Nirbhay Choubey2014-07-211-0/+16
| * | | | | bzr merge -rtag:mariadb-10.0.12 maria/10.0Nirbhay Choubey2014-06-191-2/+1
| |\ \ \ \ \
| * | | | | | bzr merge -r3985..3991 codership/5.5Nirbhay Choubey2014-05-211-1/+1
| * | | | | | bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-2116-0/+21
| |\ \ \ \ \ \
| * | | | | | | MDEV#6132: yum update for MGC-10.0 fails (10.0.7 -> 10.0.10)mariadb-galera-10.0.10Nirbhay Choubey2014-04-171-1/+1
| * | | | | | | Merging mariadb-10.0.10.Nirbhay Choubey2014-04-083-4/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merging revision from codership-mysql/5.5 (r3928..3968) andNirbhay Choubey2014-03-271-0/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | bzr merge -r3946..3968 codership/5.5Nirbhay Choubey2014-03-251-0/+1
| * | | | | | | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-265-68/+96
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | MDEV#5759 Init script contains syntax errorNirbhay Choubey2014-02-271-1/+5
| * | | | | | | | | * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.Nirbhay Choubey2014-01-301-1/+8
| * | | | | | | | | Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-254-18/+43
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-046-117/+61
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Merged revisions 3418..3424 from mariadb-galera-5.5Seppo Jaakola2013-10-071-0/+2
| * | | | | | | | | | | Merged revisions 3411..3417 from mariadb-galera-5.5Seppo Jaakola2013-10-072-1/+133
| * | | | | | | | | | | Merge 10.0 to galera-10.0Jan Lindström2013-09-0321-22/+489
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merged with lp:maria revision #3766Seppo Jaakola2013-07-133-59/+127
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-133-5/+77
* | | | | | | | | | | | | | Merge branch '10.0' into merge-wipSergei Golubchik2015-01-312-24/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | 5.5 mergeSergei Golubchik2015-01-211-12/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | MDEV-7368 : SLES: Failed to start mysql.service: UnitNirbhay Choubey2015-01-142-24/+36
| | * | | | | | | | | | | | | mysql-5.5.41 mergeSergei Golubchik2014-12-191-12/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Rpm 4.9 and newer is more strict regarding weekday in %changelogBalasubramanian Kandasamy2014-10-231-12/+12
| | | * | | | | | | | | | | | | Fix changelog entries build failureBalasubramanian Kandasamy2014-10-211-0/+2
| * | | | | | | | | | | | | | | MDEV-7368 : SLES: Failed to start mysql.service: UnitNirbhay Choubey2015-01-142-24/+36
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | 5.5.40+ mergeSergei Golubchik2014-10-091-5/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | remove mariadb.pc file again, it cannot be added in a GA versionmariadb-5.5.40Sergei Golubchik2014-10-082-26/+0
| | * | | | | | | | | | | | packaging issues:Sergei Golubchik2014-10-071-1/+1
| | * | | | | | | | | | | | mysql-5.5.40Sergei Golubchik2014-10-061-5/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | Add my.cnf.d to regular rpm for EL7 buildBalasubramanian Kandasamy2014-08-201-1/+6
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Corrected typoBalasubramanian Kandasamy2014-08-121-1/+1
| | | | * | | | | | | | | | | Experimental testingBalasubramanian Kandasamy2014-08-121-1/+2
| | | | * | | | | | | | | | | Experimental testing for patchBalasubramanian Kandasamy2014-08-121-1/+1
| | | | * | | | | | | | | | | Added my.cnf.d directory, removed mysql-5.5-libmysqlclient-symbols.patchBalasubramanian Kandasamy2014-08-123-983/+2
| | | | * | | | | | | | | | | Add patch mysql-5.5-libmysqlclient-symbols.patch for el7Balasubramanian Kandasamy2014-08-123-1/+986
| | | * | | | | | | | | | | | - Merge from mysql-5.5.39-ol7-release branchBalasubramanian Kandasamy2014-08-061-3/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / /
| | | | * | | | | | | | | | | Updated for el7 regular rpmsBalasubramanian Kandasamy2014-08-041-3/+3
| | | * | | | | | | | | | | | Bug#19172145 - Remove perl(GD) and dtrace dependencies and bench fixBalasubramanian Kandasamy2014-07-091-1/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / /
| | * | | | | | | | | | | | | MDEV-5749 Please add a .pc file to MariaDB for easy use via pkg-configSergei Golubchik2014-10-022-0/+26