summaryrefslogtreecommitdiff
path: root/support-files
Commit message (Expand)AuthorAgeFilesLines
* bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-2116-0/+21
|\
| * 5.5 mergeSergei Golubchik2014-05-0917-1/+22
| |\
| | * Added new states to be able to better diagnose where server hangs.Michael Widenius2014-05-031-0/+2
| | * MDEV-5068 import file from init scriptSergei Golubchik2014-04-101-0/+5
| | * MDEV-5986 MariaDB upgrade on CentOS 6 fails due to sed errorSergei Golubchik2014-04-071-1/+1
| | * mysql-5.5.37 selective mergeSergei Golubchik2014-03-2714-0/+14
| | |\
| | | * Updated/added copyright header. Added line "use is subject to license terms" Murthy Narkedimilli2014-02-1715-0/+15
* | | | 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
|\ \ \ \ | |/ / /
| * | | 5.5 mergeSergei Golubchik2014-03-263-4/+3
| |\ \ \ | | |/ /
| | * | MDEV-5905: Creating tmp. memory table kills the serverMichael Widenius2014-03-261-1/+1
| | * | MDEV-5831 Upgrade from MariaDB 5.5.36 via yum failsSergei Golubchik2014-03-241-0/+1
| | * | MDEV-5892 Centos startup script is brokenSergei Golubchik2014-03-191-4/+1
| | * | Fixed buildbot issuesMichael Widenius2014-03-181-1/+1
| | * | Fixed some buildbot failuresMichael Widenius2014-03-181-0/+1
* | | | 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
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | 10.0-base mergeSergei Golubchik2014-02-263-62/+70
| |\ \ \
| | * \ \ 5.5 mergeSergei Golubchik2014-02-253-62/+70
| | |\ \ \ | | | |/ /
| | | * | MDEV-5580 /etc/init.d/mysql exits too earlySergei Golubchik2014-02-171-59/+66
| | | * | MDEV-5579 rpm postun scriptlet leaks exit code to rpmSergei Golubchik2014-02-171-2/+3
| | | * | MySQL-5.5.36 mergeSergei Golubchik2014-02-171-1/+1
| | | |\ \ | | | | |/
| | | | * Updated/added copyright headersMurthy Narkedimilli2014-01-061-1/+1
| * | | | Fixed errors and warnings found by buildbotMichael Widenius2014-02-061-0/+15
| * | | | 10.0-base mergeSergei Golubchik2014-02-031-0/+5
| |\ \ \ \ | | |/ / /
| | * | | 5.5 mergeSergei Golubchik2014-02-011-0/+5
| | |\ \ \ | | | |/ /
| | | * | MySQL-5.5.35 mergeSergei Golubchik2014-01-221-0/+5
| | | |\ \ | | | | |/
| | | | * Merge 5.1 => 5.5Balasubramanian Kandasamy2013-10-301-0/+5
| | | | |\
| | | | | * Removed non gpl file docs/mysql.info from community packagesBalasubramanian Kandasamy2013-10-301-0/+5
| | | | | * Reverted the changes to spec file to ignore mysqld_safe.pid file, updated th...Balasubramanian Kandasamy2013-09-091-3/+3
| | | | | * Committing patch from venkata.sidagam@oracle.com for Bug#16776528 Hery Ramilison2013-09-091-1/+1
| | | | | * Fixing sles11 build that /usr/lib/mysql/plugin is not owned by a packageHery Ramilison2013-09-031-0/+1
| | | | | * Fix to ignore mysqld_safe.pidBalasubramanian Kandasamy2013-08-301-2/+2
| | | | | * Fix for Bug#17377159, ignore mysqld_safe.pid file created by mysqld_safe scriptBalasubramanian Kandasamy2013-08-291-1/+4
| | | | | * Updated spec file to ignore upgrade error messageBalasubramanian Kandasamy2013-05-071-7/+10
* | | | | | 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
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 10.0-base mergeSergei Golubchik2013-12-164-18/+43
| |\ \ \ \ \ | | |/ / / /
| | * | | | 5.5 mergeSergei Golubchik2013-12-152-2/+7
| | |\ \ \ \ | | | |/ / /
| | | * | | MDEV-5303 rpm post-inst scriptlet creates mysql user with a valid shellSergei Golubchik2013-11-201-2/+2
| | | * | | Fixed compiler errors and warningsMichael Widenius2013-12-021-0/+5
| | * | | | 5.5 mergeSergei Golubchik2013-11-232-16/+36
| | |\ \ \ \ | | | |/ / /
| | | * | | MDEV-5182 - build of 10.0.4/r3863 fails @ 'cmake' withSergey Vojtovich2013-11-181-6/+9
| | | * | | mysql-5.5.34 mergeSergei Golubchik2013-11-191-10/+27
| | | |\ \ \ | | | | |/ /
| | | | * | Reverted the changes to spec file, updated the logic to get the correct count...Balasubramanian Kandasamy2013-09-091-3/+3
| | | | * | Fix to ignore mysqld_safe.pidBalasubramanian Kandasamy2013-08-301-2/+2
| | | | * | Corrected the PID_FILE_PATT manipulationBalasubramanian Kandasamy2013-08-301-2/+2
| | | | * | Fix for Bug#17377159, ignore mysqld_safe.pid file created by mysqld_safe scriptBalasubramanian Kandasamy2013-08-291-2/+5