summaryrefslogtreecommitdiff
path: root/sql/sql_select.h
Commit message (Expand)AuthorAgeFilesLines
* Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-1/+2
|\
| * Updated/added copyright headersKent Boortz2011-07-031-2/+3
| |\
* | \ Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-1/+2
|\ \ \ | | |/ | |/|
| * | Bug#11765713 58705: OPTIMIZER LET ENGINE DEPEND ON UNINITIALIZED VALUES CREAT...Tor Didriksen2011-04-141-1/+2
| |/
* | Merge with MySQL 5.1.55Michael Widenius2011-02-201-1/+1
|\ \ | |/
| * MergeKent Boortz2010-12-291-1/+1
| |\
| | * - Added/updated copyright headersKent Boortz2010-12-281-1/+1
* | | 5.1.51 mergeSergei Golubchik2010-10-191-1/+2
|\ \ \ | |/ /
| * | Automerge.Alexey Kopytov2010-08-241-0/+1
| |\ \
| | * | Bug #55568: user variable assignments crash server when usedAlexey Kopytov2010-08-241-0/+1
| * | | Bug #55580 : segfault in read_view_sees_trx_idGeorgi Kodinov2010-08-131-1/+1
| |/ /
* | | Fixed bug #57024.Igor Babaev2010-09-261-1/+3
* | | Fix of LP#616253 Crash in _ma_bitmap_set_full_page_bits on Aria recoveryMichael Widenius2010-08-241-0/+5
* | | Fix for LP#612894 Some aggregate functions (such as MIN MAX) work incorrectly...Michael Widenius2010-08-231-13/+16
* | | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-8/+31
|\ \ \ | |/ /
| * | Addendum 2 for bug #46175: NULL read_view and consistent read assertionGeorgi Kodinov2010-02-151-2/+2
| * | Addendum to bug #46175 : use and check for the correct error valuesGeorgi Kodinov2010-02-111-4/+5
| * | Bug#45195 valgrind warnings about uninitialized values in store_record_in_cac...Sergey Glukhov2010-02-101-2/+6
| * | Bug #45989 take 2 : memory leak after explain encounters anGeorgi Kodinov2010-02-021-1/+19
* | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-0/+12
|\ \ \ | |/ /
| * | Bug #46175: NULL read_view and consistent read assertionGeorgi Kodinov2010-01-151-0/+12
* | | Merge with MySQL 5.1, with following additions:unknown2009-11-161-1/+24
|\ \ \ | |/ /
| * | A fix and a test case for Konstantin Osipov2009-11-031-0/+7
| |\ \ | | |/
| | * A fix and a test case forKonstantin Osipov2009-11-031-1/+7
| * | Automerge.Alexey Kopytov2009-10-301-0/+1
| |\ \ | | |/
| | * Bug #48131: crash group by with rollup, distinct, filesort,Alexey Kopytov2009-10-301-0/+1
| * | Bug#47280 - strange results from count(*) with order by multiple Jorgen Loland2009-10-141-1/+14
| * | Bug #43029: FORCE INDEX FOR ORDER BY is ignored when join Georgi Kodinov2009-10-071-0/+2
| * | automergeGeorgi Kodinov2009-07-161-1/+2
| |\ \ | | |/
| | * Bug #46003 and bug #46034: backported the fixes from azalea.Georgi Kodinov2009-07-161-1/+2
* | | MWL#17: Table eliminationSergey Petrunya2009-08-131-49/+1
* | | MWL#17: Table eliminationSergey Petrunya2009-06-301-1/+35
* | | MWL#17: Table eliminationSergey Petrunya2009-06-291-6/+14
* | | MWL#17: Table eliminationSergey Petrunia2009-06-261-1/+2
* | | MWL#17: Table eliminationSergey Petrunia2009-06-251-0/+17
* | | MWL#17: Table eliminationSergey Petrunia2009-06-221-0/+1
* | | MWL#17: Table eliminationSergey Petrunia2009-06-141-0/+1
* | | MWL#17: Table eliminationSergey Petrunia2009-06-141-3/+2
* | | MWL#17: Table eliminationSergey Petrunia2009-06-031-0/+3
* | | Merged with mysql-5.1 tree.Michael Widenius2009-04-251-0/+6
|\ \ \ | |/ /
| * | - Backport @@optimizer_switch support from 6.0Sergey Petrunia2009-02-231-0/+6
* | | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-111-2/+7
|\ \ \ | |/ /
| * | automerge 5.0-bugteam --> 5.1-bugteam (bug 42037)Gleb Shchepa2009-02-051-2/+7
| |\ \ | | |/
| | * Bug #42037: Queries containing a subquery with DISTINCT andGleb Shchepa2009-02-051-2/+7
* | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-121-1/+5
|\ \ \ | |/ /
| * | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2008-12-241-1/+5
| |\ \ | | |/
| | * Bug#40953 SELECT query throws "ERROR 1062 (23000): Duplicate entry..." errorSergey Glukhov2008-12-241-1/+5
* | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or...Guilhem Bichot2008-11-211-1/+1
|\ \ \ | |/ /
| * | Merge from mysql-5.0-bugteam into mysql-5.1-bugteamDavi Arnaut2008-10-241-1/+1
| |\ \ | | |/
| | * BUG#38072: Wrong result: HAVING not observed in a query with aggregateSergey Petrunia2008-10-241-1/+1