| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge with MySQL 5.1.42mariadb-merge-mysql-5.1.42 | Michael Widenius | 2010-01-15 | 1 | -63/+229 |
|\ |
|
| * | Fix for bug#49517: Inconsistent behavior while using | Ramil Kalimullin | 2009-12-15 | 1 | -1/+1 |
| * | Bug#49489: Uninitialized cache led to a wrong result. | Georgi Kodinov | 2009-12-15 | 1 | -1/+1 |
| * | Bug #49480: WHERE using YEAR columns returns unexpected results | Georgi Kodinov | 2009-12-15 | 1 | -96/+48 |
| * | Additional fix for the bug#43668. | Evgeny Potemkin | 2009-11-25 | 1 | -0/+13 |
| * | Manual merge of the fix for bug#43668. | Evgeny Potemkin | 2009-11-24 | 1 | -57/+213 |
| |\ |
|
| | * | Bug#43668: Wrong comparison and MIN/MAX for YEAR(2) | Evgeny Potemkin | 2009-11-17 | 1 | -62/+213 |
| * | | Auto-merged fix for the bug#34384. | Evgeny Potemkin | 2009-11-06 | 1 | -4/+43 |
| |\ \ |
|
| | * | | Bug#34384: Slow down on constant conversion. | Evgeny Potemkin | 2009-11-06 | 1 | -4/+43 |
| | |/ |
|
| * | | Bug #46175: NULL read_view and consistent read assertion | Georgi Kodinov | 2009-11-04 | 1 | -2/+8 |
* | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -85/+134 |
|\ \ \
| |/ / |
|
| * | | Bug#48177 - SELECTs with NOT IN subqueries containing NULL | Jorgen Loland | 2009-11-03 | 1 | -42/+54 |
| * | | Bug#48370: Absolutely wrong calculations with GROUP BY and decimal fields whe... | Davi Arnaut | 2009-11-02 | 1 | -3/+3 |
| * | | Bug#47925: regression of range optimizer and date comparison in 5.1.39! | Martin Hansson | 2009-11-02 | 1 | -37/+63 |
| |/ |
|
| * | Bug #44139: Table scan when NULL appears in IN clause | Gleb Shchepa | 2009-10-05 | 1 | -3/+14 |
* | | Merge MySQL 5.1.39 into MariaDB 5.1.mariadb-merge-mysql-5.1.39 | unknown | 2009-10-15 | 1 | -5/+4 |
|\ \
| |/ |
|
| * | Merge from 5.0 for 43414 | Staale Smedseng | 2009-08-28 | 1 | -2/+1 |
| |\ |
|
| | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-08-28 | 1 | -12/+5 |
| * | | Bug#45261: Crash, stored procedure + decimal | Davi Arnaut | 2009-08-24 | 1 | -3/+3 |
| * | | Manual merge. | Alexey Kopytov | 2009-07-03 | 1 | -2/+3 |
| |\ \ |
|
| | * | | Bug #45262: Bad effects with CREATE TABLE and DECIMAL | Alexey Kopytov | 2009-07-03 | 1 | -2/+3 |
| | |/ |
|
| | | | |
| | \ | |
| *-. \ | Merge from 5.0-bugteam for 43414 | Staale Smedseng | 2009-06-09 | 1 | -4/+4 |
| |\ \ \
| | | |/ |
|
| | | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-06-09 | 1 | -4/+4 |
| | * | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-06-09 | 1 | -4/+4 |
| | |/ |
|
| * | | Bug #44399 : crash with statement using TEXT columns, aggregates, GROUP BY, and | Georgi Kodinov | 2009-05-25 | 1 | -10/+0 |
| * | | Revert of the fix for bug #44399 (joro@sun.com-20090512135917-kal1dvtqpqgnj3yc). | Georgi Kodinov | 2009-05-20 | 1 | -14/+14 |
| * | | Bug #44399: crash with statement using TEXT columns, aggregates, GROUP BY, | Georgi Kodinov | 2009-05-12 | 1 | -14/+14 |
* | | | MWL#17: Table-elimination | Sergey Petrunya | 2009-09-01 | 1 | -27/+1 |
* | | | bzr merge from guilhem's maria tree to our local 5.1mariadb-merge-mysql-5.1.34plus | 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 |
| |\ \ \
| | |/ / |
|
| | * | | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2009-02-19 | 1 | -1/+12 |
| | |\ \
| | | |/ |
|
| | | * | Bug#37601 Cast Is Not Done On Row Comparison | Sergey Glukhov | 2009-02-19 | 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 |
| |\ \ \
| | |/ / |
|
| | * | | BUG#37822: Correlated subquery with IN and IS UNKNOWN provides wrong result | Sergey Petrunia | 2009-01-28 | 1 | -2/+2 |
* | | | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -12/+16 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Bug #41363: crash of mysqld on windows with aggregate in case | Gleb Shchepa | 2008-12-31 | 1 | -0/+10 |
| * | | | rollback of bug #40761 fix | Gleb Shchepa | 2008-12-12 | 1 | -22/+28 |
| |\ \ \ |
|
| | * | | | rollback of bug #40761 fix | Gleb Shchepa | 2008-12-12 | 1 | -22/+28 |
| * | | | | manual merge 5.0-bugteam -> 5.1-bugteam (bug 40761) | Gleb Shchepa | 2008-12-12 | 1 | -28/+22 |
| |\ \ \ \
| | |/ / / |
|
| | * | | | Bug #40761: Assert on sum function on | Gleb Shchepa | 2008-12-12 | 1 | -28/+22 |
| | | |/
| | |/| |
|
| * | | | merged 37936 to 5.1-bugteam | Georgi Kodinov | 2008-12-09 | 1 | -12/+6 |
| |\ \ \ |
|
| | * | | | Bug #37936: ASSERT_COLUMN_MARKED_FOR_WRITE in Field_datetime::store , | Georgi Kodinov | 2008-12-09 | 1 | -12/+6 |
* | | | | | 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 |