Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | MDEV-6066: Merge new defaults from 5.6 and 5.7 (defaults changed, QC can be s... | Oleksandr Byelkin | 2015-09-04 | 1 | -1/+1 |
* | Merge branch '10.1' into bb-10.1-merge | Sergei Golubchik | 2014-12-03 | 1 | -1/+1 |
|\ | |||||
| * | MDEV-7245: Incorrect display of subquery cache in union.result | Sergei Petrunia | 2014-12-02 | 1 | -1/+1 |
* | | Merge branch '10.0' into bb-10.1-merge | Sergei Golubchik | 2014-12-02 | 1 | -0/+20 |
|\ \ | |/ |/| | |||||
| * | MDEV-6868: MariaDB server crash ( select with union and order by with subque... | unknown | 2014-11-15 | 1 | -0/+20 |
* | | Merge branch '10.1' of ../10.1-mdev334 into 10.1 | Igor Babaev | 2014-10-17 | 1 | -0/+10 |
|\ \ | |||||
| * | | Fixed bug mdev-6874. | Igor Babaev | 2014-10-17 | 1 | -0/+10 |
* | | | Merge branch 'bb-10.1-merge' into 10.1mariadb-10.1.1 | Sergei Golubchik | 2014-10-16 | 1 | -0/+34 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | mysql-5.5.39 merge | Sergei Golubchik | 2014-08-02 | 1 | -0/+34 |
| |\ | |||||
| | * | Bug #17059925: UNIONS COMPUTES ROWS_EXAMINED INCORRECTLY | mithun | 2014-05-08 | 1 | -0/+34 |
* | | | MDEV-334: Backport of UNION ALL optimization from mysql-5.7. | Igor Babaev | 2014-10-14 | 1 | -46/+116 |
|/ / | |||||
* | | Add a test case for MySQL's: | Sergei Golubchik | 2014-06-03 | 1 | -2/+11 |
* | | 5.3 merge | Sergei Golubchik | 2013-12-13 | 1 | -0/+15 |
|\ \ | |||||
| * | | Fixed bug mdev-5382 | Igor Babaev | 2013-12-05 | 1 | -0/+15 |
* | | | Merge 5.3->5.5 | Alexander Barkov | 2013-11-14 | 1 | -0/+15 |
|\ \ \ | |/ / | |||||
| * | | Fixed bug mdev-5091. | Igor Babaev | 2013-11-13 | 1 | -0/+15 |
* | | | Fixed LP bug #1010729. | Igor Babaev | 2012-06-08 | 1 | -0/+17 |
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -0/+3 |
|\ \ \ | |/ / | |||||
| * | | Made the optimizer switch flags 'outer_join_with_cache', 'semijoin_with_cache' | Igor Babaev | 2011-12-15 | 1 | -0/+3 |
| * | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -0/+57 |
| |\ \ | |||||
| | * \ | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 1 | -0/+57 |
| | |\ \ | |||||
* | | | | | after merge changes: | Sergei Golubchik | 2011-12-12 | 1 | -1/+1 |
* | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -0/+57 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | merge 5.1-security => 5.5-security | Tor Didriksen | 2011-07-11 | 1 | -0/+57 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Bug#11765255 - 58201: VALGRIND/CRASH WHEN ORDERING BY MULTIPLE AGGREGATE FUNC... | Tor Didriksen | 2011-07-11 | 1 | -0/+57 |
* | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -7/+23 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -1/+1 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge with 5.3 main | Michael Widenius | 2011-05-16 | 1 | -3/+3 |
| |\ \ \ \ | |||||
| | * | | | | Fix LP BUG#772309 | unknown | 2011-05-05 | 1 | -1/+1 |
| | * | | | | MWL#89 | unknown | 2011-02-14 | 1 | -3/+3 |
| * | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -2/+18 |
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| | | |||||
| | * | | | Bug fix for lp:732124 union + limit returns wrong result | Michael Widenius | 2011-03-09 | 1 | -2/+18 |
| * | | | | MWL#128: Added into EXPLAIN output info about types of the used join buffers and | Igor Babaev | 2010-10-18 | 1 | -1/+1 |
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -0/+125 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Bug#58970 Problem Subquery (without referencing a table) | Magne Mahre | 2011-01-10 | 1 | -0/+25 |
| * | | | | Bug#57986 ORDER BY clause is not used after a UNION, | Magne Mahre | 2011-01-10 | 1 | -0/+100 |
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -3/+3 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | MariaDB 5.2 -> MariaDB 5.3 merge | Sergey Petrunya | 2010-06-26 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -2/+2 |
| | |\ \ | | | |/ | |||||
| * | | | Fix union.test failure in buildbot: alternate fix for BUG#49734 | Sergey Petrunya | 2010-03-20 | 1 | -1/+1 |
| * | | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 1 | -0/+60 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -0/+60 |
| | |\ \ | |||||
| * | | | | Backport into MariaDB-5.2 the following: | Sergey Petrunya | 2009-12-15 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | MWL#17: Table elimination | Sergey Petrunia | 2009-06-15 | 1 | -1/+1 |
* | | | | | WL#5370 Keep forward-compatibility when changing | unknown | 2010-08-18 | 1 | -1/+1 |
* | | | | | Manual merge of mysql-trunk into mysql-trunk-merge. | Alexey Kopytov | 2010-03-24 | 1 | -48/+44 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | WL#2649 Number-to-string conversions | Alexander Barkov | 2010-02-11 | 1 | -6/+6 |
| * | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-19 | 1 | -0/+60 |
| |\ \ \ \ | | | |_|/ | | |/| | |