summaryrefslogtreecommitdiff
path: root/support-files
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-291-3/+3
|\
| * Fixed failing test cases and compiler warningsMonty2016-04-251-3/+3
* | Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-192-1/+19
|\ \ | |/
| * Merge branch '5.5' into 10.0Sergei Golubchik2015-12-131-1/+1
| |\
| | * MDEV-8607 Init script doesn't check all applicable configuration groupsSergei Golubchik2015-12-071-1/+1
| * | Fixed problems found by buildbot:Monty2015-11-271-0/+18
* | | Merge tag 'mariadb-10.0.22' into 10.0-galeraNirbhay Choubey2015-10-312-16/+11
|\ \ \ | |/ /
| * | MDEV-8543 mysql.server script not correctly handle --pid-file.mariadb-10.0.22Sergei Golubchik2015-10-281-9/+4
| * | Merge branch '5.5' into 10.0Sergei Golubchik2015-10-091-7/+7
| |\ \ | | |/
| | * Merge remote-tracking branch 'mysql/5.5' into 5.5Sergei Golubchik2015-10-081-7/+7
| | |\
| | | * Bug#21527467 - RPM SCRIPTS FAIL WITH MULTIPLE DATADIRBalasubramanian Kandasamy2015-08-261-7/+7
* | | | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-09-251-0/+8
|\ \ \ \
| * | | | MDEV-8803: Debian jessie 8.2 + MariaDB 10.1.7 + GaleraClusterNirbhay Choubey2015-09-151-0/+8
| * | | | Merge tag 'mariadb-5.5.44' into 5.5-galeraNirbhay Choubey2015-06-211-2/+2
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch '5.5' into 5.5-galeraNirbhay Choubey2015-02-184-32/+42
| |\ \ \ \
| * \ \ \ \ Merge revisions from maria/5.5 (5.5.41)Nirbhay Choubey2014-12-221-11/+13
| |\ \ \ \ \
| * | | | | | MDEV-7319 : Galera bootstrap (/etc/init.d/mysql bootstrap)Nirbhay Choubey2014-12-201-1/+2
| * | | | | | bzr merge -rtag:mariadb-5.5.40 maria/5.5Nirbhay Choubey2014-10-091-6/+12
| |\ \ \ \ \ \
| * | | | | | | Moved wsrep_slave_threads to optional settings.Nirbhay Choubey2014-09-241-1/+1
| * | | | | | | Updated config files:Nirbhay Choubey2014-09-232-8/+1
| * | | | | | | bzr merge -r3997..4010 codership-mysql/5.5Nirbhay Choubey2014-08-061-1/+4
| * | | | | | | Local merge of mariadb-5.5.39Nirbhay Choubey2014-08-063-4/+16
| |\ \ \ \ \ \ \
| * | | | | | | | MDEV-6495: innodb_flush_log_at_trx_commit=0 as suggestionNirbhay Choubey2014-08-051-1/+1
| * | | | | | | | MDEV-3896: More user-friendly cnf files in MariaDB-Galera rpm/debNirbhay Choubey2014-07-171-0/+16
| * | | | | | | | bzr merge -r3985..3997 codership/5.5Nirbhay Choubey2014-06-101-1/+1
| * | | | | | | | bzr merge -rtag:mariadb-5.5.38 maria/5.5Nirbhay Choubey2014-06-102-2/+3
| |\ \ \ \ \ \ \ \
| * | | | | | | | | * Removed unnecessary duplicate script files.Nirbhay Choubey2014-04-181-1/+0
| * | | | | | | | | Merge lp:codership-mysql/5.5 -r3961..3980.Jan Lindström2014-04-162-0/+2
| * | | | | | | | | Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.Jan Lindström2014-04-1617-2/+23
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge from maria/5.5 (-rtag:mariadb-5.5.36).Nirbhay Choubey2014-02-253-69/+104
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge of maria/5.5 into maria-5.5-galera.Nirbhay Choubey2014-01-293-2/+12
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Merging revision 3839..3932 from codership-mysql/5.5.Nirbhay Choubey2014-01-091-28/+1
| * | | | | | | | | | | | MDEV#5384: Update init script in MariaDB ClusterNirbhay Choubey2013-12-051-2/+2
| * | | | | | | | | | | | Merge with MariaDB 5.5.34.Jan Lindström2013-11-253-22/+37
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Merged revisions 3916--3921 from lp:~codership/codership-mysql/5.5-23Jan Lindström2013-09-261-2/+2
| * | | | | | | | | | | | | mariadb-5.5.33 mergeSergei Golubchik2013-09-182-17/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Merged with lp:~codership/codership-mysql/5.5-23, up to revision 3903Seppo Jaakola2013-08-212-2/+5
| * | | | | | | | | | | | | | Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32Seppo Jaakola2013-08-2117-22/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | References: MDEV-4572 - merge with lp:codership-mysql/5.5-23 revisions 3874.....Seppo Jaakola2013-06-151-2/+15
| * | | | | | | | | | | | | | | References: MDEV-4572 - merge with mariaDB 5.5.31Seppo Jaakola2013-05-263-58/+127
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ References: MDEV-4572 - merge with mariaDB 5.5.30Seppo Jaakola2013-05-242-14/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ References lp:1115708 - merged with lp:mariadb/5.5 revision 3657Seppo Jaakola2013-02-052-15/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | remerging wsrep files from lp:codership-mysqlSeppo Jaakola2013-02-052-0/+231
| * | | | | | | | | | | | | | | | | | re-merging wsrep files from lp:codership-mysqlSeppo Jaakola2013-02-052-231/+0
| * | | | | | | | | | | | | | | | | | References lp:1066784 - bzr merge lp:maria/5.5 (rev: 3562)Seppo Jaakola2012-10-242-22/+59
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ References lp:1051808 - merged with lp:maria/5.5Seppo Jaakola2012-09-173-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | References lp:1051808 - merged with lp:codership-mysql 5.5.27 based trunkSeppo Jaakola2012-09-172-7/+7
| * | | | | | | | | | | | | | | | | | | | References lp:1034621 - Merge up to mysql-5.5.25 levelSeppo Jaakola2012-08-093-4/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ references lp:1011983Seppo Jaakola2012-06-1210-1/+258
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge with mariaDB 5.5.23: bzr merge lp:maria/5.5Seppo Jaakola2012-04-261-1/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status