Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merged the implementation of MDEV-28 LIMIT ROWS EXAMINED into MariaDB 5.5. | unknown | 2012-03-12 | 1 | -0/+2 |
|\ | |||||
| * | Implementation of MDEV-28 LIMIT ROWS EXAMINED | unknown | 2012-03-11 | 1 | -0/+2 |
* | | 5.3.4 merge | Sergei Golubchik | 2012-02-15 | 1 | -5/+14 |
|\ \ | |/ | |||||
| * | Moving LP BUG#794005 to 5.3 + fixing INSERT of multi-table view. | unknown | 2012-02-03 | 1 | -5/+14 |
* | | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 1 | -4/+4 |
|\ \ | |||||
| * | | Bug#11748731:SOME 'BIG' TESTS FAILING ON 6.0 | Sneha Modi | 2011-11-21 | 1 | -4/+4 |
| * | | Merge mysql-5.1 to mysql-5.5. | Marko Mäkelä | 2011-11-10 | 1 | -0/+5 |
| |\ \ | |||||
* | \ \ | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -16/+18 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Rewrite IGNORE handling: | Michael Widenius | 2011-12-11 | 1 | -17/+12 |
| * | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -6/+14 |
| |\ \ \ | |||||
| | * \ \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -6/+12 |
| | |\ \ \ | |||||
| | | * \ \ | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 1 | -0/+5 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | Bug#11759688 52020: InnoDB can still deadlock on just INSERT...ON DUPLICATE KEY | Marko Mäkelä | 2011-11-10 | 1 | -0/+5 |
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -6/+7 |
| | | |\ \ \ | | | | |/ / | |||||
* | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -14/+14 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Automatic merge | Michael Widenius | 2011-09-26 | 1 | -17/+16 |
| |\ \ \ \ \ | |||||
| | * | | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ... | Michael Widenius | 2011-09-23 | 1 | -17/+16 |
| * | | | | | | fix typo: binlog_annotate_rows_events -> binlog_annotate_row_events | Sergei Golubchik | 2011-09-23 | 1 | -1/+1 |
| |/ / / / / | |||||
| * | | | | | Merge with 5.2 | Michael Widenius | 2011-09-10 | 1 | -8/+9 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Fixed that automatic killing of delayed insert thread (in flush, alter table ... | Michael Widenius | 2011-09-09 | 1 | -8/+9 |
* | | | | | | merge | Sergei Golubchik | 2011-11-03 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | compilation warnings on Windows | Sergei Golubchik | 2011-11-02 | 1 | -1/+1 |
* | | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -9/+6 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | backport from mysql-trunk | Gleb Shchepa | 2011-08-03 | 1 | -5/+0 |
| * | | | | | 5.1 -> 5.5 merge | Sergey Glukhov | 2011-08-02 | 1 | -2/+2 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Bug#11766594 59736: SELECT DISTINCT.. INCORRECT RESULT WITH DETERMINISTIC FUN... | Sergey Glukhov | 2011-08-02 | 1 | -2/+2 |
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -2/+1 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| * | | | | | | | Updated/added copyright headers | Kent Boortz | 2011-07-04 | 1 | -2/+4 |
* | | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -38/+110 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Fixed LP bug #825035. | Igor Babaev | 2011-08-16 | 1 | -0/+1 |
| * | | | | | | | Fixed LP bug #794901. | Igor Babaev | 2011-07-16 | 1 | -1/+1 |
| * | | | | | | | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed. | Igor Babaev | 2011-06-04 | 1 | -18/+70 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge | Igor Babaev | 2011-05-20 | 1 | -18/+70 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 1 | -18/+70 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Merge of the mwl106 tree into the latest 5.3 tree. | Igor Babaev | 2010-09-23 | 1 | -18/+70 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | MWL#106: Backport optimizations for derived tables and views. | Igor Babaev | 2010-05-26 | 1 | -18/+70 |
| * | | | | | | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -7/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | db_low_byte_first is gone | Sergei Golubchik | 2011-05-20 | 1 | -3/+0 |
| | * | | | | | | | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -4/+9 |
| * | | | | | | | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | / / | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | |||||
| | | * | | | | | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 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 |
| * | | | | | | | | | | Merge various replication-related patches into MariaDB 5.3: | unknown | 2011-04-08 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl. | unknown | 2011-04-01 | 1 | -6/+8 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | Merge with alias as String | Michael Widenius | 2011-02-28 | 1 | -6/+8 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | Change TABLE->alias to String for less memory reallocation | Michael Widenius | 2011-02-28 | 1 | -6/+8 |