Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge. | Sergei Golubchik | 2010-11-25 | 1 | -48/+318 |
|\ | |||||
| * | 5.2 merge | Sergei Golubchik | 2010-10-28 | 1 | -1/+1 |
| |\ | |||||
| | * | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 1 | -1/+1 |
| | |\ | |||||
| | | * | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 1 | -1/+1 |
| | | |\ | |||||
| * | | \ | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 1 | -8/+32 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Automatic merge | Michael Widenius | 2010-10-01 | 1 | -2/+1 |
| | |\ \ \ | |||||
| | | * | | | Fix usage of mysqld option --new, --old, --safe and --skip_new to not disable... | Michael Widenius | 2010-09-23 | 1 | -2/+1 |
| | * | | | | merge with 5.1 | Sergei Golubchik | 2010-09-16 | 1 | -2/+2 |
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ / | |||||
| | | * | | Fixed bug #49600. | Igor Babaev | 2010-09-11 | 1 | -2/+2 |
| | * | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -3/+14 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -3/+14 |
| | | |\ \ | |||||
| | * | | | | Fixed bug #604503. | Igor Babaev | 2010-07-17 | 1 | -1/+15 |
| | |/ / / | |||||
| * | | | | Fixed LP BUG#615760: Check on double cache assignment added into the transfor... | unknown | 2010-09-06 | 1 | -2/+9 |
| * | | | | Improved speed of thr_alarm from O(N) to O(1). thr_alarm is used to handle ti... | Michael Widenius | 2010-07-16 | 1 | -1/+3 |
| * | | | | Subquery cache (MWL#66) added. | unknown | 2010-07-10 | 1 | -0/+39 |
| * | | | | MariaDB 5.2 -> MariaDB 5.3 merge | Sergey Petrunya | 2010-06-26 | 1 | -22/+31 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -18/+27 |
| | |\ \ \ | |||||
| | * | | | | Fixed compiler warnings and sporadic failures in test cases | Michael Widenius | 2010-03-28 | 1 | -4/+4 |
| * | | | | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 1 | -116/+352 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -7/+41 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -63/+229 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -85/+134 |
| | |\ \ \ \ \ \ | |||||
| * | | | | | | | | BUG#45174: XOR in subqueries produces differing results in 5.1 and 5.4 | Sergey Petrunya | 2010-03-13 | 1 | -1/+126 |
| * | | | | | | | | Subquery optimizations backport: | Sergey Petrunya | 2010-02-17 | 1 | -0/+64 |
| * | | | | | | | | Backport of subquery optimizations to 5.3. | Sergey Petrunya | 2010-01-17 | 1 | -42/+92 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -5/+4 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | MWL#17: Table-elimination | Sergey Petrunya | 2009-09-01 | 1 | -27/+1 |
| * | | | | | | | | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -1/+12 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -1/+12 |
| | |\ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ | Merge with mysql-maria tree | Michael Widenius | 2009-02-19 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -14/+18 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -12/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fixed compiler warnings found by gcc 4.3.2 | Michael Widenius | 2009-01-31 | 1 | -8/+8 |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix for Bug#40311 Assert in MARIA_RECORD_POS during pushbuild 2 test: | Michael Widenius | 2008-12-22 | 1 | -0/+1 |
| * | | | | | | | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my... | Guilhem Bichot | 2008-12-10 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -4/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -22/+46 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -29/+32 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | Fixed compiler warnings in a lot of files | unknown | 2008-02-13 | 1 | -2/+1 |
* | | | | | | | | | | | | | | | | Merge 5.5 -> 5.5-merge. | Konstantin Osipov | 2010-09-24 | 1 | -12/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Bug#55077: Assertion failed: width > 0 && to != ((void *)0), | Alexey Kopytov | 2010-08-25 | 1 | -12/+15 |
* | | | | | | | | | | | | | | | | | Manual merge of the fix for bug #54190 and the addendum patch | Alexey Kopytov | 2010-09-09 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Automerge. | Alexey Kopytov | 2010-09-09 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | Bug #54190: Comparison to row subquery produces incorrect | Alexey Kopytov | 2010-09-09 | 1 | -0/+7 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Merge of fix for Bug#51070. | Martin Hansson | 2010-09-07 | 1 | -3/+76 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | / / / / / / / / / / / / / / / | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Bug#51070: Query with a NOT IN subquery predicate returns a wrong result set | Martin Hansson | 2010-09-07 | 1 | -3/+76 |
| |/ / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | Bug#54916 GROUP_CONCAT + IFNULL truncates output | Alexander Barkov | 2010-08-19 | 1 | -10/+16 |
* | | | | | | | | | | | | | | | | merge | Georgi Kodinov | 2010-08-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Bug#54568: create view cause Assertion failed: 0, | Martin Hansson | 2010-08-05 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | WL#5498: Remove dead and unused source code | Davi Arnaut | 2010-07-23 | 1 | -5/+0 |