summaryrefslogtreecommitdiff
path: root/mysql-test/r/insert_select.result
Commit message (Expand)AuthorAgeFilesLines
* Post-merge fix.igor@olga.mysql.com2007-02-131-14/+0
* Merge olga.mysql.com:/home/igor/mysql-5.0-optigor@olga.mysql.com2007-02-131-0/+26
|\
| * Bug#23170: LAST_INSERT_ID isn't reset to 0 in INSERT .. SELECT when no rows wereevgen@moonbone.local2007-02-091-0/+14
| * Bug#19978: INSERT .. ON DUPLICATE erroneously reports some records wereevgen@moonbone.local2007-02-071-0/+12
* | Merge mysql.com:/home/hf/work/embt/my50-embtholyfoot/hf@deer.(none)2006-11-131-100/+0
|\ \ | |/
| * several fixes to make tests pass in embedded-server modeholyfoot/hf@mysql.com/deer.(none)2006-11-131-100/+0
* | Merge lamia.home:/home/timka/mysql/src/5.0-bug-21774-smtimour/timka@lamia.home2006-09-131-0/+10
|\ \ | |/
| * Fix for BUG#21774: Column count doesn't match value count at row xtimour/timka@lamia.home2006-09-121-0/+10
| * Merge xiphis.org:/home/antony/work2/mysql-5.0-enginesacurtis/antony@xiphis.org/ltantony.xiphis.org2006-08-141-2/+2
| |\
| | * BUG#14770 - LOAD DATA INFILE doesn't respect default values forsvoj@may.pils.ru2006-08-021-2/+2
* | | Merge maint1.mysql.com:/data/localhome/tsmith/bk/mrg50-btsmith@maint1.mysql.com2006-08-031-0/+100
|\ \ \ | |/ /
| * | Bug#20989: View '(null).(null)' references invalid table(s)... on SQL SECURIT...tnurnberg@salvation.intern.azundris.com2006-07-191-0/+100
| |/
* | Manual mergeevgen@moonbone.local2006-06-281-0/+5
|\ \ | |/
| * merge of the changes for bug #18080gkodinov@mysql.com2006-06-211-0/+5
| |\
| | * Bug #18080: INSERT ... SELECT ... JOIN results in ambiguous field list errorgkodinov@mysql.com2006-06-191-0/+5
| * | Merge mysql.com:/home/kgeorge/mysql/4.1/B9676gkodinov@mysql.com2006-06-191-0/+4
| |\ \ | | |/ | |/|
* | | Merge mysql.com:/home/emurphy/src/bk-clean/tmp_mergeelliot@mysql.com2006-06-251-0/+4
|\ \ \
| * \ \ Manually mergedevgen@moonbone.local2006-06-201-0/+4
| |\ \ \ | | |/ / | |/| / | | |/
| | * * Bug #9676: INSERT INTO x SELECT .. FROM x LIMIT 1; slows down with biggkodinov@mysql.com2006-06-191-0/+4
* | | WL#1563 - Modify MySQL to support fast CREATE/DROP INDEXingo@mysql.com2006-01-231-2/+2
* | | Fix for bug#11491 Misleading error message if not NULL column set to NULL,gluh@eagle.intranet.mysql.r18.ru2005-12-011-2/+2
|/ /
* | Merge 4.1 - 5.0jani@ua141d10.elisa.omakaista.fi2005-10-281-1/+11
* | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1jani@ua141d10.elisa.omakaista.fi2005-10-271-0/+8
|\ \ | |/
| * Fix bug#13392 Wrong VALUES() behaviour in INSERT SELECT with ON DUPLICATEevgen@moonbone.local2005-10-251-0/+8
| * insert_select.result, insert_select.test:evgen@moonbone.local2005-09-101-0/+10
* | Implementation of WL#2486 -timour@mysql.com2005-08-121-2/+2
* | Merge with 4.1monty@mysql.com2005-07-031-4/+23
|\ \ | |/
| * Better bug fix for:monty@mishka.local2005-06-271-4/+23
* | Bug #9728 fix mergeevgen@moonbone.local2005-06-231-0/+15
|\ \ | |/
| * Fix bug #9728 decreased functionality in "on duplicate key update"evgen@moonbone.local2005-06-221-0/+15
* | Fix for bug #10886 mergeevgen@moonbone.local2005-06-221-0/+9
|\ \ | |/
| * Fix bug #10886 - INSERT ... SELECT ... ON DUPLICATE KEY UPDATE produces bad r...evgen@moonbone.local2005-06-211-0/+9
* | Merge embedded server testing changes from 4.1.jimw@mysql.com2005-04-011-25/+0
|\ \ | |/
| * Remove result.es files and support for them, which requires splittingjimw@mysql.com2005-03-301-25/+0
| * BUG#6034 - Error code 124: Wrong medium type.ingo@mysql.com2005-01-191-0/+12
* | WL#874 "Extended LOAD DATA". dlenev@brandersnatch.localdomain2005-03-161-3/+3
* | after merge fixesserg@serg.mylan2005-02-161-1/+13
* | XA (not completely polished out yet)serg@serg.mylan2005-01-161-3/+3
* | After merge fixesmonty@mysql.com2004-12-061-2/+2
* | Merge with 4.1monty@mysql.com2004-12-061-0/+9
|\ \ | |/
| * Manual fixes to merge of fix for Bug #6682 to 4.1.jimw@mysql.com2004-12-031-2/+2
| * Mergejimw@mysql.com2004-12-031-0/+9
| |\
| | * Prevent adding 'CREATE TABLE .. SELECT' query to the binary log when thejimw@mysql.com2004-12-031-0/+9
* | | More fixes for strict mode:monty@mishka.local2004-10-021-2/+2
* | | Merge with 4.1.3-betamonty@mysql.com2004-07-071-2/+2
|\ \ \ | |/ /
| * | Language/consistency edits to error messagespaul@ice.snake.net2004-06-151-2/+2
* | | Merge 4.1 -> 5.0.pem@mysql.com2004-04-071-0/+34
|\ \ \ | |/ /
| * | After merge fixesmonty@mysql.com2004-02-161-0/+3
| * | Merge with 4.0.18monty@mysql.com2004-02-111-0/+31
| |\ \ | | |/
| | * 3.23 -> 4.0 merge: after merge fixeskonstantin@mysql.com2004-02-061-0/+19