Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.5 merge | Sergei Golubchik | 2013-01-29 | 2 | -17/+39 |
|\ | |||||
| * | mysql-5.5.29 merge | Sergei Golubchik | 2013-01-15 | 1 | -13/+28 |
| |\ | |||||
| | * | Spec file: Declare conflicts with the ULN RPMs. | Joerg Bruehe | 2012-07-26 | 1 | -12/+18 |
| | * | Spec file: transfer the 'runselftest' macro to a work tree. | Joerg Bruehe | 2012-07-26 | 1 | -0/+28 |
| | * | Spec file polishing: Handle 'MySQL-*' and 'mysql-*', part 1 | Joerg Bruehe | 2012-07-26 | 1 | -0/+5 |
| | * | Merge 5.5.27 into the tree for ULN RPMs. | Joerg Bruehe | 2012-07-25 | 1 | -1/+1 |
| | |\ | |||||
| | * | | Still work on getting the "SPECIFIC-ULN/" files into the build. | Joerg Bruehe | 2012-06-12 | 1 | -3/+0 |
| | * | | Protect traditional RPMs that "SPECIFIC-ULN/" will not break their packaging. | Joerg Bruehe | 2012-06-11 | 1 | -1/+8 |
| * | | | Buildbot fixes and cleanups: | Michael Widenius | 2013-01-11 | 1 | -2/+11 |
* | | | | cleanup: | Sergei Golubchik | 2013-01-23 | 1 | -1/+0 |
* | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -1/+3 |
* | | | | Merge 5.5-mwl248 -> 10.0-base | Igor Babaev | 2013-01-08 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed some compiler warnings | Michael Widenius | 2012-12-19 | 1 | -0/+1 |
* | | | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 2 | -22/+59 |
|\ \ \ \ | |/ / / | |||||
| * | | | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -0/+28 |
| |\ \ \ | |||||
| | * | | | Fix bug#14318456 SPEC FILE DOES NOT RUN THE TEST SUITE DURING RPM BUILD | Joerg Bruehe | 2012-07-24 | 1 | -0/+28 |
| | | |/ | | |/| | |||||
| * | | | MDEV-3796 various RPM problems | Sergei Golubchik | 2012-10-05 | 1 | -22/+31 |
* | | | | Fixed compiler warnings | Michael Widenius | 2012-10-04 | 1 | -0/+2 |
* | | | | Automatic merge with 5.5 | Michael Widenius | 2012-09-01 | 3 | -2/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Ensure we don't assert with debug binaries if SHOW INNODB STATUS returns with... | Michael Widenius | 2012-08-20 | 1 | -1/+1 |
| * | | | Fix incorrect regexp in warning suppression pattern | unknown | 2012-08-17 | 1 | -1/+1 |
| * | | | Fixed compiler warnings | Michael Widenius | 2012-08-17 | 1 | -0/+1 |
| * | | | merge with MySQL 5.5.27 | Sergei Golubchik | 2012-08-09 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Backport SuSE 11 fix to RPM spec file | Bjorn Munch | 2012-06-08 | 1 | -1/+1 |
| | |/ | |||||
* | | | Fixed compiler warnings | Michael Widenius | 2012-07-06 | 1 | -1/+1 |
* | | | automatic merge with 5.5 | Michael Widenius | 2012-06-27 | 1 | -3/+6 |
|\ \ \ | |/ / | |||||
| * | | comments | Sergei Golubchik | 2012-06-15 | 1 | -3/+6 |
* | | | Switched off Maintainer mode by default as it gave wrong compiler warnings (a... | Michael Widenius | 2012-06-13 | 1 | -4/+0 |
* | | | Fixed some compiler warnings and test failures found by buildbot | Michael Widenius | 2012-06-13 | 1 | -1/+3 |
* | | | Fixed build failures found by buildbot | Michael Widenius | 2012-06-05 | 1 | -1/+13 |
|/ / | |||||
* | | MDEV-295 Do NOT start mysql when installing MariaDB rpms | Sergei Golubchik | 2012-05-25 | 4 | -23/+15 |
* | | create a new MariaDB-common.rpm that contains files needed both by the client... | Sergei Golubchik | 2012-05-25 | 9 | -0/+82 |
* | | Building RPMs with CPack | Sergei Golubchik | 2012-05-22 | 5 | -1/+184 |
* | | mysql 5.5.23 merge | Sergei Golubchik | 2012-04-10 | 1 | -1/+8 |
|\ \ | |/ | |||||
| * | Merged some fixes from 7.2 release branches | Bjorn Munch | 2012-03-22 | 1 | -1/+8 |
* | | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 1 | -2/+5 |
|\ \ | |/ | |||||
| * | Merge the changes of 5.5.17 back into main 5.5 | Joerg Bruehe | 2011-10-19 | 1 | -2/+5 |
| |\ | |||||
| | * | Fix the spec file: Files must not be mentioned twice in a "%files" list. | Joerg Bruehe | 2011-09-28 | 1 | -2/+5 |
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -0/+1 |
|\ \ \ | |||||
| * \ \ | Merge with 5.2. | Michael Widenius | 2011-12-11 | 7 | -33/+151 |
| |\ \ \ | |||||
| | * \ \ | Merge with 5.1 + fixes for build failures in 5.2 | Michael Widenius | 2011-11-29 | 1 | -0/+1 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 6 | -33/+150 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 1 | -22/+51 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 6 | -11/+99 |
| | | |\ \ \ \ | |||||
* | | | \ \ \ \ | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 14 | -108/+388 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | Merge to main. | Joerg Bruehe | 2011-10-04 | 1 | -27/+54 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | Fix bug#11886309: RPM UPGRADE OF MYSQL ADVANCED GPL TO MYSQL SERVER ADVANCED ... | Joerg Bruehe | 2011-10-04 | 1 | -27/+54 |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | |||||
| | | * | | | | | Fix bug#11886309: RPM UPGRADE OF MYSQL ADVANCED GPL TO MYSQL SERVER ADVANCED ... | Joerg Bruehe | 2011-10-04 | 1 | -22/+51 |
| | | | |_|_|/ | | | |/| | | | |||||
| * | | | | | | merge from 5.5.16 | Daniel Fischer | 2011-09-21 | 1 | -23/+11 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | add mysql_plugin man page to spec file | Daniel Fischer | 2011-09-08 | 1 | -0/+5 |