summaryrefslogtreecommitdiff
path: root/support-files
Commit message (Expand)AuthorAgeFilesLines
* 5.5 mergeSergei Golubchik2013-03-272-14/+18
|\
| * MDEV-4068 rpm scriptlet chown command dangerousSergei Golubchik2013-03-061-13/+18
| * merge with mysql-5.5.30 minus few incorrect or not applicable changesetsSergei Golubchik2013-02-281-1/+0
| |\
| | * Removed Conflicts: mysql-libs mysql-libs-advanced from spec fileBalasubramanian Kandasamy2013-01-161-1/+0
* | | 5.5 mergeSergei Golubchik2013-01-292-17/+39
|\ \ \ | |/ /
| * | mysql-5.5.29 mergeSergei Golubchik2013-01-151-13/+28
| |\ \ | | |/
| | * Spec file: Declare conflicts with the ULN RPMs.Joerg Bruehe2012-07-261-12/+18
| | * Spec file: transfer the 'runselftest' macro to a work tree.Joerg Bruehe2012-07-261-0/+28
| | * Spec file polishing: Handle 'MySQL-*' and 'mysql-*', part 1Joerg Bruehe2012-07-261-0/+5
| | * Merge 5.5.27 into the tree for ULN RPMs.Joerg Bruehe2012-07-251-1/+1
| | |\
| | * | Still work on getting the "SPECIFIC-ULN/" files into the build.Joerg Bruehe2012-06-121-3/+0
| | * | Protect traditional RPMs that "SPECIFIC-ULN/" will not break their packaging.Joerg Bruehe2012-06-111-1/+8
| * | | Buildbot fixes and cleanups:Michael Widenius2013-01-111-2/+11
* | | | cleanup:Sergei Golubchik2013-01-231-1/+0
* | | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-1/+3
* | | | Merge 5.5-mwl248 -> 10.0-baseIgor Babaev2013-01-081-0/+1
|\ \ \ \ | |/ / /
| * | | Fixed some compiler warningsMichael Widenius2012-12-191-0/+1
* | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-162-22/+59
|\ \ \ \ | |/ / /
| * | | mysql-5.5.28Sergei Golubchik2012-10-161-0/+28
| |\ \ \
| | * | | Fix bug#14318456 SPEC FILE DOES NOT RUN THE TEST SUITE DURING RPM BUILDJoerg Bruehe2012-07-241-0/+28
| | | |/ | | |/|
| * | | MDEV-3796 various RPM problemsSergei Golubchik2012-10-051-22/+31
* | | | Fixed compiler warningsMichael Widenius2012-10-041-0/+2
* | | | Automatic merge with 5.5Michael Widenius2012-09-013-2/+3
|\ \ \ \ | |/ / /
| * | | Ensure we don't assert with debug binaries if SHOW INNODB STATUS returns with...Michael Widenius2012-08-201-1/+1
| * | | Fix incorrect regexp in warning suppression patternunknown2012-08-171-1/+1
| * | | Fixed compiler warningsMichael Widenius2012-08-171-0/+1
| * | | merge with MySQL 5.5.27Sergei Golubchik2012-08-091-1/+1
| |\ \ \ | | |/ /
| | * | Backport SuSE 11 fix to RPM spec fileBjorn Munch2012-06-081-1/+1
| | |/
* | | Fixed compiler warningsMichael Widenius2012-07-061-1/+1
* | | automatic merge with 5.5Michael Widenius2012-06-271-3/+6
|\ \ \ | |/ /
| * | commentsSergei Golubchik2012-06-151-3/+6
* | | Switched off Maintainer mode by default as it gave wrong compiler warnings (a...Michael Widenius2012-06-131-4/+0
* | | Fixed some compiler warnings and test failures found by buildbotMichael Widenius2012-06-131-1/+3
* | | Fixed build failures found by buildbotMichael Widenius2012-06-051-1/+13
|/ /
* | MDEV-295 Do NOT start mysql when installing MariaDB rpmsSergei Golubchik2012-05-254-23/+15
* | create a new MariaDB-common.rpm that contains files needed both by the client...Sergei Golubchik2012-05-259-0/+82
* | Building RPMs with CPackSergei Golubchik2012-05-225-1/+184
* | mysql 5.5.23 mergeSergei Golubchik2012-04-101-1/+8
|\ \ | |/
| * Merged some fixes from 7.2 release branchesBjorn Munch2012-03-221-1/+8
* | mysql-5.5 mergeSergei Golubchik2012-01-161-2/+5
|\ \ | |/
| * Merge the changes of 5.5.17 back into main 5.5Joerg Bruehe2011-10-191-2/+5
| |\
| | * Fix the spec file: Files must not be mentioned twice in a "%files" list.Joerg Bruehe2011-09-281-2/+5
* | | 5.3 mergeSergei Golubchik2012-01-131-0/+1
|\ \ \
| * \ \ Merge with 5.2.Michael Widenius2011-12-117-33/+151
| |\ \ \
| | * \ \ Merge with 5.1 + fixes for build failures in 5.2Michael Widenius2011-11-291-0/+1
| | |\ \ \
| | * \ \ \ Merge with MariaDB 5.1Michael Widenius2011-11-246-33/+150
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge with MySQL 5.1.60Michael Widenius2011-11-231-22/+51
| | | |\ \ \
| | | * \ \ \ Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-216-11/+99
| | | |\ \ \ \
* | | | \ \ \ \ mysql-5.5.18 mergeSergei Golubchik2011-11-0314-108/+388
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge to main.Joerg Bruehe2011-10-041-27/+54
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |