summaryrefslogtreecommitdiff
path: root/mysql-test/r/union.result
Commit message (Collapse)AuthorAgeFilesLines
* Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-08-031-8/+23
|\ | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
| * Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optevgen@moonbone.local2006-07-221-8/+23
| |\ | | | | | | | | | into moonbone.local:/work/autopush/12185-bug-5.0-opt-mysql
| | * Fixed bug#12185: Data type aggregation may produce wrong resultevgen@moonbone.local2006-07-221-8/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Item::tmp_table_field_from_field_type() function creates Field_datetime object instead of Field_timestamp object for timestamp field thus always changing data type is a tmp table is used. The Field_blob object constructor which is used in the Item::tmp_table_field_from_field_type() is always setting packlength field of newly created blob to 4. This leads to changing fields data type for example from the blob to the longblob if a temporary table is used. The Item::make_string_field() function always converts Field_string objects to Field_varstring objects. This leads to changing data type from the char/binary to varchar/varbinary. Added appropriate Field_timestamp object constructor for using in the Item::tmp_table_field_from_field_type() function. Added Field_blob object constructor which sets pack length according to max_length argument. The Item::tmp_table_field_from_field_type() function now creates Field_timestamp object for a timestamp field. The Item_type_holder::display_length() now returns correct NULL length NULL length. The Item::make_string_field() function now doesn't change Field_string to Field_varstring in the case of Item_type_holder. The Item::tmp_table_field_from_field_type() function now uses the Field_blob constructor which sets packlength according to max_length.
* | | Bug #16881: password() and union selectjimw@rama.(none)2006-07-211-0/+5
|/ / | | | | | | | | | | | | This was only demonstrated by the use of PASSWORD(), it was not related to that function at all. The calculation of the size of a field in the results of a UNION did not take into account the possible growth of a string field when being converted to the aggregated character set.
* | Fixed bug#18175: The nest_level counter wasn't decremented for union parts whichevgen@moonbone.local2006-06-151-0/+45
|/ | | | | | | | | | | | | resulted in a wrong error message. The nest_level counter indicates the depth of nesting for a subselect. It is needed to properly resolve aggregate functions in nested subselects. Obviously it shouldn't be incremented for UNION parts because they have the same level of nesting. This counter was incremented by 1 in the mysql_new_select() function for any new select and wasn't decremented for UNION parts. This resulted in wrongly reported error messages. Now the nest_level counter is decremented by 1 for any union part.
* Merge mysql.com:/usr/home/bar/mysql-4.1.b15949bar@mysql.com2006-03-061-1/+11
|\ | | | | | | into mysql.com:/usr/home/bar/mysql-5.0
| * Bug#15949 union + illegal mix of collations (IMPLICIT + COERCIBLE)bar@mysql.com2006-03-011-1/+11
| | | | | | | | | | | | | | | | | | | | | | union.result, union.test: Adding test case. item.cc: Allow safe character set conversion in UNION - string constant to column's charset - to unicode Thus, UNION now works the same with CONCAT (and other string functions) in respect of aggregating arguments with different character sets.
* | Fix union.resultjimw@mysql.com2005-11-301-26/+26
| |
* | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-11-291-0/+26
|\ \ | |/ | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * Fix bug in handling of decimal fields in UNION statements that couldjimw@mysql.com2005-10-281-0/+26
| | | | | | | | cause a crash or write to an incorrect memory location. (Bug #14216)
| * additional fix for bug #13372 (decimal union)hf@deer.(none)2005-09-271-1/+1
| |
| * a fix (bug #7589: Decimal types are ignored when updating data from another ↵ramil@mysql.com2005-09-211-15/+0
| | | | | | | | column).
* | Merge from 4.1 to 5.0msvensson@neptunus.(none)2005-09-231-15/+0
| |
* | Implementation of WL#2486 -timour@mysql.com2005-08-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Process NATURAL and USING joins according to SQL:2003". * Some of the main problems fixed by the patch: - in "select *" queries the * expanded correctly according to ANSI for arbitrary natural/using joins - natural/using joins are correctly transformed into JOIN ... ON for any number/nesting of the joins. - column references are correctly resolved against natural joins of any nesting and combined with arbitrary other joins. * This patch also contains a fix for name resolution of items inside the ON condition of JOIN ... ON - in this case items must be resolved only against the JOIN operands. To support such 'local' name resolution, the patch introduces a stack of name resolution contexts used at parse time. NOTICE: - This patch is not complete in the sense that - there are 2 test cases that still do not pass - one in join.test, one in select.test. Both are marked with a comment "TODO: WL#2486". - it does not include a new test specific for the task
* | mergedserg@serg.mylan2005-05-281-0/+14
|\ \ | |/
| * mergebell@sanja.is.com.ua2005-05-261-0/+14
| |\
| | * fixed problem with long string results of expressions in UNIONS (BUG#10025)bell@sanja.is.com.ua2005-05-261-0/+14
| | |
* | | Fix broken test case (after merge)monty@mysql.com2005-05-261-5/+5
| | |
* | | Manual merge.joerg@mysql.com2005-05-261-5/+24
|\ \ \ | |/ /
| * | union.result:Sinisa@sinisa.nasamreza.org2005-04-261-0/+19
| |/ | | | | | | | | | | | | | | Results for the above test case union.test: A test case for bug #10032 involving UNION's and ORDER BY clause sql_yacc.yy: Fix for a bug #10032 involving a parser bug with UNION's and ORDER BY
* | Tests and results fixed with last precision/decimal related modificationsholyfoot@hf-ibm.(none)2005-05-061-2/+2
| |
* | mergebar@mysql.com2005-04-111-1/+1
|\ \ | |/
| * ctype_collate.result, ctype_collate.test, union.result, union.test:bar@mysql.com2005-04-101-1/+1
| | | | | | | | | | | | | | | | fixing tests accordingly item.cc: Allow mixing non-binary collation and binary collation even if coercibility is the same. For easier 4.0 -> 4.1 migrating.
* | Don't use -lsupc++ with gcc 3.3 and below as this gives linking problems ↵monty@mysql.com2005-04-041-0/+17
| | | | | | | | | | | | | | when linking staticly Fix that mysql.proc works with new VARCHAR fields Give warnings for wrong zero dates
* | postmerge 4.1->5.0 fixesbell@sanja.is.com.ua2005-04-011-2/+2
| |
* | merge 4.1->5.0bell@sanja.is.com.ua2005-03-311-3/+38
|\ \ | |/
| * Mergebell@sanja.is.com.ua2005-03-301-11/+46
| |\
| | * fixed union types merging and table related metadata (BUG#8824)bell@sanja.is.com.ua2005-03-231-11/+46
| | |
* | | Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1bar@eagle.intranet.mysql.r18.ru2005-03-281-0/+5
|\ \ \ | |/ / | | | | | | into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0
| * | union.test:bar@mysql.com2005-03-281-0/+5
| |/ | | | | | | | | Bug #6519 UNION with collation binary and latin1_swedish_ci fails now Prove that this problem was fixed with bug9425 fix too.
* | Merge with 4.1monty@mysql.com2005-02-151-0/+22
|\ \ | |/
| * Bug#2435acurtis@pcgem.rdg.cyberkinetica.com2005-02-131-0/+22
| | | | | | | | | | Alter handling for UNION syntax Tests for UNION and parentheses
* | Precision Math implementationhf@deer.(none)2005-02-091-3/+3
| |
* | Merge changesjimw@mysql.com2005-02-041-0/+36
|\ \ | |/
| * A fix: bug#6931: Date Type column problem when using UNION-Tablegluh@gluh.mysql.r18.ru2005-02-041-0/+36
| | | | | | | | bug#7833: Wrong datatype of aggregate column is returned
* | after merge fixesSinisa@sinisa.nasamreza.org2005-01-181-0/+16
|\ \ | |/
| * fixing wrong value for "examined rows" when UNION's are used.Sinisa@sinisa.nasamreza.org2005-01-181-0/+16
| |
| * 1. Item now uses my_charset_bin by default,bar@mysql.com2005-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not default_charset_into. It fixes the problem that in some cases numbers where treated as CHAR(N), not as BINARY(N), e.g. wrong 'charsetnr' when sent to the client side. 2. IFNULL didn't aggregate argument charsets and collations, so IFNULL(1,'a') produced a CHAR(N). Now produces a BINARY(N). 3. SELECT PROCEDURE ANALIZE now returns BINARY columns, which is much better than it worked previously: CHAR with the default character set. But in the future it's worth to fix the fields 'Field_name' and 'Optimal_fieldtype' to use UTF8, and 'Min_value' and 'Max_value' to inherit their charsets from the original items. But it is not important, and BINARY(N) is OK for now. 4. Tests were fixed accordingly. No new tests were made, as the old onces cover everything.
* | After-merge clean-upbar@mysql.com2005-01-181-1/+1
| |
* | wl#1629 SHOW with WHERE(final part, after review)gluh@gluh.mysql.r18.ru2004-12-301-4/+4
| | | | | | | | | | added syntax: 'show variables where', 'show status where', 'show open tables where'
* | - VARCHAR(n) with binary character set is now displayed as VARBINARY(N).bar@mysql.com2004-12-081-5/+5
| | | | | | | | | | - CREATE TABLE t1 SELECT BINARY 'literal' now creates a VARBINARY() column, not a BINARY().
* | Update results for new varchar handlingmonty@mysql.com2004-12-071-10/+10
| | | | | | | | | | Fixed compiler warnings String results in CREATE ... SELECT are now created as CHAR(0), VARCHAR(X) or TEXT() depending on item->max_length
* | mergedserg@serg.mylan2004-11-201-0/+10
|\ \ | |/
| * Check that the third UNION part with COLLATEbar@mysql.com2004-11-181-0/+10
| | | | | | | | | | clause resolves collation conflict for the first and the second parts pair.
* | merge with 4.1monty@mysql.com2004-10-291-0/+115
|\ \ | |/
| * Bug #6139 UNION doesn't understand collate in the column of second selectbar@mysql.com2004-10-181-0/+78
| |
| * Do not try use fields examples is expression and fiend used or SET/ENUM ↵bell@sanja.is.com.ua2004-09-171-0/+37
| | | | | | | | field used in types merging procedure (BUG#5618)
* | Merge with 4.1monty@mysql.com2004-09-061-0/+8
|\ \ | |/ | | | | | | (Includes merge of arena code in 4.1 and 5.0)
| * After merge fixesmonty@mysql.com2004-09-051-4/+4
| |
| * Merge with 4.0 to get latest bug fixesmonty@mysql.com2004-09-041-0/+8
| |\
View Lorry Controller Status