Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove PBXT | Sergei Golubchik | 2013-08-30 | 1 | -5/+0 |
* | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ | |||||
| * | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -1/+2 |
| |\ | |||||
| | * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -1/+2 |
| | |\ | |||||
| | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -1/+2 |
| | | |\ | |||||
| | | | * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -1/+2 |
| | | | |\ | |||||
* | | | | \ | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 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.1 | Michael Widenius | 2010-12-04 | 1 | -2/+0 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warnings | Vladislav Vaintroub | 2010-12-01 | 1 | -4/+2 |
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -3/+4 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | merge mysql-5.1-security->mysql-5.5-security | Georgi Kodinov | 2011-04-07 | 1 | -0/+1 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | merge mysql-5.0-security->mysql-5.1-security | Georgi Kodinov | 2011-03-21 | 1 | -0/+1 |
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | | * | | | Bug #59815: Missing License information with enterprise GPL packages | Georgi Kodinov | 2011-02-08 | 1 | -0/+1 |
| * | | | | | Merge | Kent Boortz | 2010-12-29 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge | Kent Boortz | 2010-12-29 | 1 | -1/+1 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 1 | -1/+1 |
| * | | | | | Merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2010-11-24 | 1 | -2/+2 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge from mysql-5.0-bugteam. | Alexander Nozdrin | 2010-11-24 | 1 | -2/+2 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | A follow-up for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file) -- remov... | Alexander Nozdrin | 2010-11-24 | 1 | -2/+2 |
* | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -37/+32 |
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 1 | -0/+1 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 1 | -0/+1 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug#55846: Link tests fail on Windows - my_compiler.h missing | Davi Arnaut | 2010-08-24 | 1 | -0/+1 |
| * | | | | make_win_bin_dist: include all dynamic plugins, not only innodb_plugin | Sergei Golubchik | 2010-09-16 | 1 | -14/+6 |
| * | | | | rename maria to aria | Sergei Golubchik | 2010-09-12 | 1 | -1/+1 |
| * | | | | fixes for buildbot | Sergei Golubchik | 2010-07-25 | 1 | -2/+2 |
| |/ / / | |||||
| * | | | Merge to get PBXT's xstat program | Michael Widenius | 2010-05-12 | 1 | -0/+5 |
| * | | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| * | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -0/+1 |
| |\ \ \ | |||||
| * | | | | Fix make_win_bin_dist: | Sergey Petrunya | 2009-10-09 | 1 | -3/+21 |
* | | | | | Cherry-picking patch for Bug#55846. | Alexander Nozdrin | 2010-08-31 | 1 | -0/+1 |
* | | | | | WL#5498: Remove dead and unused source code | Davi Arnaut | 2010-07-23 | 1 | -1/+0 |
* | | | | | Make the libraries we produce on Windows actually usable | Daniel Fischer | 2010-04-16 | 1 | -0/+1 |
* | | | | | Some fixes for the build on Windows | Joerg Bruehe | 2010-03-22 | 1 | -5/+3 |
* | | | | | Automerge the build fixes of 5.5.0-m2 back into the tree. | Joerg Bruehe | 2009-12-16 | 1 | -0/+19 |
|\ \ \ \ \ | |||||
| * | | | | | Handle the "semisync" plugin in | MySQL Build Team | 2009-11-26 | 1 | -0/+19 |
* | | | | | | Manual merge from the mysql-5.1-bugteam. | Alexey Kopytov | 2009-11-24 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | Merge | Kent Boortz | 2009-11-17 | 1 | -1/+1 |
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | |||||
| | * | | Include the "mysql-test/collections" directory when creating windows ZIP archive | Kent Boortz | 2009-11-17 | 1 | -1/+1 |
* | | | | Merge from mysql-5.1. | Alexander Nozdrin | 2009-10-13 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | bug#41546: mysql-stress-run.pl is not packaged on Windows | Jonathan Perkin | 2009-09-30 | 1 | -0/+1 |
* | | | | Merge from mysql-5.1. | Alexander Nozdrin | 2009-09-23 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Install mysqld.lib | Jonathan Perkin | 2009-09-04 | 1 | -0/+1 |
| | |/ | |/| | |||||
* | | | Merge from mysql-5.1. | Alexander Nozdrin | 2009-09-19 | 1 | -0/+17 |
|\ \ \ | |/ / | |||||
| * | | Only install the innodb plugin if the plugin directory exists. | Jonathan Perkin | 2009-09-01 | 1 | -8/+14 |
| * | | Install innodb_plugin on Windows. | Jonathan Perkin | 2009-08-18 | 1 | -0/+11 |
* | | | Merge MySQL 5.1.35 into MySQL 5.4 | Mikael Ronstrom | 2009-06-11 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Upmerge the fix of an error message typo | Joerg Bruehe | 2009-04-14 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Just fix a silly typo in an error message ... | Joerg Bruehe | 2009-04-14 | 1 | -1/+1 |