summaryrefslogtreecommitdiff
path: root/sql/sql_union.cc
Commit message (Expand)AuthorAgeFilesLines
* asserting table->file->enable_indexes() in union re-executionserg@serg.mylan2004-05-211-7/+10
* after merge fixbell@sanja.is.com.ua2004-05-191-1/+2
* Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-05-191-3/+7
|\
| * Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1Sinisa@sinisa.nasamreza.org2004-05-151-3/+7
| |\
| | * Optimising UNION ALL (WL 1687)Sinisa@sinisa.nasamreza.org2004-05-151-3/+7
* | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-05-141-0/+29
|\ \ \ | |/ /
| * | keep old engine & JOIN if we changed subquery Item (Bug #3646)bell@sanja.is.com.ua2004-05-071-0/+29
| |/
* | after merge fixbell@sanja.is.com.ua2004-05-141-1/+1
* | Mergebell@sanja.is.com.ua2004-05-141-6/+28
|\ \ | |/ |/|
| * EXPLAIN UNION using same routing which used for execution which allow return ...bell@sanja.is.com.ua2004-05-061-7/+29
* | postreview fixesbell@sanja.is.com.ua2004-05-071-1/+2
* | fake_select_lex should be prepared during PS preparation to work correctlybell@sanja.is.com.ua2004-05-071-18/+60
|/
* mergebell@sanja.is.com.ua2004-05-051-3/+1
|\
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-05-051-3/+1
| |\
| | * after merge fixesmonty@mysql.com2004-05-051-3/+1
* | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-05-051-12/+3
|\ \ \ | |/ / |/| |
| * | caching of queries with isammerge tables forbiden using general waybell@sanja.is.com.ua2004-05-051-12/+3
| |/
* | Windows fixes for VC++ compiler compabilitymiguel@hegel.local2004-05-051-2/+1
|/
* Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1Sinisa@sinisa.nasamreza.org2004-05-041-3/+12
|\
| * Fix for a bug involving UNION's and SET SQL_SELECT_LIMIT Sinisa@sinisa.nasamreza.org2004-05-031-3/+12
* | return table list of fake_select in empty state to prevent using TABLE_LIST a...bell@sanja.is.com.ua2004-05-031-0/+5
|/
* new error for unsupported command in PSbell@sanja.is.com.ua2004-04-081-1/+12
* fixed brocken of client_test bell@sanja.is.com.ua2004-04-031-13/+0
* After merge fixes + simple optimizationsmonty@mysql.com2004-03-261-1/+1
* Merge with 4.0monty@mysql.com2004-03-251-0/+14
|\
| * union.result:Sinisa@sinisa.nasamreza.org2004-03-221-0/+10
* | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-03-251-1/+8
|\ \
| * | Cleanups & safety fixesmonty@mysql.com2004-03-251-1/+8
* | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-03-251-10/+23
|\ \ \ | |/ / |/| |
| * | fixed union with prepared statement bug found by Konstantinbell@sanja.is.com.ua2004-03-231-10/+23
* | | correct support for a mix of UNION/UNION ALL in the same query.serg@serg.mylan2004-03-231-1/+5
|/ /
* | after review changesbell@sanja.is.com.ua2004-03-201-5/+15
* | DBUG_ASSERT(fixed == 1); added to val*bell@sanja.is.com.ua2004-03-181-1/+1
* | DBUG_ASSERT(fixed == 0) added to fix_fields()bell@sanja.is.com.ua2004-03-171-2/+7
* | mergebell@sanja.is.com.ua2004-02-171-0/+6
|\ \
| * \ Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-02-101-0/+6
| |\ \
| | * | fixed subquery with PS (BUG#2462)bell@sanja.is.com.ua2004-02-081-0/+6
* | | | ulternative bugfix for BUG#2508 and fix for BUG#2809 - every table has its ow...bell@sanja.is.com.ua2004-02-171-25/+0
* | | | merge fixesSinisa@sinisa.nasamreza.org2004-02-111-0/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Fixes for bugs #2508 and #2552Sinisa@sinisa.nasamreza.org2004-02-101-0/+4
* | | | after merge & valgrind test fixes (BUG#2120)bell@sanja.is.com.ua2004-02-101-0/+6
| |/ / |/| |
* | | catch accesses to deleted objectsserg@serg.mylan2004-01-301-0/+1
|/ /
* | merge fixesSinisa@sinisa.nasamreza.org2004-01-171-0/+1
|\ \
| * | Two bug fixesSinisa@sinisa.nasamreza.org2004-01-161-1/+2
* | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-01-171-3/+4
|\ \ \ | |/ / |/| |
| * | fixed unlocking tables during subquery execution (BUG#2048)bell@sanja.is.com.ua2003-12-101-3/+4
* | | THD::lex now points to THD::main_lex like in 5.0konstantin@oak.local2003-12-191-13/+13
|/ /
* | Added missing SSL library (Should be in source distribution)monty@mysql.com2003-11-281-28/+27
* | sql_union.cc:igor@rurik.mysql.com2003-11-251-1/+1
* | added collation processing in UNION mergingbell@sanja.is.com.ua2003-11-251-1/+2