summaryrefslogtreecommitdiff
path: root/sql/sql_union.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge jwinstead@production.mysql.com:my/mysql-5.0-11045unknown2005-07-061-1/+3
|\
| * Clean up warnings and build problems on Windows. (Bug #11045)unknown2005-06-181-1/+3
* | manual mergeunknown2005-07-041-2/+2
|\ \
| * | Fixes during review of new codeunknown2005-07-041-2/+2
* | | Name resolution context added (BUG#6443)unknown2005-07-011-0/+9
* | | fixed SP parameter executionunknown2005-06-291-0/+1
|/ /
* | - don't call JOIN::join_free(1) twice for every join in JOIN::cleanup().unknown2005-06-241-21/+29
|/
* renamed:unknown2005-06-151-2/+2
* Patch two (the final one) for Bug#7306 "the server side preparedStatementunknown2005-06-071-1/+1
* Give Item_arena::is_stmt_prepare a more descriptive name (it marks unknown2005-06-031-1/+1
* One more post-review fix.unknown2005-05-301-3/+2
* Preparatory (and the most problematic) patch for Bug#7306unknown2005-05-301-28/+8
* merge 4.1->5.0unknown2005-03-311-6/+6
|\
| * Mergeunknown2005-03-301-6/+6
| |\
| | * fixed union types merging and table related metadata (BUG#8824)unknown2005-03-231-6/+6
* | | Mergeunknown2005-03-281-1/+1
|\ \ \ | |/ /
| * | client/mysqltest.cunknown2005-03-231-1/+1
| |/
* | manual mergeunknown2005-03-031-21/+12
|\ \ | |/
| * a fix for --ps-protocol (bug #6089: FOUND_ROWS returns wrong values when no t...unknown2005-03-021-19/+11
* | Remove compiler warnings and remove not used variablesunknown2005-02-251-1/+1
* | Show all generated warnings in SHOW ERRORunknown2005-02-241-15/+8
* | Merge changesunknown2005-02-041-2/+12
|\ \ | |/
| * A fix: bug#6931: Date Type column problem when using UNION-Tableunknown2005-02-041-2/+12
* | after merge fixesunknown2005-01-181-4/+7
|\ \ | |/
| * fixing wrong value for "examined rows" when UNION's are used.unknown2005-01-181-4/+7
* | First stage of table definition cacheunknown2005-01-061-1/+1
* | Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEYunknown2005-01-031-2/+2
|\ \ | |/
| * Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flagunknown2004-12-311-2/+2
* | Better handling of ensuring that setup_tables() are not called twiceunknown2005-01-031-2/+10
* | Merge with 4.1unknown2004-12-221-0/+2
|\ \ | |/
| * reporting empty result added in case of max/min optimisation of ALL/ANY/SOME ...unknown2004-11-181-0/+2
* | mergeunknown2004-11-121-37/+35
|\ \
| * | post-review fixesunknown2004-11-121-1/+1
| * | errors without code removedunknown2004-10-201-36/+34
* | | After merge fixesunknown2004-11-091-0/+1
* | | Merge with 4.1 to get new thd->mem_root handlingunknown2004-11-081-11/+7
|\ \ \ | | |/ | |/|
| * | Simpler arena swapping codeunknown2004-11-081-7/+7
* | | merge with 4.1unknown2004-10-291-16/+57
|\ \ \ | |/ / | | / | |/ |/|
| * A lot of fixes for prepared statements (PS):unknown2004-10-261-2/+7
| * A fix and test case for Bug#6088 "FOUND_ROWS returns wrong values forunknown2004-10-221-15/+13
| * Followup to fix for bug#6050: fix valgrind warnings.unknown2004-10-221-1/+1
| * A fix and test case for Bug#6050 "EXECUTE stmt reports ambiguous field unknown2004-10-221-3/+21
| * sql_union.cc:unknown2004-10-191-5/+6
| * Bug #6139 UNION doesn't understand collate in the column of second selectunknown2004-10-181-0/+17
| * Merge with 4.0 for 4.1 releaseunknown2004-10-061-0/+5
| |\
| | * Fix for wrongly calculated Examined_rows in 4.0 UNION's.unknown2004-10-051-2/+7
| | * A fix (Bug #4980: union statement with () union () order by produces wrong ex...unknown2004-09-031-0/+4
* | | Strict mode & better warningsunknown2004-09-281-1/+1
* | | post merge fixesunknown2004-09-101-1/+1
* | | After merge fixes of merge with 4.1 that included the new arena code.unknown2004-09-091-2/+3