summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
Commit message (Expand)AuthorAgeFilesLines
* WL#5197 "Move @@engine_condition_pushdown to @@optimizer_switch"Guilhem Bichot2010-01-061-2/+4
* WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-28/+20
* Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-171-1/+13
|\
| * Automerge from mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2009-12-171-1/+13
| |\
| | * Bug#47650: using group by with rollup without indexesMartin Hansson2009-12-171-1/+13
* | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-161-2/+8
|\ \ \ | |/ /
| * | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-161-0/+5
| |\ \ | | |/
| | * Bug #48709: Assertion failed in sql_select.cc:11782:Georgi Kodinov2009-12-151-0/+5
| * | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-111-2/+3
| |\ \ | | |/
| | * mergeGeorgi Kodinov2009-12-101-1/+1
| | |\
| | | * Bug #42760: Select doesn't return desired results when we have null valuesGeorgi Kodinov2009-12-071-1/+1
| | * | Manual merge.Ramil Kalimullin2009-12-101-1/+1
| | |\ \ | | | |/
| | | * Fix for bug#49199: Optimizer handles incorrectly: Ramil Kalimullin2009-12-041-1/+1
| | * | Fix for Bug#49506 Valgrind error in make_cond_for_table_from_predOlav Sandstaa2009-12-091-0/+1
* | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-121-109/+89
|\ \ \ \ | |/ / /
| * | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-111-76/+224
| |\ \ \
| * \ \ \ Automerge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-11-261-40/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Bug #45261 : Crash, stored procedure + decimalGeorgi Kodinov2009-11-201-40/+1
| * | | | Manual merge from the mysql-5.1-bugteam.Alexey Kopytov2009-11-241-8/+7
| |\ \ \ \ | | |/ / /
| | * | | mergeKristofer Pettersson2009-11-201-1/+4
| | |\ \ \
| | | * | | Bug#45613 handle failures from my_hash_insertKristofer Pettersson2009-11-201-1/+4
| | * | | | Bug#48052: Valgrind warning - uninitialized value in Jorgen Loland2009-11-131-6/+2
| | * | | | Automerge.Alexey Kopytov2009-11-121-1/+1
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Automerge.Alexey Kopytov2009-11-121-1/+1
| | | |\ \ \
| | | | * | | Fixed a gcc warning introduced by the patch for bug #48475.Alexey Kopytov2009-11-121-1/+1
| * | | | | | Manual merge from the mysql-5.1-bugteam.Alexey Kopytov2009-11-241-62/+82
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | mergeGeorgi Kodinov2009-11-101-5/+5
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Bug #48458: simple query tries to allocate enormous amount ofGeorgi Kodinov2009-11-091-5/+5
| | * | | | | mergeGeorgi Kodinov2009-11-101-50/+61
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Bug #42760: Select doesn't return desired results when we have nullGeorgi Kodinov2009-11-101-50/+61
| | | |/ / /
| | * | | | Automerge.Alexey Kopytov2009-11-061-7/+16
| | |\ \ \ \ | | | |/ / /
| | | * | | Bug #48475: DISTINCT is ignored with GROUP BY WITH ROLLUP andAlexey Kopytov2009-11-061-7/+16
| * | | | | Manual merge from mysql-5.1.Alexander Nozdrin2009-11-051-2/+58
| |\ \ \ \ \ | | |/ / / /
* | | | | | Bug#33546: Slowdown on re-evaluation of constant expressions.Evgeny Potemkin2009-12-021-0/+39
* | | | | | Manual merge/pull from mysql-next-mr.Alexander Nozdrin2009-11-251-5/+5
|\ \ \ \ \ \
| * | | | | | Backport of:Konstantin Osipov2009-11-241-5/+5
* | | | | | | Merge with next-mrKonstantin Osipov2009-11-201-5/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Manual merge of mysql-next-mr-runtime upstream.Davi Arnaut2009-11-191-5/+3
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Backport of Bug#15192 to mysql-next-mrDavi Arnaut2009-11-101-5/+3
* | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-121-88/+246
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-101-4/+4
| |\ \ \ \ \ \
| | * \ \ \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-051-68/+94
| | |\ \ \ \ \ \ | | | |/ / / / /
| | * | | | | | backport of dbug extensions from 6.0:Sergei Golubchik2009-10-301-4/+4
| * | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-2/+58
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | A fix and a test case for Konstantin Osipov2009-11-031-2/+58
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | A fix and a test case forKonstantin Osipov2009-11-031-2/+59
| | | * | | | | Automerge.Alexey Kopytov2009-10-301-28/+64
| | | |\ \ \ \ \
| * | | \ \ \ \ \ Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Fix automerge: use 'thd->query()' instead of 'thd->query'.Alexander Nozdrin2009-11-051-1/+1
| * | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-31/+132
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |