Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Next part of merge. See TODO for details | Michael Widenius | 2012-08-14 | 9 | -1/+34 |
* | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6 | Michael Widenius | 2012-08-01 | 1 | -1/+20 |
* | Fixed compiler warnings | Michael Widenius | 2012-07-06 | 1 | -1/+1 |
* | automatic merge with 5.5 | Michael Widenius | 2012-06-27 | 3 | -14/+59 |
|\ | |||||
| * | Merge 5.3 -> 5.5 | Sergey Petrunya | 2012-06-20 | 1 | -4/+7 |
| |\ | |||||
| | * | Merge 5.2->5.3 | Sergey Petrunya | 2012-06-18 | 1 | -4/+7 |
| | |\ | |||||
| | | * | 5.1 merge | Sergei Golubchik | 2012-06-01 | 1 | -4/+7 |
| | | |\ | |||||
| | | | * | MDEV-256 lp:995501 - mysqltest attempts to parse Perl code inside a block | Sergei Golubchik | 2012-06-01 | 1 | -4/+7 |
| * | | | | various documentation updates | Daniel Bartholomew | 2012-06-18 | 1 | -1/+1 |
| * | | | | merge | Sergei Golubchik | 2012-06-16 | 1 | -8/+50 |
| |\ \ \ \ | |||||
| | * \ \ \ | mysql-5.5 merge | Sergei Golubchik | 2012-06-14 | 1 | -8/+50 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Bug #11754178 45740: MYSQLDUMP DOESN'T DUMP GENERAL_LOG AND SLOW_QUERY | Venkata Sidagam | 2012-05-07 | 1 | -8/+50 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Bug #11754178 45740: MYSQLDUMP DOESN'T DUMP GENERAL_LOG AND SLOW_QUERY | Venkata Sidagam | 2012-05-04 | 1 | -8/+50 |
| * | | | | | | | Fix for: lp:1013432 and MySQL#64800: | Michael Widenius | 2012-06-15 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Fixed some compiler warnings and test failures found by buildbot | Michael Widenius | 2012-06-13 | 1 | -0/+2 |
* | | | | | | | Fixed build failures found by buildbot | Michael Widenius | 2012-06-05 | 1 | -1/+1 |
* | | | | | | | Increased the version number to 10.0 | Michael Widenius | 2012-05-31 | 1 | -7/+9 |
|/ / / / / / | |||||
* | | | | | | Building RPMs with CPack | Sergei Golubchik | 2012-05-22 | 1 | -1/+1 |
* | | | | | | 5.3 merge | Sergei Golubchik | 2012-05-21 | 1 | -5/+40 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | 5.2 merge | Sergei Golubchik | 2012-05-20 | 1 | -1/+2 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | 5.1 merge | Sergei Golubchik | 2012-05-18 | 1 | -1/+2 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | merge with mysql-5.1.63 | Sergei Golubchik | 2012-05-17 | 1 | -1/+2 |
| | | |\ \ \ | |||||
| | | | * | | | Bug #11766072 59107: MYSQLSLAP CRASHES IF STARTED WITH NO ARGUMENTS ON WINDOWS | Venkata Sidagam | 2012-04-09 | 1 | -1/+2 |
| | | | | |/ | | | | |/| | |||||
| * | | | | | Merge 5.2->5.3 | unknown | 2012-05-11 | 1 | -5/+40 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Fixed typo | unknown | 2012-05-10 | 1 | -1/+1 |
| | * | | | | MDEV-261 : mysqtest crashes when assigning variable to result of select , like | Vladislav Vaintroub | 2012-05-08 | 1 | -5/+40 |
| * | | | | | 5.2 merge | Sergei Golubchik | 2012-05-02 | 1 | -1/+0 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | 5.1 merge | Sergei Golubchik | 2012-05-02 | 1 | -1/+0 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | lp:986120 Problem installing mariadb 5 on solaris 10 | Sergei Golubchik | 2012-04-24 | 1 | -1/+0 |
| * | | | | | merge | Sergei Golubchik | 2012-04-05 | 2 | -127/+333 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | merge | Sergei Golubchik | 2012-04-05 | 2 | -130/+335 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | mysql-5.1.62 merge | Sergei Golubchik | 2012-04-05 | 2 | -130/+335 |
| | | |\ \ \ | | | | |/ / | |||||
| | | * | | | Fix main.merge testcase on Windows | Vladislav Vaintroub | 2011-12-01 | 1 | -1/+1 |
* | | | | | | c | Sergei Golubchik | 2012-05-21 | 1 | -1/+2 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merged from 5.1 to 5.5 | Venkata Sidagam | 2012-04-09 | 1 | -1/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | Bug #11766072 59107: MYSQLSLAP CRASHES IF STARTED WITH NO ARGUMENTS ON WINDOWS | Venkata Sidagam | 2012-04-09 | 1 | -1/+2 |
| | | |_|_|/ | | |/| | | | |||||
* | | | | | | Added --continue-on-error to mysqltest and mysql-test-run | Sergei Golubchik | 2012-05-15 | 1 | -116/+237 |
* | | | | | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 4 | -6/+6 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Further upmerge the yaSSL upgrade (to 2.2.0) from MySQL 5.1 to 5.5. | Joerg Bruehe | 2012-03-02 | 1 | -2/+2 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | AIX builds fail for comments using // | Karen Langford | 2012-02-28 | 1 | -2/+2 |
| * | | | | | Updated/added copyright headers | MySQL Build Team | 2012-02-16 | 4 | -4/+4 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2012-02-15 | 2 | -2/+2 |
| | |\ \ \ \ | |||||
| | | * | | | | Updated/added copyright headers | MySQL Build Team | 2012-02-15 | 1 | -2/+1 |
| | | * | | | | auto-merge mysql-5.0->mysql-5.0-security | Georgi Kodinov | 2011-10-12 | 9 | -60/+39 |
| | | |\ \ \ \ | |||||
| | * | | | | | | Bug #11760384 52792: MYSQLDUMP IN XML MODE DOES NOT | Nirbhay Choubey | 2012-01-17 | 1 | -1/+1 |
* | | | | | | | | MDEV-186 Client programs throw warnings about memory loss when executed with ... | Sergei Golubchik | 2012-03-23 | 8 | -26/+40 |
* | | | | | | | | merge with mysql-5.5.21 | Sergei Golubchik | 2012-03-09 | 2 | -134/+342 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge with main for BUG#12969301 | unknown | 2012-01-30 | 2 | -142/+369 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | fix compile warning: may be used uninitialized | Tor Didriksen | 2012-01-12 | 1 | -1/+1 |
| | * | | | | | | | Merge of fix for bug#11760384 from mysql-5.1. | Nirbhay Choubey | 2012-01-10 | 1 | -131/+335 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / |