summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
Commit message (Expand)AuthorAgeFilesLines
* merge 4.1->5.0unknown2005-03-311-10/+16
|\
| * mergeunknown2005-03-301-15/+29
| |\
| | * Fix for BUG#9213: GROUP BY returns wrong query results:unknown2005-03-301-1/+13
| * | Mergeunknown2005-03-301-11/+3
| |\ \
| | * | fixed union types merging and table related metadata (BUG#8824)unknown2005-03-231-11/+3
* | | | Mergeunknown2005-03-301-15/+15
|\ \ \ \ | | |_|/ | |/| |
| * | | A fix (bug #9401: type_timestamp segfaults mysqld)unknown2005-03-301-15/+17
| |/ /
| * | Fixed newly introduced bug in ROLLUPunknown2005-03-221-1/+1
* | | Bug #9317: Wrong count for tables in INFORMATION_SCHEMAunknown2005-03-241-2/+3
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-03-211-7/+9
|\ \ \
| * | | Cleanups during review of codeunknown2005-03-211-7/+9
* | | | Manual merge of csets from -build tree into main 5.0 tree.unknown2005-03-211-2/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Eliminate warnings noticed by VC7. This includes fixing my_mmap() onunknown2005-03-181-2/+1
* | | | func_group.test, func_group.result:unknown2005-03-191-19/+29
* | | | Manual mergeunknown2005-03-171-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | olap.test:unknown2005-03-171-1/+1
* | | Fix merge of sql/sql_select.cc using Igor's patch (Bug #9254)unknown2005-03-171-3/+4
* | | after merge fixunknown2005-03-171-0/+1
* | | Merge 4.1 -> 5.0unknown2005-03-171-27/+92
|\ \ \ | |/ /
| * | olap.result, olap.test:unknown2005-03-161-3/+4
| * | olap.result, olap.test:unknown2005-03-151-26/+92
| |/
* | Cleanup during reviewsunknown2005-03-161-4/+5
* | Merge with global treeunknown2005-03-151-12/+15
|\ \
| * \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-03-041-13/+26
| |\ \
| * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-03-011-12/+15
| |\ \ \
| | * | | Removed some usage of current_thdunknown2005-03-011-12/+15
* | | | | Removed unnecessary current_thdunknown2005-03-141-2/+2
* | | | | WL#2353 EXPLAIN support for condition pushdownunknown2005-03-141-1/+15
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-03-131-0/+111
|\ \ \ \ \
| * | | | | WL#926 "SUM(DISTINCT) and AVG(DISTINCT)": improvement of SUM(DISTINCT) andunknown2005-03-131-0/+111
| | |_|/ / | |/| | |
* | | | | mergedunknown2005-03-091-1/+1
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | BUG#6635 - test_if_skip_sort_order() thought it can skip filesortunknown2005-03-081-1/+1
* | | | Fixes for bug#8115 "Server Crash with prepared statement"unknown2005-03-031-13/+26
| |/ / |/| |
* | | Fix for Bug#5615 and merge from 4.1unknown2005-03-011-4/+4
* | | Mergeunknown2005-03-011-2/+4
|\ \ \ | |/ / | | / | |/ |/|
| * Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-011-0/+9
| |\
| | * Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-011-1/+1
| | |\
| | * \ mergingunknown2005-02-281-0/+9
| | |\ \
| | | * | A fix (bug #5615 type of aggregate function column wrong when using group by).unknown2004-10-111-0/+9
| * | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-011-1/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fix for BUG#8726: In JOIN::optimize on ER_TOO_BIG_SELECT error set JOIN::erro...unknown2005-02-281-1/+1
| | |/ /
| * | | mergingunknown2005-02-281-39/+106
| |\ \ \ | | |/ /
| * | | A fix (bug #6089: FOUND_ROWS returns wrong values when no table/view is used).unknown2004-10-271-1/+3
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-02-281-10/+23
|\ \ \ \
| * \ \ \ merge with 4.1unknown2005-02-281-10/+23
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fixed wrong memory references found by purifyunknown2005-02-281-10/+23
| | * | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-02-141-2/+1
| | |\ \ \
* | | \ \ \ Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-02-261-5/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge with global treeunknown2005-02-251-5/+1
| |\ \ \ \ \
| | * | | | | Remove compiler warnings and remove not used variablesunknown2005-02-251-5/+1