Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.0' into bb-10.1-merge | Sergei Golubchik | 2014-12-02 | 1 | -13/+13 |
|\ | |||||
| * | 5.5 merge | Sergei Golubchik | 2014-11-19 | 1 | -12/+12 |
| |\ | |||||
| | * | MDEV-6868: MariaDB server crash ( select with union and order by with subque... | unknown | 2014-11-15 | 1 | -12/+12 |
| * | | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -1/+1 |
* | | | Correction for the fix of the bug mdev-6874. | Igor Babaev | 2014-10-19 | 1 | -0/+2 |
* | | | Merge branch '10.1' of ../10.1-mdev334 into 10.1 | Igor Babaev | 2014-10-17 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Fixed bug mdev-6874. | Igor Babaev | 2014-10-17 | 1 | -0/+1 |
* | | | | Merge branch 'bb-10.1-merge' into 10.1mariadb-10.1.1 | Sergei Golubchik | 2014-10-16 | 1 | -1/+2 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | 5.5.39 merge | Sergei Golubchik | 2014-08-07 | 1 | -1/+2 |
| |\ \ | | |/ | |||||
| | * | mysql-5.5.39 merge | Sergei Golubchik | 2014-08-02 | 1 | -1/+7 |
| | |\ | |||||
| | | * | Bug #17059925: UNIONS COMPUTES ROWS_EXAMINED INCORRECTLY | mithun | 2014-05-08 | 1 | -1/+7 |
| | | * | Bug #18167356: EXPLAIN W/ EXISTS(SELECT* UNION SELECT*) | mithun | 2014-04-28 | 1 | -0/+29 |
* | | | | MDEV-334: Backport of UNION ALL optimization from mysql-5.7. | Igor Babaev | 2014-10-14 | 1 | -56/+197 |
|/ / / | |||||
* | | | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 1 | -0/+3 |
|\ \ \ | |||||
| * \ \ | 5.5 merge | Sergei Golubchik | 2014-02-25 | 1 | -0/+3 |
| |\ \ \ | | |/ / | |||||
| | * | | 5.3 merge | Sergei Golubchik | 2014-02-14 | 1 | -1/+2 |
| | |\ \ | |||||
| | | * | | MDEV-714 LP:1020645 - crash (sig 11) with union query | Sergei Golubchik | 2014-02-13 | 1 | -1/+2 |
* | | | | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -3/+3 |
* | | | | | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 1 | -1/+4 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 5.5 merge | Sergei Golubchik | 2014-02-01 | 1 | -1/+4 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge 5.3->5.5 | unknown | 2014-01-15 | 1 | -1/+4 |
| | |\ \ \ | | | |/ / | |||||
* | | | | | 10.0-base merge | Sergei Golubchik | 2013-12-16 | 1 | -4/+14 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 5.5 merge | Sergei Golubchik | 2013-12-15 | 1 | -4/+14 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | 5.3 merge | Sergei Golubchik | 2013-12-13 | 1 | -4/+14 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Fixed bug mdev-5410. | Igor Babaev | 2013-12-12 | 1 | -4/+13 |
| | | * | | Another attempt to fix the memory leak of mdev-5400. | Igor Babaev | 2013-12-11 | 1 | -0/+1 |
* | | | | | 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 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | | |