summaryrefslogtreecommitdiff
path: root/sql/sql_union.cc
Commit message (Expand)AuthorAgeFilesLines
* A fix and a test case for Bug#12736 "Server crash during a select".konstantin@mysql.com2005-10-131-0/+14
* A fix and a test case for Bug#6513 "Test Suite: Values inserted by using konstantin@mysql.com2005-09-221-70/+106
* Rename:konstantin@mysql.com2005-09-021-4/+4
* Fixes during review of new pushed codemonty@mysql.com2005-08-121-2/+3
* Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0sergefp@mysql.com2005-08-071-6/+13
|\
| * Manual mergesergefp@mysql.com2005-08-071-3/+2
| |\
| | * BUG#11869: part2: post-review fixes:sergefp@mysql.com2005-08-071-3/+2
| * | BUG#11869:part 2: post-review fixes: merging into 5.0sergefp@mysql.com2005-08-071-3/+3
| * | Manual mergesergefp@mysql.com2005-08-071-4/+12
| |\ \ | | |/
| | * BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error):sergefp@mysql.com2005-08-061-4/+12
* | | Fix bug #11335 View redefines TinyInt(1) column definitionevgen@moonbone.local2005-07-301-1/+7
|/ /
* | Merge jwinstead@production.mysql.com:my/mysql-5.0-11045jimw@mysql.com2005-07-061-1/+3
|\ \
| * | Clean up warnings and build problems on Windows. (Bug #11045)jimw@mysql.com2005-06-181-1/+3
* | | manual mergemonty@mysql.com2005-07-041-2/+2
|\ \ \
| * | | Fixes during review of new codemonty@mysql.com2005-07-041-2/+2
* | | | Name resolution context added (BUG#6443)bell@sanja.is.com.ua2005-07-011-0/+9
* | | | fixed SP parameter executionbell@sanja.is.com.ua2005-06-291-0/+1
|/ / /
* | | - don't call JOIN::join_free(1) twice for every join in JOIN::cleanup().konstantin@mysql.com2005-06-241-21/+29
|/ /
* | renamed:serg@serg.mylan2005-06-151-2/+2
* | Patch two (the final one) for Bug#7306 "the server side preparedStatementkonstantin@mysql.com2005-06-071-1/+1
* | Give Item_arena::is_stmt_prepare a more descriptive name (it marks konstantin@mysql.com2005-06-031-1/+1
* | One more post-review fix.konstantin@mysql.com2005-05-301-3/+2
* | Preparatory (and the most problematic) patch for Bug#7306konstantin@mysql.com2005-05-301-28/+8
* | merge 4.1->5.0bell@sanja.is.com.ua2005-03-311-6/+6
|\ \ | |/
| * Mergebell@sanja.is.com.ua2005-03-301-6/+6
| |\
| | * fixed union types merging and table related metadata (BUG#8824)bell@sanja.is.com.ua2005-03-231-6/+6
* | | Mergepekka@mysql.com2005-03-281-1/+1
|\ \ \ | |/ /
| * | client/mysqltest.cserg@serg.mylan2005-03-231-1/+1
| |/
* | manual mergeramil@mysql.com2005-03-031-21/+12
|\ \ | |/
| * a fix for --ps-protocol (bug #6089: FOUND_ROWS returns wrong values when no t...ramil@mysql.com2005-03-021-19/+11
* | Remove compiler warnings and remove not used variablesmonty@mysql.com2005-02-251-1/+1
* | Show all generated warnings in SHOW ERRORmonty@mysql.com2005-02-241-15/+8
* | Merge changesjimw@mysql.com2005-02-041-2/+12
|\ \ | |/
| * A fix: bug#6931: Date Type column problem when using UNION-Tablegluh@gluh.mysql.r18.ru2005-02-041-2/+12
* | after merge fixesSinisa@sinisa.nasamreza.org2005-01-181-4/+7
|\ \ | |/
| * fixing wrong value for "examined rows" when UNION's are used.Sinisa@sinisa.nasamreza.org2005-01-181-4/+7
* | First stage of table definition cachemonty@mysql.com2005-01-061-1/+1
* | Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEYmonty@mysql.com2005-01-031-2/+2
|\ \ | |/
| * Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flagmonty@mysql.com2004-12-311-2/+2
* | Better handling of ensuring that setup_tables() are not called twicemonty@mysql.com2005-01-031-2/+10
* | Merge with 4.1monty@mishka.local2004-12-221-0/+2
|\ \ | |/
| * reporting empty result added in case of max/min optimisation of ALL/ANY/SOME ...bell@sanja.is.com.ua2004-11-181-0/+2
* | mergebell@sanja.is.com.ua2004-11-121-37/+35
|\ \
| * | post-review fixesbell@sanja.is.com.ua2004-11-121-1/+1
| * | errors without code removedbell@sanja.is.com.ua2004-10-201-36/+34
* | | After merge fixesmonty@mysql.com2004-11-091-0/+1
* | | Merge with 4.1 to get new thd->mem_root handlingmonty@mysql.com2004-11-081-11/+7
|\ \ \ | | |/ | |/|
| * | Simpler arena swapping codemonty@mysql.com2004-11-081-7/+7
* | | merge with 4.1monty@mysql.com2004-10-291-16/+57
|\ \ \ | |/ / | | / | |/ |/|
| * A lot of fixes for prepared statements (PS):monty@mysql.com2004-10-261-2/+7