Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -0/+38 |
|\ | |||||
| * | Bug #49512 : subquery with aggregate function crash | Georgi Kodinov | 2009-12-23 | 1 | -0/+13 |
| * | revert of the fix for bug #45989: pushed by mistake. | Georgi Kodinov | 2010-01-19 | 1 | -12/+0 |
| * | Bug #45989 take 2 : memory leak after explain encounters an | Georgi Kodinov | 2010-01-18 | 1 | -0/+12 |
| * | Bug #48709: Assertion failed in sql_select.cc:11782: | Georgi Kodinov | 2009-12-15 | 1 | -0/+25 |
* | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -3/+16 |
|\ \ | |/ | |||||
| * | automerge | Kristofer Pettersson | 2009-11-03 | 1 | -1/+1 |
| |\ | |||||
| | * | merge | Georgi Kodinov | 2009-10-30 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Bug #48293: crash with procedure analyse, view with > 10 columns, | Georgi Kodinov | 2009-10-30 | 1 | -1/+1 |
| * | | | Moved test case for bug 31157 from query_cache.test to subselect.test | Kristofer Pettersson | 2009-11-03 | 1 | -0/+14 |
| |/ / | |||||
| * | | Bug #47123: Endless 100% CPU loop with STRAIGHT_JOIN | Alexey Kopytov | 2009-10-17 | 1 | -2/+1 |
* | | | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -1/+29 |
|\ \ \ | |/ / | |||||
| * | | automerge | Georgi Kodinov | 2009-08-31 | 1 | -0/+28 |
| |\ \ | | |/ | |||||
| | * | Bug #46749: Segfault in add_key_fields() with outer subquery level | Georgi Kodinov | 2009-08-27 | 1 | -0/+28 |
| * | | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2009-08-27 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Bug#46184 Crash, SELECT ... FROM derived table procedure analyze | Sergey Glukhov | 2009-08-27 | 1 | -1/+1 |
* | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | MWL#17: Table elimination | Sergey Petrunia | 2009-06-10 | 1 | -2/+2 |
* | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -0/+22 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | Merged fix for the bug#46051. | Evgeny Potemkin | 2009-07-19 | 1 | -0/+22 |
| |\ \ | | |/ | |||||
| | * | Bug#46051: Incorrectly market field caused wrong result. | Evgeny Potemkin | 2009-07-18 | 1 | -4/+0 |
| | * | Bug#46051: Incorrectly market field caused wrong result. | Evgeny Potemkin | 2009-07-16 | 1 | -0/+26 |
| | * | Merge 5.0.80 release and 5.0 community. Version left at 5.0.80. | Chad MILLER | 2009-04-14 | 1 | -109/+109 |
| | |\ | |||||
| | | * | This belongs to the fix for | Matthias Leich | 2009-02-09 | 1 | -1/+1 |
* | | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -126/+126 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 5.0 -> 5.1 | Matthias Leich | 2009-02-09 | 1 | -126/+126 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | 2. Slice of fix for Bug#42003 tests missing the disconnect of connections <> ... | Matthias Leich | 2009-02-05 | 1 | -109/+109 |
| | |/ | |||||
* | | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -2/+38 |
|\ \ \ | |/ / | |||||
| * | | merged 5.1-main -> 5.1-bugteam | Georgi Kodinov | 2009-01-30 | 1 | -2/+2 |
| |\ \ | |||||
| | * \ | merge 5.1 --> 5.1-rpl | Alfranio Correia | 2008-12-13 | 1 | -0/+30 |
| | |\ \ | |||||
| | * \ \ | Merge 5.1 main -> 5.1-rpl | He Zhenxing | 2008-09-06 | 1 | -0/+39 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge 5.1-rpl-testfixes -> 5.1-rpl | He Zhenxing | 2008-08-14 | 1 | -1/+12 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | merged 5.1 main to 5.1-rpl | Sven Sandberg | 2008-08-04 | 1 | -2/+2 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Post-merge fixes. | Sven Sandberg | 2008-07-07 | 1 | -2/+2 |
| * | | | | | | | Fix trivial merge error | Sergey Petrunia | 2009-01-29 | 1 | -1/+1 |
| * | | | | | | | BUG#37822: Correlated subquery with IN and IS UNKNOWN provides wrong result | Sergey Petrunia | 2009-01-28 | 1 | -0/+36 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Fixed bugs found by pushbuild | Michael Widenius | 2008-12-27 | 1 | -3/+0 |
* | | | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my... | Guilhem Bichot | 2008-12-10 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -0/+80 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -9/+9 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1 | unknown | 2008-02-05 | 1 | -0/+57 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-09-27 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Tests which use INSERT DELAYED or MERGE tables should explicitely | unknown | 2007-08-08 | 1 | -3/+3 |
* | | | | | | | | | | | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2008-11-27 | 1 | -0/+30 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | Bug#37460 Assertion failed: !table->file || table->file->inited == handler::NONE | Sergey Glukhov | 2008-11-27 | 1 | -0/+30 |
| * | | | | | | | | | Bug#34760 Character set autodetection appears to fail | Sergey Glukhov | 2008-11-21 | 1 | -0/+15 |
* | | | | | | | | | | merged 5.1-bugteam into B37548 tree | Georgi Kodinov | 2008-08-27 | 1 | -0/+19 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | merged 34159 and 37662 5.0-bugteam->5.1-bugteam | Georgi Kodinov | 2008-07-31 | 1 | -1/+12 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | / / | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| | * | | | | | | | Fixed bug #38191. | Igor Babaev | 2008-07-26 | 1 | -0/+11 |