summaryrefslogtreecommitdiff
path: root/mysql-test/t/union.test
Commit message (Expand)AuthorAgeFilesLines
* Automerge.Alexey Kopytov2009-03-271-0/+15
|\
| * Manual merge.Alexey Kopytov2009-03-271-0/+15
| |\
| | * Fix for bug #43432: Union on floats does unnecessary rounding Alexey Kopytov2009-03-271-0/+15
* | | Bug#43329 Prepared for push on 5.1Bernt M. Johnsen2009-03-191-10/+33
|\ \ \ | |/ / |/| |
| * | Bug#43329 prepared for commit on 5.0Bernt M. Johnsen2009-03-181-10/+33
| |/
| * Merge mhansson@bk-internal:/home/bk/mysql-5.0-optmhansson/martin@linux-st28.site2007-12-191-0/+22
| |\
* | | A fix for Bug#22891 "session level max_allowed_packet can beStaale Smedseng2008-11-201-3/+7
* | | Bug #32858: Erro: "Incorrect usage of UNION and INTO" does not take gkodinov/kgeorge@magare.gmz2008-05-131-0/+59
* | | Merge mhansson@bk-internal:/home/bk/mysql-5.1-optmhansson/martin@linux-st28.site2007-12-211-0/+22
|\ \ \
| * \ \ Merge linux-st28.site:/home/martin/mysql/src/bug32848/my50-bug32848-gcamhansson/martin@linux-st28.site2007-12-201-0/+24
| |\ \ \ | | | |/ | | |/|
| | * | Bug#32848: Data type conversion bug in union subselects in MySQL 5.0.38mhansson/martin@linux-st28.site2007-12-111-0/+24
* | | | Merge magare.gmz:/home/kgeorge/mysql/autopush/B19390-5.0-optgkodinov/kgeorge@magare.gmz2007-12-181-0/+44
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merge mhansson@bk-internal:/home/bk/mysql-5.0-optmhansson/martin@linux-st28.site2007-12-151-0/+57
| |\ \
| | * | Bug #32858: Erro: "Incorrect usage of UNION and INTO" does not take mhansson/martin@linux-st28.site2007-12-131-0/+59
| | |/
| * | Fixed bug #27848.igor@olga.mysql.com2007-12-141-0/+44
| |/
* | Merge mysql.com:/home/hf/work/mrg/mysql-5.0-optholyfoot/hf@hfmain.(none)2007-03-221-0/+9
|\ \ | |/
| * Bug#23345: Wrongly allowed INTO in a non-last select of a UNION.evgen@moonbone.local2007-03-211-0/+9
* | Merge mysql.com:/home/hf/work/mrg/mysql-5.0-optholyfoot/hf@hfmain.(none)2007-03-091-0/+13
|\ \ | |/
| * Fixed bug #26661: crash when order by clause in a unionigor@olga.mysql.com2007-03-091-0/+13
* | Added more tests of field conversions.jani@a88-112-41-254.elisa-laajakaista.fi2006-09-261-0/+15
* | Fix for bug#20208jani@a88-112-41-254.elisa-laajakaista.fi2006-09-261-0/+30
|/
* Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-08-031-2/+10
|\
| * Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optevgen@moonbone.local2006-07-221-2/+10
| |\
| | * Fixed bug#12185: Data type aggregation may produce wrong resultevgen@moonbone.local2006-07-221-2/+10
* | | Bug #16881: password() and union selectjimw@rama.(none)2006-07-211-0/+7
|/ /
* | Fixed bug#18175: The nest_level counter wasn't decremented for union parts whichevgen@moonbone.local2006-06-151-0/+48
|/
* Merge mysql.com:/usr/home/bar/mysql-4.1.b15949bar@mysql.com2006-03-061-1/+10
|\
| * Bug#15949 union + illegal mix of collations (IMPLICIT + COERCIBLE)bar@mysql.com2006-03-011-1/+10
* | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2005-12-121-21/+0
|\ \
| * | WL#2930 Adding view and cursor 'protocols' to mysqltestmsvensson@neptunus.(none)2005-10-311-21/+0
* | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-11-291-0/+18
|\ \ \ | |/ / |/| / | |/
| * Fix bug in handling of decimal fields in UNION statements that couldjimw@mysql.com2005-10-281-0/+18
* | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2005-09-231-8/+0
|\ \ | |/
| * a fix (bug #7589: Decimal types are ignored when updating data from another c...ramil@mysql.com2005-09-211-8/+0
* | Implementation of WL#2486 -timour@mysql.com2005-08-121-1/+1
* | Merge mysql.com:/home/my/mysql-4.1monty@mysql.com2005-07-281-0/+2
|\ \ | |/
| * Added end marker for tests to make future merges easiermonty@mysql.com2005-07-281-0/+2
* | mergedserg@serg.mylan2005-05-281-0/+10
|\ \ | |/
| * mergebell@sanja.is.com.ua2005-05-261-0/+10
| |\
| | * fixed problem with long string results of expressions in UNIONS (BUG#10025)bell@sanja.is.com.ua2005-05-261-0/+11
* | | Fix broken test case (after merge)monty@mysql.com2005-05-261-2/+2
* | | Manual merge.joerg@mysql.com2005-05-261-2/+13
|\ \ \ | |/ /
| * | union.result:Sinisa@sinisa.nasamreza.org2005-04-261-0/+11
| |/
* | mergebar@mysql.com2005-04-111-1/+1
|\ \ | |/
| * ctype_collate.result, ctype_collate.test, union.result, union.test:bar@mysql.com2005-04-101-1/+1
* | Don't use -lsupc++ with gcc 3.3 and below as this gives linking problems when...monty@mysql.com2005-04-041-0/+12
* | merge 4.1->5.0bell@sanja.is.com.ua2005-03-311-0/+25
|\ \ | |/
| * Mergebell@sanja.is.com.ua2005-03-301-0/+25
| |\
| | * fixed union types merging and table related metadata (BUG#8824)bell@sanja.is.com.ua2005-03-231-0/+25
* | | Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1bar@eagle.intranet.mysql.r18.ru2005-03-281-0/+6
|\ \ \ | |/ /