Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed bug #607566. | Igor Babaev | 2010-07-19 | 1 | -3/+5 |
* | Merge | Igor Babaev | 2010-07-17 | 1 | -2/+2 |
|\ | |||||
| * | Fixed bug #604503. | Igor Babaev | 2010-07-17 | 1 | -2/+2 |
* | | Fix for LP#588251: doStartTableScan() result not checked. | Michael Widenius | 2010-07-17 | 1 | -1/+2 |
|/ | |||||
* | Fixed bug #603654. | Igor Babaev | 2010-07-13 | 1 | -1/+8 |
* | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -1/+3 |
|\ | |||||
| * | Fixed compiler warnings | Michael Widenius | 2010-05-27 | 1 | -1/+0 |
| * | Changed the fixes for the following bugs: | Igor Babaev | 2010-05-25 | 1 | -1/+4 |
* | | merged | Sergei Golubchik | 2010-03-15 | 1 | -0/+2 |
|\ \ | |/ | |||||
| * | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -0/+2 |
| |\ | |||||
| | * | Auto-merge. | Ramil Kalimullin | 2010-01-29 | 1 | -0/+2 |
| | |\ | |||||
| | | * | Fix for bug#49897: crash in ptr_compare when char(0) NOT NULL | Ramil Kalimullin | 2010-01-29 | 1 | -0/+2 |
* | | | | Merge of the patch introducing virtual columns into maria-5.2 | Igor Babaev | 2009-11-11 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns. | Igor Babaev | 2009-10-16 | 1 | -0/+4 |
| |/ / / | |||||
* | | | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 1 | -2/+2 |
|/ / / | |||||
* | | | Updated documentation files to reflect MariaDB and not the Maria storage engi... | Michael Widenius | 2009-09-03 | 1 | -0/+3 |
* | | | We are now using Valgrind rather than purify, and have for quite some time. | unknown | 2009-05-06 | 1 | -2/+2 |
* | | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -3/+0 |
|\ \ \ | |/ / | |||||
| * | | Bug #41543: Assertion `m_status == DA_ERROR' failed in Diagnostics_area::sql_... | Georgi Kodinov | 2009-01-09 | 1 | -3/+0 |
* | | | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -13/+53 |
|\ \ \ | |/ / | |||||
| * | | Merge fix for BUG#35478 into 5.1 | Sergey Petrunia | 2008-07-15 | 1 | -13/+53 |
| |\ \ | | |/ | |||||
| | * | BUG#35478: sort_union() returns bad data when sort_buffer_size is hit | Sergey Petrunia | 2008-07-15 | 1 | -13/+53 |
| | * | Merge kaamos.(none):/data/src/mysql-5.0 | unknown | 2008-03-12 | 1 | -2/+1 |
| | |\ | |||||
* | | \ | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -2/+8 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge kaamos.(none):/data/src/mysql-5.1 | unknown | 2008-03-12 | 1 | -2/+1 |
| |\ \ \ | |||||
| | * \ \ | Merge kaamos.(none):/data/src/mysql-5.1 | unknown | 2008-02-17 | 1 | -2/+1 |
| | |\ \ \ | |||||
| | | * \ \ | Merge kaamos.(none):/data/src/opt/mysql-5.0-opt | unknown | 2008-02-14 | 1 | -2/+1 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | Bug#31590: Wrong error message on sort buffer being too small. | unknown | 2008-02-08 | 1 | -2/+1 |
| * | | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50 | unknown | 2008-01-30 | 1 | -0/+7 |
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| | | |||||
| | * | | | Bug #32149 Long semaphore wait for adaptive hash latch | unknown | 2008-01-30 | 1 | -0/+7 |
| | | |/ | | |/| | |||||
* | | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1 | unknown | 2008-02-05 | 1 | -8/+16 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/51 | unknown | 2008-01-22 | 1 | -8/+16 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt | unknown | 2008-01-10 | 1 | -2/+6 |
| | |\ \ | | | |/ | |||||
| | | * | filesort.cc: | unknown | 2008-01-10 | 1 | -2/+6 |
| | * | | Post-merge fix after merging 5.0 -> 5.1. Replaced 'byte' with 'uchar'. | unknown | 2008-01-10 | 1 | -6/+6 |
| | * | | Merge kaamos.(none):/data/src/opt/mysql-5.0-opt | unknown | 2008-01-10 | 1 | -8/+12 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused | unknown | 2008-01-09 | 1 | -9/+13 |
* | | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1 | unknown | 2007-12-27 | 1 | -5/+5 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 1 | -5/+5 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Merge some changes from sql directory in 5.1 tree | unknown | 2007-10-20 | 1 | -3/+3 |
| | * | | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-09-27 | 1 | -6/+6 |
| | |\ \ | |||||
| | | * | | Merged with mysql-5.1 main tree. | unknown | 2007-07-02 | 1 | -3/+3 |
| | | * | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 | unknown | 2007-06-27 | 1 | -7/+7 |
| | | |\ \ | |||||
| | | | * \ | Merge bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2007-04-05 | 1 | -1/+1 |
| | | | |\ \ | |||||
| | | | | * | | Fixed that maria.test works | unknown | 2007-04-05 | 1 | -1/+1 |
| | | | * | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-maria | unknown | 2007-02-28 | 1 | -6/+6 |
| | | | |\ \ \ | | | | | |/ / | |||||
| | | | | * | | Merge with new version | unknown | 2007-01-23 | 1 | -6/+6 |
| | | | | |\ \ | |||||
| | | | | | * | | Implementation of rows-in-block | unknown | 2007-01-18 | 1 | -6/+6 |
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint | unknown | 2007-12-14 | 1 | -154/+158 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Doxygenization of comments. | unknown | 2007-10-11 | 1 | -154/+158 |
| |/ / / / / / |