Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed that 'make distcheck' works with automake 1.11.11 | Michael Widenius | 2012-02-21 | 1 | -0/+3 |
* | 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 |
| | |\ | |||||
| | | * | Fix bug#11886309: RPM UPGRADE OF MYSQL ADVANCED GPL TO MYSQL SERVER ADVANCED ... | Joerg Bruehe | 2011-10-04 | 1 | -22/+51 |
| | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 6 | -11/+99 |
| | |\ \ | | | |/ | |||||
| | | * | Fix bug#37165 "((Generic rpm)) fail to install on Fedora 9 x86_64" | Joerg Bruehe | 2011-08-19 | 1 | -1/+17 |
| | | * | Fix bug#45415: "rpm upgrade recreates test database" | Joerg Bruehe | 2011-07-07 | 1 | -3/+13 |
| | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 6 | -8/+68 |
| | | |\ | |||||
| | | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -3/+4 |
* | | | | | Added mytop to distribution (with some small trivial changes to make it workg... | Michael Widenius | 2011-06-27 | 1 | -0/+1 |
* | | | | | Merge with 5.2 | Michael Widenius | 2011-05-16 | 1 | -0/+7 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Made test-unit run in parlallel. This was achived by having all aria tests th... | Michael Widenius | 2011-05-13 | 1 | -0/+7 |
* | | | | | Merge with dynamic column code | Michael Widenius | 2011-05-12 | 1 | -1/+7 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fixed compiler warnings and test cases problems found by buildbot | Michael Widenius | 2011-05-11 | 1 | -1/+7 |
* | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -10/+53 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -10/+53 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix Bug #56581 RPM scripts use hardcoded datadir location | Joerg Bruehe | 2011-02-03 | 1 | -10/+48 |
* | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 19 | -505/+136 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 19 | -505/+136 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge | Kent Boortz | 2010-12-29 | 28 | -386/+228 |
| | |\ \ | | | |/ | |||||
| | | * | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 29 | -387/+229 |
| | * | | Merge from mysql-5.0-bugteam. | Alexander Nozdrin | 2010-11-24 | 1 | -1/+4 |
| | |\ \ | | | |/ | |||||
| | | * | A follow-up for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file) -- remov... | Alexander Nozdrin | 2010-11-24 | 1 | -1/+4 |
| | * | | Bug #50021: Windows standard configuration files are showing Linux | Georgi Kodinov | 2010-11-18 | 5 | -53/+33 |
* | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 2 | -6/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed compiler and gmake warnings | Michael Widenius | 2010-11-29 | 2 | -6/+0 |
* | | | | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 1 | -10/+10 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 1 | -10/+10 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug #54909: Confusing description about read_buffer_size and | Georgi Kodinov | 2010-08-06 | 1 | -10/+10 |
* | | | | Automatic merge with 5.1 | Michael Widenius | 2010-10-06 | 4 | -4/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | Don't use deprecated --skip-locking option in example config files. | unknown | 2010-10-03 | 4 | -4/+4 |
* | | | | rename maria to aria | Sergei Golubchik | 2010-09-12 | 1 | -1/+1 |
|/ / / | |||||
* | | | Fixed test failure | Michael Widenius | 2010-08-30 | 1 | -0/+2 |
* | | | Fixed build & test failures in buildbot | Michael Widenius | 2010-08-28 | 1 | -1/+6 |
* | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -3/+0 |
|\ \ \ | |/ / | |||||
* | | | Fixed compilation failure and added some new suppressions | Michael Widenius | 2010-08-20 | 1 | -0/+2 |
* | | | Fixed compiler warnings from Windows compiler | Michael Widenius | 2010-08-11 | 1 | -0/+2 |
* | | | Fixed test case and compiler warnings | Michael Widenius | 2010-08-06 | 1 | -0/+5 |
* | | | Fixed compiler warnings | Michael Widenius | 2010-08-04 | 1 | -0/+1 |
* | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -13/+117 |
|\ \ \ | |/ / | |||||
| * | | Fix bug#27072: RPM autostarts the server | Joerg Bruehe | 2010-06-15 | 1 | -7/+113 |
* | | | Fixed compiler warnings | Michael Widenius | 2010-06-16 | 1 | -1/+1 |
* | | | Fixed compiler warnings | Michael Widenius | 2010-05-27 | 1 | -1/+3 |
* | | | Fixed build failures and compiler warning | Michael Widenius | 2010-05-14 | 1 | -0/+2 |
* | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -196/+361 |
|\ \ \ | |/ / | |||||
| * | | Spec file for RPMs: | Joerg Bruehe | 2010-03-01 | 1 | -3/+10 |
| * | | Fix a bug in the RPM spec file: | Joerg Bruehe | 2010-02-17 | 1 | -0/+3 |
| * | | Correction: The "release" setting had got lost in the RPM spec file. | Joerg Bruehe | 2010-02-12 | 1 | -0/+2 |