summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge from mysql-5.1-bugteamAlexander Nozdrin2009-08-261-40/+1
|\
| * Bug#45261: Crash, stored procedure + decimalDavi Arnaut2009-08-241-40/+1
* | merge of 5.1-main into mysql-trunk.Guilhem Bichot2009-08-121-19/+35
|\ \ | |/
| * Bug#46454: MySQL wrong index optimisation leads to incorrect result & crashesMartin Hansson2009-08-071-12/+13
| * Automerge.Alexey Kopytov2009-07-241-0/+5
| |\
| | * Manual merge.Alexey Kopytov2009-07-241-0/+5
| | |\
| | | * Bug #46075: Assertion failed: 0, file .\protocol.cc, line 416 Alexey Kopytov2009-07-241-0/+5
| * | | automergeGeorgi Kodinov2009-07-161-7/+17
| |\ \ \ | | |/ / | |/| |
| | * | Bug #46003 and bug #46034: backported the fixes from azalea.Georgi Kodinov2009-07-161-7/+17
| | |/
* | | Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:Guilhem Bichot2009-08-041-50/+88
|\ \ \ | |/ /
| * | Bug #36259 (Optimizing with ORDER BY) and bug#45828 (Optimizer won't Georgi Kodinov2009-07-071-1/+9
| * | Automerge.Alexey Kopytov2009-07-031-3/+7
| |\ \
| | * \ Manual merge.Alexey Kopytov2009-07-031-3/+7
| | |\ \
| | | * | Bug #45262: Bad effects with CREATE TABLE and DECIMAL Alexey Kopytov2009-07-031-3/+7
| | | |/
| * | | Bug#45266: Uninitialized variable lead to an empty result.Evgeny Potemkin2009-06-261-1/+0
| |/ /
| | |
| | \
| *-. \ Merge from 5.0-bugteamStaale Smedseng2009-06-171-37/+35
| |\ \ \ | | | |/
| | | * Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-171-25/+27
| | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-101-25/+27
| * | | automergeGeorgi Kodinov2009-06-151-0/+15
| |\ \ \ | | | |/ | | |/|
| | * | Bug #44810: index merge and order by with low sort_buffer_sizeGeorgi Kodinov2009-06-151-0/+15
| | |/
| * | Bug #44886: SIGSEGV in test_if_skip_sort_order() -Gleb Shchepa2009-06-081-1/+5
| * | auto-mergeTatiana A. Nurnberg2009-06-051-0/+7
| |\ \ | | |/
| | * Bug#32149: Long semaphore wait for adaptive hash latchTatiana A. Nurnberg2009-06-051-0/+7
| | * merged 5.0-main -> 5.0-bugteamGeorgi Kodinov2009-05-151-27/+39
| | |\
| | | * Merge community up to enterprise, thus ending the community-serverChad MILLER2009-05-061-27/+39
| | | |\
| | | | * Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.Chad MILLER2009-04-141-81/+100
| | | | |\
| | | | * \ Merge from Tim's 5.0.76-release tree to make 5.0.77 .Chad MILLER2009-01-211-13/+20
| | | | |\ \
| | | | * \ \ Merged from 5.0 (enterprise).Chad MILLER2008-12-171-28/+74
| | | | |\ \ \
| | | | * \ \ \ Merge from 5.0 trunk.Chad MILLER2008-07-141-34/+20
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge chunk from trunk.Chad MILLER2008-07-101-9/+34
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge chunk from trunk.Chad MILLER2008-07-101-22/+29
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-12-101-27/+46
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-10-101-27/+46
| | | | | |\ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-09-101-27/+46
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-07-021-27/+46
| | | | | | | |\ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-04-261-27/+46
| | | | | | | | |\ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Bug #44399 : crash with statement using TEXT columns, aggregates, GROUP BY, andGeorgi Kodinov2009-05-251-5/+5
| * | | | | | | | | | | | | | | Bug #44290: explain crashes for subquery with distinct inGleb Shchepa2009-05-121-0/+1
| * | | | | | | | | | | | | | | Bug#44306: Assertion fail on duplicate key error in Martin Hansson2009-05-041-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Bug#44306: Assertion fail on duplicate key error in Martin Hansson2009-05-041-2/+4
| * | | | | | | | | | | | | | | | auto-upmerge 5.0-bugteam --> 5.1-bugteam (bug 37362)Gleb Shchepa2009-05-011-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Bug #37362: Crash in do_field_eqGleb Shchepa2009-05-011-0/+8
| | |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge MySQL 5.1.35 into MySQL 5.4Mikael Ronstrom2009-06-111-32/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Bug #44290: explain crashes for subquery with distinct inGleb Shchepa2009-05-131-0/+1
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | mergingAlexey Botchkov2009-04-291-19/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | mergingAlexey Botchkov2009-04-281-15/+31
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Bug#25058 ignored return codes in memory allocation functionsAlexey Botchkov2008-11-211-15/+31
| | * | | | | | | | | | | | | | Backport bug #37348 fix 5.1 --> 5.0.Gleb Shchepa2009-04-011-1/+10
| | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | auto-mergeIgnacio Galarza2009-03-191-12/+24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-101-20/+20