summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge with MariaDB 5.1Michael Widenius2011-11-241-10/+23
|\
| * Merge with MySQL 5.1.60Michael Widenius2011-11-231-0/+13
| |\
| | * Backmerge of BUG#12997905Jorgen Loland2011-11-181-0/+3
| | * Bug#11747970 34660: CRASH WHEN FEDERATED TABLE LOSES CONNECTION DURING INSERT...Sergey Glukhov2011-10-051-0/+10
| * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-10/+10
| |\ \ | | |/
| | * Bug#11766594 59736: SELECT DISTINCT.. INCORRECT RESULT WITH DETERMINISTIC FUN...Sergey Glukhov2011-08-021-4/+4
| | * weave merge of mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-05-101-6/+50
| | |\
| | * \ merge 5.0 => 5.1 : Bug#12329653Tor Didriksen2011-05-041-6/+6
| | |\ \
| | | * | Bug#12329653 - EXPLAIN, UNION, PREPARED STATEMENT, CRASH, SQL_FULL_GROUP_BYTor Didriksen2011-05-041-6/+6
| | | * | automergeGeorgi Kodinov2011-01-071-1/+1
| | | |\ \
| | | * | | backport: Bug #55568 from 5.1-security to 5.0-securityGleb Shchepa2010-11-231-7/+15
| | | * | | Bug#52711 Segfault when doing EXPLAIN SELECT with union...order by (select......Sergey Glukhov2010-11-081-2/+3
* | | | | | 5.1 mergeSergei Golubchik2011-07-121-6/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | bugfix: create internal temporary tables in mysql_tmpdir, not in datadirSergei Golubchik2011-07-121-6/+6
* | | | | | Merge with 5.1Michael Widenius2011-06-241-0/+21
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fixed typo. (Old code worked as both tested parts where 'bool', but not nice ...Michael Widenius2011-06-241-1/+1
| * | | | | Fix for bug lp:798597 Incorrect "Duplicate entry" error with views and GROUP BYMichael Widenius2011-06-241-0/+21
* | | | | | A bit better fix for tmp-table problemMichael Widenius2011-06-101-5/+6
* | | | | | Use dynamic row format when creating temporary tables without sumary fields.Michael Widenius2011-06-091-3/+14
* | | | | | Merge with MariaDB 5.1Michael Widenius2011-05-031-176/+287
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-176/+287
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Bug#11756928 48916: SERVER INCORRECTLY PROCESSING HAVING CLAUSES WITH AN ORD...Sergey Glukhov2011-04-221-1/+37
| | * | | | Bug#11765713 58705: OPTIMIZER LET ENGINE DEPEND ON UNINITIALIZED VALUES CREAT...Tor Didriksen2011-04-141-1/+1
| | * | | | Bug#11756242 48137: PROCEDURE ANALYSE() LEAKS MEMORY WHEN RETURNING NULLSergey Glukhov2011-04-141-4/+12
| | |/ / /
| | * | | Bug#11766675 - 59839: Aggregation followed by subquery yields wrong resultMartin Hansson2011-02-181-31/+35
| | * | | Merge from mysql-5.1.55-releaseunknown2011-02-081-1/+1
| | |\ \ \
| | * | | | Fix for bug#59308: Incorrect result for SELECT DISTINCT <col>... ORDER BY <co...Ole John Aske2011-02-071-88/+135
| | * | | | Fix for bug#57030: ('BETWEEN' evaluation is incorrect')Ole John Aske2011-02-011-38/+60
* | | | | | Merge Mariadb 5.1->5.2unknown2011-04-121-7/+23
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Bug fix for lp:732124 union + limit returns wrong resultMichael Widenius2011-03-091-7/+23
* | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-10/+23
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-8/+18
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Updating header copyright/README in source for 2011Karen Langford2011-01-251-1/+1
| | |/ / /
| | * | | Bug#58207: invalid memory reads when using default column value and Martin Hansson2011-01-121-1/+6
| | * | | Fix for bug#58553, "Queries with pushed conditions causes 'explain extended' Jan Wedvik2011-01-111-1/+0
| | * | | MergeKent Boortz2010-12-291-1/+1
| | |\ \ \ | | | | |/ | | | |/|
| | | * | - Added/updated copyright headersKent Boortz2010-12-281-1/+1
| | | |/
| | * | Fixed following problems:Sergey Glukhov2010-12-141-1/+2
| | * | mergeGeorgi Kodinov2010-11-261-1/+13
| | |\ \
| | * | | Fix for Bug#56138 "valgrind errors about overlapping memory when double-assig...Guilhem Bichot2010-11-221-2/+6
| | * | | Bug #52160: crash and inconsistent results when groupingGleb Shchepa2010-10-311-0/+2
| * | | | Fixed some mysql-test-run failures and compile warnings/errorsMichael Widenius2011-01-201-0/+1
| * | | | Fixed LP bug #702310 / bug #59493.Igor Babaev2011-01-141-2/+4
* | | | | Merge with alias as StringMichael Widenius2011-02-281-8/+15
|\ \ \ \ \
| * | | | | Change TABLE->alias to String for less memory reallocationMichael Widenius2011-02-281-8/+14
| * | | | | Make SQLString reallocation addaptiveMichael Widenius2010-11-081-0/+1
* | | | | | Fixed typosMichael Widenius2011-01-071-1/+1
* | | | | | Merge with 5.1Michael Widenius2011-01-051-0/+6
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Make copy from heap to MyISAM / Aria killable.Michael Widenius2011-01-051-0/+6
* | | | | | merge with 5.1Michael Widenius2010-11-301-15/+48
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | |