Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Rewrite IGNORE handling: | Michael Widenius | 2011-12-11 | 1 | -15/+6 |
* | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+4 |
|\ | |||||
| * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+4 |
| |\ | |||||
| | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 |
| | |\ | |||||
| | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | | |\ | |||||
| | | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | | * | | Bug #54734 assert in Diagnostics_area::set_ok_status | Jon Olav Hauglid | 2010-07-19 | 1 | -1/+2 |
* | | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ... | Michael Widenius | 2011-09-23 | 1 | -7/+7 |
* | | | | | Fixed LP bug #794901. | Igor Babaev | 2011-07-16 | 1 | -1/+3 |
* | | | | | Fixed LP bug #794890. | Igor Babaev | 2011-06-13 | 1 | -8/+15 |
* | | | | | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed. | Igor Babaev | 2011-06-04 | 1 | -15/+44 |
|\ \ \ \ \ | |||||
| * | | | | | Fixed bugs causing failures fot the funcs_1 test suite. | Igor Babaev | 2011-06-03 | 1 | -4/+6 |
| * | | | | | Merge | Igor Babaev | 2011-05-20 | 1 | -15/+42 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 1 | -15/+42 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge of the mwl106 tree into the latest 5.3 tree. | Igor Babaev | 2010-09-23 | 1 | -15/+42 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | MWL#106: Backport optimizations for derived tables and views. | Igor Babaev | 2010-05-26 | 1 | -15/+42 |
* | | | | | | | | | Merge 5.3->main -> 5.3-mwl90 | Sergey Petrunya | 2011-05-29 | 1 | -3/+4 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Merge MWL#90 with 5.3-main | Sergey Petrunya | 2011-05-25 | 1 | -3/+4 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | MWL#90: Address review feedback part #14 | Sergey Petrunya | 2011-03-27 | 1 | -3/+4 |
* | | | | | | | | | Merge with 5.3 main | Michael Widenius | 2011-05-16 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | MWL#89 | unknown | 2011-03-01 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | MWL#89: Cost-based choice between Materialization and IN->EXISTS transformation | unknown | 2010-11-05 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | MWL#89: Cost-based choice between Materialization and IN->EXISTS transformation | unknown | 2010-09-05 | 1 | -0/+4 |
| | | |/ / / / / / | |||||
* | | | | | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | / / / / | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Merge Mariadb 5.1->5.2 | unknown | 2011-04-12 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | Bug fix for lp:732124 union + limit returns wrong result | Michael Widenius | 2011-03-09 | 1 | -1/+1 |
* | | | | | | | Implementation of MWL#172: Add support for prepared statements to HANDLER READ | Michael Widenius | 2011-01-04 | 1 | -0/+1 |
|/ / / / / / | |||||
* | | | | | | Fix usage of mysqld option --new, --old, --safe and --skip_new to not disable... | Michael Widenius | 2010-09-23 | 1 | -1/+0 |
* | | | | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -6/+8 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -6/+8 |
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| | | |||||
| | * | | | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -5/+5 |
| | * | | | Bug #53450: Crash / assertion "virtual int | Gleb Shchepa | 2010-05-14 | 1 | -1/+1 |
| | * | | | Bug #49756 Rows_examined is always 0 in the slow query log for | Staale Smedseng | 2010-05-12 | 1 | -0/+2 |
* | | | | | Merge | Igor Babaev | 2010-07-17 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fixed bug #604503. | Igor Babaev | 2010-07-17 | 1 | -1/+1 |
* | | | | | | Fix for LP#588251: doStartTableScan() result not checked. | Michael Widenius | 2010-07-17 | 1 | -2/+12 |
|/ / / / / | |||||
* | | | | | Fixed bug #601164. | Igor Babaev | 2010-07-02 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Changed the fixes for the following bugs: | Igor Babaev | 2010-05-25 | 1 | -2/+1 |
* | | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -4/+14 |
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | |||||
| * | | BUG#51251: Wrong binlogging in case of TRUNCATE <temporary InnoDB table> | Luis Soares | 2010-02-26 | 1 | -1/+3 |
| * | | BUG#51251: Wrong binlogging in case of TRUNCATE <temporary InnoDB table> | Luis Soares | 2010-02-24 | 1 | -4/+12 |
* | | | Automatic merge | Michael Widenius | 2010-03-10 | 1 | -2/+5 |
|\ \ \ | |||||
| * | | | Fix for: Bug#44987 DELETE IGNORE and FK constraint | Michael Widenius | 2010-03-10 | 1 | -2/+5 |
* | | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -5/+7 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | Backport Bug#37148 to 5.1 | He Zhenxing | 2010-01-24 | 1 | -5/+7 |
* | | | When one does a drop table, the indexes are not flushed to disk before drop a... | Michael Widenius | 2010-02-10 | 1 | -0/+4 |
* | | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -6/+8 |
|\ \ \ | |/ / | |||||
| * | | Bug #48350 truncate temporary table crashes replication | unknown | 2009-11-22 | 1 | -5/+5 |
| * | | Bug #46425 crash in Diagnostics_area::set_ok_status , empty statement, | Magne Mahre | 2009-11-18 | 1 | -1/+2 |
* | | | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes. | unknown | 2009-11-30 | 1 | -65/+91 |
|\ \ \ |