summaryrefslogtreecommitdiff
path: root/sql/sql_union.cc
Commit message (Collapse)AuthorAgeFilesLines
* Post-merge fixes.pem@mysql.comhem.se2003-12-011-2/+2
|
* Merge 4.1 to 5.0pem@mysql.com2003-12-011-90/+92
|\
| * Added missing SSL library (Should be in source distribution)monty@mysql.com2003-11-281-28/+27
| | | | | | | | | | | | | | Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler) Added a lot of 'version_xxx' strings to 'show variables' Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris) Fixed problem with printing sub selects to debug log
| * sql_union.cc:igor@rurik.mysql.com2003-11-251-1/+1
| | | | | | | | Fixed a bug: missing semicolon.
| * added collation processing in UNION mergingbell@sanja.is.com.ua2003-11-251-1/+2
| | | | | | | | temporary table BLOB now is longblob
| * Fixed UNION fields type/length detectingbell@sanja.is.com.ua2003-11-231-76/+78
| |
* | Merged, most likely needs post-merge fixsergefp@mysql.com2003-11-211-1/+1
|\ \
| * | logging_ok:sergefp@mysql.com2003-11-201-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Logging to logging@openlogging.org accepted sql_union.cc, sql_select.cc, opt_range.h, opt_range.cc, opt_ft.h: Post-merge fixes Many files: new file
| * | merging in index_merge (in progress, not yet working)psergey@psergey.(none)2003-11-131-2/+3
| |\ \
| | * | Added index_merge access methodpsergey@psergey.(none)2003-11-131-2/+3
| | | |
* | | | Post-merge fixes.pem@mysql.comhem.se2003-11-191-1/+1
| | | |
* | | | Merging 4.1->5.0.pem@mysql.com2003-11-191-11/+11
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merging 4.1->5.0pem@mysql.com2003-10-221-11/+11
| |\ \
| | * \ Merging 4.1 -> 5.0pem@mysql.com2003-09-241-11/+11
| | |\ \
| | | * | Post-merge fixes.pem@mysql.telia.com2003-08-261-1/+1
| | | | |
| | | * | Merge 4.1 into 5.0pem@mysql.com2003-08-261-10/+10
| | | |\ \
| | | | * \ Merge 4.1 into 5.0 (first pass).pem@mysql.telia.com2003-07-081-14/+14
| | | | |\ \
| | | | | * | made lex a pointer in THDvva@eagle.mysql.r18.ru2003-05-051-14/+14
| | | | | | |
* | | | | | | fixed using 'uncachable' tag and RAND_TABLE_BIT settingbell@sanja.is.com.ua2003-11-171-2/+2
| | | | | | |
* | | | | | | fixed problem with UNION flagsbell@sanja.is.com.ua2003-11-041-1/+2
| | | | | | |
* | | | | | | fixed ALL/ANY optimisation with union (BUG#1668)bell@sanja.is.com.ua2003-10-271-1/+6
|/ / / / / / | | | | | | | | | | | | | | | | | | code cleanup
* | | | | | Mergebell@laptop.sanja.is.com.ua2003-10-061-38/+64
|\ \ \ \ \ \ | |/ / / / /
| * | | | | fixed proccesing global LIMIT in last SELECT of UNIONbell@sanja.is.com.ua2003-09-141-10/+22
| | | | | |
| * | | | | Fixes for OPTION_FOUND_ROWS in UNION'sSinisa@sinisa.nasamreza.org2003-09-131-2/+3
| | | | | |
| * | | | | After merge fixes.monty@mashka.mysql.fi2003-09-111-21/+6
| | | | | | | | | | | | | | | | | | | | | | | | Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code)
| * | | | | mergemonty@narttu.mysql.fi2003-09-031-8/+29
| |\ \ \ \ \
| | * \ \ \ \ merge with 4.0.15monty@narttu.mysql.fi2003-08-291-8/+29
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Fixed some varnings from valgrindmonty@narttu.mysql.fi2003-08-201-13/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set min value of max_allowed_packet to 1024 Fixed problem with UNION's without braces and SQL_CALC_FOUND_ROWS, LIMIT #,# and ORDER BY...LIMIT
| * | | | | | Two small fixesSinisa@sinisa.nasamreza.org2003-08-301-2/+2
| | | | | | |
| * | | | | | Fix for a compilation problem with VC++Sinisa@sinisa.nasamreza.org2003-08-301-3/+3
| |/ / / / /
| * | | | | Merge fixesSinisa@sinisa.nasamreza.org2003-08-271-28/+25
| | | | | |
| * | | | | sql_union.cc:Sinisa@sinisa.nasamreza.org2003-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Post merge fixes
| * | | | | merge fixesSinisa@sinisa.nasamreza.org2003-08-271-39/+49
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | union.result:Sinisa@sinisa.nasamreza.org2003-08-231-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | same as above sql_lex.h: same as above sql_union.cc: same as aobve sql_select.cc: Fixing that SQL_CALC_FOUND_ROWS work properly in UNION's in 4.1 Plus updating some fields in THD in the proper places plus fixing a wrong result
* | | | | | fixed bug of lack of fix_fields call (after merge bugfix (SCRUM))bell@laptop.sanja.is.com.ua2003-08-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed bug in Item_sum fixed bug in dependence remover after merge fix
* | | | | | mergebell@laptop.sanja.is.com.ua2003-08-201-26/+43
|\ \ \ \ \ \ | |/ / / / /
| * | | | | quick fix for found row counterbell@laptop.sanja.is.com.ua2003-08-201-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | code cleunup
| * | | | | Mergebell@laptop.sanja.is.com.ua2003-08-201-16/+24
| |\ \ \ \ \ | | |/ / / /
| | * | | | fixing limit and SQL_CALC_FOUND_ROWS issuesSinisa@sinisa.nasamreza.org2003-08-201-16/+24
| | | | | |
| * | | | | after merge changingbell@laptop.sanja.is.com.ua2003-08-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | uninitialized value fixed
| * | | | | mergebell@laptop.sanja.is.com.ua2003-08-191-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | mergemonty@mashka.mysql.fi2003-08-191-2/+3
| | |\ \ \ \
| | * \ \ \ \ Merge with 4.0.14monty@mashka.mysql.fi2003-08-111-2/+2
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Lot's of clean-ups and fixes for 4.0.14.Sinisa@sinisa.nasamreza.org2003-07-021-2/+1
| | | | | | |
| | | * | | | Two Sprint tasks and two behaviour changes.Sinisa@sinisa.nasamreza.org2003-06-171-6/+6
| | | | | | |
| * | | | | | Code cleanupbell@laptop.sanja.is.com.ua2003-08-161-5/+3
| | | | | | |
| * | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2003-08-131-1/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
| | * | | | | fixed problem with reference on derived table fields (BUG#1031)bell@sanja.is.com.ua2003-08-121-1/+1
| | | | | | |
| * | | | | | mergebell@sanja.is.com.ua2003-08-121-1/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | mergebell@sanja.is.com.ua2003-08-091-1/+2
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |