Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with 5.2 | Michael Widenius | 2011-03-09 | 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 |
| | | | * | Bug#48157: crash in Item_field::used_tables | Martin Hansson | 2010-05-11 | 1 | -1/+2 |
| * | | | | Merge with alias as String | Michael Widenius | 2011-02-28 | 1 | -1/+2 |
| |\ \ \ \ | |||||
| | * | | | | Change TABLE->alias to String for less memory reallocation | Michael Widenius | 2011-02-28 | 1 | -1/+2 |
* | | | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -18/+28 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -18/+28 |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | * | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 1 | -18/+28 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug#56423: Different count with SELECT and CREATE SELECT queries | Martin Hansson | 2010-10-07 | 1 | -31/+62 |
* | | | | | Code cleanup to get fewer reallocs() during execution. | Michael Widenius | 2010-11-24 | 1 | -1/+2 |
* | | | | | Fixed usage of wrong variable in case of errors | Michael Widenius | 2010-11-05 | 1 | -2/+2 |
* | | | | | 5.2 merge | Sergei Golubchik | 2010-10-28 | 1 | -68/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 1 | -68/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 1 | -68/+1 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug #54106 assert in Protocol::end_statement, | Jon Olav Hauglid | 2010-08-09 | 1 | -68/+1 |
* | | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 1 | -21/+62 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -3/+10 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -3/+10 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug #54734 assert in Diagnostics_area::set_ok_status | Jon Olav Hauglid | 2010-07-19 | 1 | -2/+10 |
| * | | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -10/+15 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fixed compiler warnings | Michael Widenius | 2010-08-04 | 1 | -17/+8 |
| | * | | | Fixes bug when we run bcmp() on row when the storage engine hasn't filled in ... | Michael Widenius | 2010-08-04 | 1 | -11/+22 |
| | * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -6/+9 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -4/+4 |
| | | * | | A 5.1-only version of fix for bug #46947 "Embedded SELECT | Dmitry Lenev | 2010-05-28 | 1 | -1/+1 |
| | | * | | Bug #53830: !table || (!table->read_set || | Alexey Kopytov | 2010-05-25 | 1 | -1/+1 |
| | | * | | Bug #49756 Rows_examined is always 0 in the slow query log for | Staale Smedseng | 2010-05-12 | 1 | -0/+3 |
| * | | | | 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 | -8/+35 |
| |/ / / / | |||||
| * | | | | Fixed bug #601164. | Igor Babaev | 2010-07-02 | 1 | -0/+2 |
* | | | | | Subquery cache (MWL#66) added. | unknown | 2010-07-10 | 1 | -1/+1 |
* | | | | | MariaDB 5.2 -> MariaDB 5.3 merge | Sergey Petrunya | 2010-06-26 | 1 | -27/+95 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -27/+95 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge with MySQL 5.1.47 | Michael Widenius | 2010-05-26 | 1 | -6/+12 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug #47453: InnoDB incorrectly changes TIMESTAMP columns when JOINed | Georgi Kodinov | 2010-04-28 | 1 | -0/+10 |
| | * | | | Changed the fixes for the following bugs: | Igor Babaev | 2010-05-25 | 1 | -3/+4 |
| | * | | | Fixes after last merge of MySQL 5.1 | Michael Widenius | 2010-05-13 | 1 | -1/+1 |
| | * | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -18/+79 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug #43414 Parenthesis (and other) warnings compiling | Staale Smedseng | 2010-02-22 | 1 | -1/+2 |
| | | * | | Bug#49534: multitable IGNORE update with sql_safe_updates | Martin Hansson | 2010-02-10 | 1 | -10/+77 |
| | | * | | BUG#49902 - SELECT returns incorrect results | Sergey Vojtovich | 2010-02-09 | 1 | -8/+1 |
* | | | | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 1 | -7/+17 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -5/+10 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -5/+10 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Backport Bug#37148 to 5.1 | He Zhenxing | 2010-01-24 | 1 | -3/+4 |
| | | * | | Bug#48157: crash in Item_field::used_tables | Martin Hansson | 2010-01-12 | 1 | -1/+5 |