Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merged the fix for bug 777745 into 5.3. | Igor Babaev | 2011-05-19 | 1 | -0/+15 |
|\ | |||||
| * | Fixed LP bug #777745. | Igor Babaev | 2011-05-19 | 1 | -0/+15 |
* | | Merge with dynamic column code | Michael Widenius | 2011-05-12 | 1 | -4/+20 |
|\ \ | |||||
| * | | Adding support for Dynamic columns (WL#34): | Michael Widenius | 2011-05-08 | 1 | -3/+19 |
| |/ | |||||
* | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -1/+2 |
|\ \ | |/ |/| | |||||
| * | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -1/+2 |
| |\ | |||||
| | * | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -1/+2 |
| | |\ | |||||
| | | * | Update of copyright headers for files I changed this year. | Mattias Jonsson | 2011-01-27 | 1 | -1/+1 |
* | | | | Fix LP BUG#715738 | unknown | 2011-03-24 | 1 | -0/+8 |
* | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -2/+42 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -2/+42 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -2/+42 |
| | |\ \ | | | |/ | |||||
| | | * | merge | Mattias Jonsson | 2011-01-04 | 1 | -1/+41 |
| | | |\ | |||||
| | | | * | Bug#54483: valgrind errors when making warnings for | Mattias Jonsson | 2010-12-22 | 1 | -1/+1 |
| | | | * | Bug#54483: valgrind errors when making warnings for multiline inserts into pa... | Mattias Jonsson | 2010-12-22 | 1 | -1/+41 |
| | | * | | Merge | Kent Boortz | 2010-12-29 | 1 | -1/+1 |
| | | |\ \ | | | | |/ | | | |/| | |||||
| | | | * | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 1 | -1/+1 |
* | | | | | Merge with 5.1 | Michael Widenius | 2011-01-11 | 1 | -0/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge with 5.1 | Michael Widenius | 2011-01-05 | 1 | -0/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fixed LP bug #639935 (bug #58727). | Igor Babaev | 2010-12-24 | 1 | -0/+1 |
* | | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 1 | -1/+1 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug#54484 explain + prepared statement: crash and Got error -1 from storage e... | Sergey Glukhov | 2010-10-18 | 1 | -1/+1 |
* | | | | | 5.2 merge | Sergei Golubchik | 2010-10-28 | 1 | -0/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 1 | -0/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 1 | -0/+1 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug #55615 and bug #55564 | Georgi Kodinov | 2010-08-13 | 1 | -0/+1 |
* | | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 1 | -1/+16 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Change some my_bool in C++ classes and a few functions to bool to detect wron... | Michael Widenius | 2010-09-24 | 1 | -1/+1 |
| * | | | | Automerge with 5.1 | Michael Widenius | 2010-08-25 | 1 | -0/+15 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fix for LP#612894 Some aggregate functions (such as MIN MAX) work incorrectly... | Michael Widenius | 2010-08-23 | 1 | -0/+15 |
* | | | | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 1 | -12/+28 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -0/+28 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -0/+28 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug #49734: Crash on EXPLAIN EXTENDED UNION ... ORDER BY <any non-const-funct... | Georgi Kodinov | 2009-12-22 | 1 | -0/+5 |
| | | * | | Automerge | Alexey Kopytov | 2009-12-13 | 1 | -0/+23 |
| | | |\ \ | |||||
| | | | * | | Bug #42849: innodb crash with varying time_zone on partitioned | Alexey Kopytov | 2009-12-13 | 1 | -0/+23 |
| * | | | | | merge 5.1->5.2 | unknown | 2010-02-01 | 1 | -11/+0 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -11/+0 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Manual merge of the fix for bug#43668. | Evgeny Potemkin | 2009-11-24 | 1 | -11/+0 |
| | | |\ \ \ | |||||
| | | | * | | | Bug#43668: Wrong comparison and MIN/MAX for YEAR(2) | Evgeny Potemkin | 2009-11-17 | 1 | -11/+0 |
| * | | | | | | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -1/+0 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -1/+0 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Bug#48370: Absolutely wrong calculations with GROUP BY and decimal fields whe... | Davi Arnaut | 2009-11-02 | 1 | -1/+0 |
| | | |/ / / | |||||
* | | | | | | Subquery optimizations: non-semijoin materialization | Sergey Petrunya | 2010-01-28 | 1 | -2/+6 |
* | | | | | | Backport of subquery optimizations to 5.3. | Sergey Petrunya | 2010-01-17 | 1 | -0/+1 |
|/ / / / / | |||||
* | | | | | Merge | Igor Babaev | 2009-11-09 | 1 | -0/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -0/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Bug#45261: Crash, stored procedure + decimal | Davi Arnaut | 2009-08-24 | 1 | -0/+1 |