summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
Commit message (Expand)AuthorAgeFilesLines
* Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-05-091-13/+53
|\
| * Merge of fix for Bug#52357Martin Hansson2010-05-071-2/+1
| |\
| | * Bug#53334 Incorrect result for InnoDB in LEFT JOIN with impossible conditionSergey Glukhov2010-05-071-2/+1
| * | Merge of fix for Bug#52357Martin Hansson2010-05-061-11/+52
| |\ \ | | |/ | |/|
| | * Bug#52357: Assertion failed: join->best_read inMartin Hansson2010-05-061-11/+45
| | * Backport of the fix for bug #50335 to 5.0.Alexey Kopytov2010-04-271-3/+5
* | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-05-071-2/+1
|\ \ \ | |/ /
| * | Automerge.Alexey Kopytov2010-04-301-2/+1
| |\ \
| | * | Bug #48419: another explain crash..Alexey Kopytov2010-04-301-2/+1
* | | | Manual merge from mysql-trunk.Alexander Nozdrin2010-04-271-1/+1
|\ \ \ \
| * | | | Bug#51980 mysqld service crashes with a simple COUNT(DISTINCT) query over a viewunknown2010-04-131-1/+1
* | | | | Manual merge of mysql-5.1-bugteam toAlexey Kopytov2010-04-191-2/+19
|\ \ \ \ \ | |/ / / /
| * | | | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-2/+19
* | | | | Automerge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-04-111-5/+5
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Bug#52336 Segfault / crash in 5.1 copy_fields (param=0x9872980) at sql_select...Sergey Glukhov2010-04-051-5/+5
| | |/ / | |/| |
* | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-04-031-1/+1
|\ \ \ \ | |/ / /
| * | | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2010-03-261-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Bug#52177 crash with explain, row comparison, join, text fieldSergey Glukhov2010-03-261-1/+1
* | | | Automerge.Alexey Kopytov2010-04-021-1/+12
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2010-03-241-1/+12
| |\ \ | | |/
| | * Bug#48483 crash in get_best_combination()Sergey Glukhov2010-03-241-1/+12
* | | Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-241-96/+197
|\ \ \
| * \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-03-011-12/+23
| |\ \ \
| * \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-241-98/+164
| |\ \ \ \
| * | | | | Bug#43201 : Stack overrun when running sp-error test.Vladislav Vaintroub2010-02-231-2/+0
| * | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-151-1/+7
| |\ \ \ \ \
| | * \ \ \ \ Auto-merged fix for the bug#50539.Evgeny Potemkin2010-02-121-0/+6
| | |\ \ \ \ \
| | * \ \ \ \ \ Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-051-10/+25
| | |\ \ \ \ \ \
| | * | | | | | | fixes for gcc 4.4.1 warningsGuilhem Bichot2010-01-251-1/+1
| * | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-061-10/+25
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-031-9/+9
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-311-1/+1
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-311-0/+13
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Auto-merge from mysql-trunk-merge.Alexander Nozdrin2010-01-281-0/+1
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-191-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-051-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-131-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Manual merge from next-mr.unknown2010-01-121-28/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-0/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merging with mysql.5.1-rep+2Mats Kindahl2009-12-181-109/+89
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Alfranio Correia2009-12-171-109/+89
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ Merging with mysql-5.1-rep+2Mats Kindahl2009-12-181-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | WL#5151: Conversion between different typesMats Kindahl2009-12-181-0/+1
| | | * | | | | | | | | | | | | | | Merging with mysql-5.1-rep+2Mats Kindahl2009-12-151-0/+12
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | WL#5151: Conversion between different types when replicatingMats Kindahl2009-12-141-0/+12
| * | | | | | | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-031-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | WL#5197 "Move @@engine_condition_pushdown to @@optimizer_switch"Guilhem Bichot2010-01-061-2/+4
| | | |_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-031-28/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-28/+20
| | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-3/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /