Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge 10.0-base -> 10.0 | unknown | 2013-10-29 | 1 | -1/+2 |
|\ | |||||
| * | merge 5.5->10.0-base | unknown | 2013-10-29 | 1 | -1/+2 |
| |\ | |||||
| | * | Merge 5.3->5.5 | unknown | 2013-10-29 | 1 | -1/+2 |
| | |\ | |||||
| | | * | MDEV-5104 crash in Item_field::used_tables with broken order by | timour@askmonty.org | 2013-10-29 | 1 | -1/+2 |
* | | | | Merge 10.0-base -> 10.0 | Sergey Petrunya | 2013-10-16 | 1 | -0/+9 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-3798: [SHOW] EXPLAIN UPDATE/DELETE, Memory leak in binlog.binlog_base64_... | Sergey Petrunya | 2013-10-16 | 1 | -2/+4 |
| * | | | MDEV-3798: [SHOW] EXPLAIN UPDATE/DELETE | Sergey Petrunya | 2013-10-15 | 1 | -0/+7 |
| |\ \ \ | |||||
| | * | | | MDEV-5106: Server crashes in Explain_union::print_explain on ER_TOO_BIG_SELECT | Sergey Petrunya | 2013-10-10 | 1 | -1/+1 |
| | * | | | MDEV-3798: EXPLAIN UPDATE/DELETE | Sergey Petrunya | 2013-10-05 | 1 | -4/+4 |
| | * | | | [SHOW] EXPLAIN UPDATE/DELETE, code re-structuring | Sergey Petrunya | 2013-08-24 | 1 | -0/+7 |
| | |\ \ \ | |||||
| | | * \ \ | [SHOW] EXPLAIN UPDATE/DELETE, code re-structuring | Sergey Petrunya | 2013-08-24 | 1 | -0/+7 |
| | | |\ \ \ | |||||
| | | | * | | | [SHOW] EXPLAIN UPDATE/DELETE, code re-structuring | Sergey Petrunya | 2013-06-27 | 1 | -4/+5 |
| | | | * | | | [SHOW] EXPLAIN UPDATE/DELETE, code re-structuring | Sergey Petrunya | 2013-06-27 | 1 | -0/+6 |
* | | | | | | | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 1 | -2/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | 5.5 merge and fixes for compiler/test errors | Sergei Golubchik | 2013-09-18 | 1 | -2/+4 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | | | |||||
| | * | | | | MDEV-4978 - Server cursor is broken with blobs in the select list, | Sergey Vojtovich | 2013-09-06 | 1 | -2/+4 |
| * | | | | | merge 5.5 -> 10.0-base | unknown | 2013-08-20 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | | | |||||
* | | | | | Merged fix for uninitialized variables. | Sergey Vojtovich | 2013-07-31 | 1 | -1/+1 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Fix of using uninitialized variadle. | unknown | 2013-07-18 | 1 | -1/+1 |
* | | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | A fix of unions with duplicate rows and returning bug fix for lp:732124 union... | unknown | 2013-06-26 | 1 | -1/+1 |
| * | | | | | Finished merging wl5986 started by Igor. | unknown | 2013-06-19 | 1 | -1/+1 |
| * | | | | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -1/+1 |
* | | | | | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 1 | -1/+4 |
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | |||||
| * | | | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -1/+4 |
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| | | |||||
| | * | | mdev-4173: Wrong result (extra row) with semijoin=on, joins in outer query, L... | Sergey Petrunya | 2013-07-16 | 1 | -1/+4 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Fixed some race conditons and bugs related to killed queries | Michael Widenius | 2013-01-11 | 1 | -1/+1 |
* | | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge mdev-452 with the latest 10.0-base. | unknown | 2012-10-18 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-10-17 | 1 | -1/+1 |
| | |/ / | |||||
* | | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 1 | -0/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | SHOW EXPLAIN: merge with 5.5-main | Sergey Petrunya | 2012-10-06 | 1 | -0/+2 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | MDEV-323: SHOW EXPLAIN: Plan produced by SHOW EXPLAIN loses 'UNION RESULT' line | Sergey Petrunya | 2012-06-07 | 1 | -0/+2 |
| * | | | 5.3 merge | Sergei Golubchik | 2012-08-27 | 1 | -0/+2 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | fix for MDEV-367 | unknown | 2012-08-25 | 1 | -0/+2 |
* | | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 1 | -3/+3 |
|/ / | |||||
* | | Merged the implementation of MDEV-28 LIMIT ROWS EXAMINED into MariaDB 5.5. | unknown | 2012-03-12 | 1 | -1/+24 |
|\ \ | |||||
| * | | Implementation of MDEV-28 LIMIT ROWS EXAMINED | unknown | 2012-03-11 | 1 | -1/+24 |
| |/ | |||||
* | | Merge 5.3->5.5. | Igor Babaev | 2012-03-01 | 1 | -0/+8 |
|\ \ | |/ | |||||
| * | Fixed LP bug #939009. | Igor Babaev | 2012-02-24 | 1 | -0/+8 |
* | | 5.3.4 merge | Sergei Golubchik | 2012-02-15 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | Fix for LP BUG#910123 MariaDB 5.3.3 causes 1093 error on Drupal | unknown | 2012-02-14 | 1 | -0/+1 |
* | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -9/+32 |
| |\ | |||||
| | * | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 1 | -9/+30 |
| | |\ | |||||
| | * \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 |
| | |\ \ | |||||
* | | \ \ | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -0/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fixed issue with slow query logging where examined rows where wrong | Michael Widenius | 2011-09-23 | 1 | -0/+1 |