Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | -2/+2 |
| | |\ | |||||
* | | \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAK | Mattias Jonsson | 2011-03-25 | 1 | -1/+1 |
| | |/ | |||||
* | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 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 with alias as String | Michael Widenius | 2011-02-28 | 1 | -2/+3 |
|\ \ \ \ | |||||
| * | | | | Change TABLE->alias to String for less memory reallocation | Michael Widenius | 2011-02-28 | 1 | -2/+3 |
* | | | | | When compiling with valgrind, change my_alloca() to use my_malloc() | Michael Widenius | 2010-12-13 | 1 | -0/+2 |
* | | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -35/+79 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Patch from Sergey Petrunya: | Michael Widenius | 2010-11-26 | 1 | -32/+71 |
| * | | | Merge with MySQL 5.1.52 | Michael Widenius | 2010-11-23 | 1 | -3/+8 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#50402 Optimizer producing wrong results when using Index Merge on InnoDB | Sergey Glukhov | 2010-09-16 | 1 | -3/+8 |
* | | | | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 1 | -8/+9 |
|\ \ \ \ | |/ / / | |||||
| * | | | better fix for MySQL bugs | Sergei Golubchik | 2010-10-20 | 1 | -45/+5 |
| * | | | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 1 | -0/+4 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug #54802: 'NOT BETWEEN' evaluation is incorrect | Alexey Kopytov | 2010-08-24 | 1 | -0/+4 |
* | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Manual merge. | Alexey Kopytov | 2010-07-15 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
| | | * | Backport of the fix for bug#25421 to 5.0. | Alexey Kopytov | 2010-07-15 | 1 | -0/+3 |
* | | | | Added extra argument to longlong2str() to make it have same prototype is int2... | Michael Widenius | 2010-08-07 | 1 | -6/+7 |
* | | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -78/+61 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -71/+55 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#41660: Sort-index_merge for non-first join table may | Martin Hansson | 2010-06-24 | 1 | -18/+19 |
| | * | | Bug#50389 Using intersect does not return all rows | Sergey Glukhov | 2010-06-21 | 1 | -0/+1 |
| | * | | Bug#50939: Loose Index Scan unduly relies on engine to | Martin Hansson | 2010-05-10 | 1 | -60/+33 |
* | | | | Fix for LP#588251: doStartTableScan() result not checked. | Michael Widenius | 2010-07-17 | 1 | -3/+4 |
* | | | | few small MySQL bugs/issues that impact the engines, as discussed in the SE s... | Sergei Golubchik | 2010-06-05 | 1 | -46/+8 |
* | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -31/+39 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixes after last merge of MySQL 5.1 | Michael Widenius | 2010-05-13 | 1 | -27/+42 |
| * | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -11/+4 |
| |\ \ \ | | |/ / | |||||
| | * | | BUG#49902 - SELECT returns incorrect results | Sergey Vojtovich | 2010-02-09 | 1 | -11/+4 |
* | | | | merge 5.1->5.2 | unknown | 2010-02-01 | 1 | -32/+64 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -32/+64 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#48459: valgrind errors with query using 'Range checked | Martin Hansson | 2009-11-25 | 1 | -29/+28 |
| | * | | Automerge. | Alexey Kopytov | 2009-11-23 | 1 | -1/+5 |
| | |\ \ | |||||
| | | * \ | Automerge. | Alexey Kopytov | 2009-11-23 | 1 | -1/+5 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Bug #48472: Loose index scan inappropriately chosen for some | Alexey Kopytov | 2009-11-17 | 1 | -1/+5 |
| | * | | | Bug #48665: sql-bench's insert test fails due to wrong result | Georgi Kodinov | 2009-11-19 | 1 | -2/+31 |
| | |/ / | |||||
* | | | | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -7/+111 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -7/+111 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#47925: regression of range optimizer and date comparison in 5.1.39! | Martin Hansson | 2009-11-02 | 1 | -3/+3 |
| | * | | Auto-merge. | Ramil Kalimullin | 2009-10-23 | 1 | -0/+21 |
| | |\ \ | | | |/ | |||||
| | | * | Fix for bug#48258: Assertion failed when using a spatial index | Ramil Kalimullin | 2009-10-23 | 1 | -0/+21 |
| | * | | Bug #47123: Endless 100% CPU loop with STRAIGHT_JOIN | Alexey Kopytov | 2009-10-17 | 1 | -0/+11 |