Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 6 | -19/+59 |
|\ | |||||
| * | Bug #49223 Change help description for mysqldump | Staale Smedseng | 2010-01-27 | 1 | -1/+1 |
| * | WL#5182 Remove more deprecated 4.1/5.0 features | Magne Mahre | 2010-01-27 | 3 | -5/+9 |
| * | WL#5154 Remove deprecated 4.1 features | Magne Mahre | 2010-01-21 | 5 | -10/+41 |
| * | merge | Georgi Kodinov | 2009-12-24 | 1 | -1/+1 |
| |\ | |||||
| | * | Bug #48866: mysql.test fails under Fedora 12 | Georgi Kodinov | 2009-12-16 | 1 | -1/+1 |
| * | | Manual merge. | Davi Arnaut | 2009-12-18 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | Bug#48983: Bad strmake calls (length one too long) | Davi Arnaut | 2009-12-17 | 1 | -2/+2 |
| | * | Backport fix for Bug #27884. | Jim Winstead | 2009-11-23 | 1 | -4/+7 |
| * | | Merge approved bug fix | Jim Winstead | 2009-12-17 | 1 | -1/+2 |
| |\ \ | |||||
| | * | | The mysql command line client ignored the --skip-column-names option | Jim Winstead | 2009-09-21 | 1 | -1/+2 |
| * | | | This is a patch for bug#41569. | unknown | 2009-12-03 | 1 | -0/+4 |
* | | | | Patch set contributed by Alex Budovski (MCA) | Michael Widenius | 2010-01-29 | 1 | -15/+22 |
* | | | | Fixed compiler warnings & failing test cases | Michael Widenius | 2010-01-28 | 1 | -1/+3 |
* | | | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -5/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | merge to mysql-5.1-bugteam | Satya B | 2009-11-26 | 1 | -3/+1 |
| |\ \ \ | |||||
| | * \ \ | auto-merge | Tatiana A. Nurnberg | 2009-11-24 | 1 | -3/+1 |
| | |\ \ \ | |||||
| | | * | | | Bug#47655: Memory free error when connecting to 4.1 server from 5.1+ client | Tatiana A. Nurnberg | 2009-11-02 | 1 | -3/+1 |
| * | | | | | Fix for BUG#47671 - wrong character-set after upgrade from 5.1.34 to 5.1.39 | Satya B | 2009-11-25 | 1 | -2/+2 |
| |/ / / / | |||||
| * | | | | Post-merge fixes: fix typo and remove unused variables. | Davi Arnaut | 2009-11-21 | 1 | -4/+1 |
* | | | | | Fixed bug where mysqlbinlog hold up multiple connections to MySQL when using ... | Michael Widenius | 2010-01-09 | 1 | -0/+4 |
* | | | | | Fix test suite so that it works when doing configure --without-uca | Michael Widenius | 2009-12-27 | 1 | -1/+5 |
* | | | | | Merge | Michael Widenius | 2009-12-03 | 4 | -67/+59 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge with maria-5.1-federatedx; A patch to fix bugs in federatedx and enable... | Michael Widenius | 2009-12-03 | 4 | -67/+59 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge with MySQL 5.1, with following additions: | Michael Widenius | 2009-11-11 | 7 | -62/+272 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
* | | | | | | | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes. | unknown | 2009-11-30 | 7 | -62/+272 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 7 | -62/+272 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | |||||
| | * | | | | merge | Vladislav Vaintroub | 2009-11-03 | 3 | -38/+57 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | merge | Georgi Kodinov | 2009-10-30 | 1 | -24/+28 |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | |||||
| | | | * | | | merge from 5.0-main | Georgi Kodinov | 2009-10-30 | 1 | -24/+28 |
| | | | |\ \ \ | |||||
| | | | | * \ \ | Merge from mysql-5.0.87-release | unknown | 2009-10-26 | 1 | -24/+28 |
| | | | | |\ \ \ | |||||
| | | | | | * | | | Added make targets 'test-bt-fast' and 'test-bt-debug-fast' | Hery Ramilison | 2009-10-15 | 1 | -27/+28 |
| | | * | | | | | | Bug #34777 mysqlbinlog: --help output for --base64-output is hard to unders... | unknown | 2009-10-28 | 1 | -5/+7 |
| | | | |_|_|/ / | | | |/| | | | | |||||
| | | * | | | | | merged 5.1-main-> 5.1-bugteam | Georgi Kodinov | 2009-10-23 | 1 | -0/+1 |
| | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ | merge from 5.1 main | Bjorn Munch | 2009-10-16 | 7 | -12/+80 |
| | | | |\ \ \ \ \ | |||||
| | | | * | | | | | | Bug #47218 mysqltest ignores "error" command inside if inside loop | Bjorn Munch | 2009-10-08 | 1 | -0/+1 |
| | | * | | | | | | | auto-merge | Tatiana A. Nurnberg | 2009-10-20 | 1 | -7/+5 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | Bug #34777 mysqlbinlog: --help output for --base64-output is hard to unders... | unknown | 2009-10-20 | 1 | -7/+5 |
| | | | | |/ / / / / | | | | |/| | | | | | |||||
| | | * | | | | | | | manual merge of 28141 | Tatiana A. Nurnberg | 2009-10-20 | 1 | -6/+20 |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | / / / / | | | | | |/ / / / | | | | |/| | | | | |||||
| | | | * | | | | | Bug#28141: Control C on query waiting on lock causes ERROR 1053 (server shutd... | Tatiana A. Nurnberg | 2009-10-19 | 1 | -3/+19 |
| | | | | |/ / / | | | | |/| | | | |||||
| | | * | | | | | merge | Georgi Kodinov | 2009-10-14 | 1 | -1/+1 |
| | | |\ \ \ \ \ | | | | |/ / / / | |||||
| | | | * | | | | "MySQL Network" => "MySQL Enterprise" | Kent Boortz | 2009-10-08 | 1 | -1/+1 |
| | * | | | | | | Bug #47423 mtr connects to wrong database | Vladislav Vaintroub | 2009-11-03 | 2 | -0/+71 |
| | |/ / / / / | |||||
| | * | | | | | Merge 5.0-bugteam-> 5.1-bugteam | Frazer Clement | 2009-10-08 | 1 | -3/+2 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Fix compile break from bug#39663 fix | Frazer Clement | 2009-10-08 | 1 | -3/+2 |
| | | | |/ / | | | |/| | | |||||
| | * | | | | Merge 5.0-bugteam->5.1 bugteam | Frazer Clement | 2009-10-05 | 1 | -1/+11 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Bug#39663 mysqltest: --enable_info, affected_rows and ps-protocol broken | Frazer Clement | 2009-10-05 | 1 | -1/+11 |
| | * | | | | automerge | Georgi Kodinov | 2009-10-04 | 2 | -4/+4 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Upmerge 5.0-build -> 5.1-build. | Joerg Bruehe | 2009-09-28 | 1 | -1/+1 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Fix bug#46980 | Joerg Bruehe | 2009-09-17 | 2 | -4/+4 |
| | | | |_|/ / | | | |/| | | |