summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-171-1/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-161-2/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-109/+89
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-121-109/+89
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2009-12-161-0/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | Bug#33546: Slowdown on re-evaluation of constant expressions.Evgeny Potemkin2009-12-021-0/+39
| | * | | | | | | | | | | | | | | Manual merge/pull from mysql-next-mr.Alexander Nozdrin2009-11-251-5/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge with next-mrKonstantin Osipov2009-11-201-5/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2009-12-151-51/+103
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-121-88/+246
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Bug#41371 Select returns 1 row with condition "col is not null and col i...Alexey Botchkov2009-11-031-51/+103
| * | | | | | | | | | | | | | | | | | | Bug#46374 crash, INSERT INTO t1 uses function, function modifies t1Magne Mahre2009-12-101-0/+7
| * | | | | | | | | | | | | | | | | | | Backport of:Konstantin Osipov2009-12-011-2/+2
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Backport of:Konstantin Osipov2009-11-241-5/+5
| | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Manual merge of mysql-next-mr-runtime upstream.Davi Arnaut2009-11-191-5/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Backport of Bug#15192 to mysql-next-mrDavi Arnaut2009-11-101-5/+3
* | | | | | | | | | | | | | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-03-201-7/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Bug#51242 HAVING clause on table join produce incorrect resultsSergey Glukhov2010-03-191-0/+25
| * | | | | | | | | | | | | | | | | | Bug#51494 crash with join, explain and 'sounds like' operatorSergey Glukhov2010-03-191-1/+2
| * | | | | | | | | | | | | | | | | | Bug #49829 Many "hides virtual function" warnings withStaale Smedseng2010-03-141-6/+6
* | | | | | | | | | | | | | | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-03-121-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /