Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | initial merge from 5.1-mtr | Bjorn Munch | 2009-09-04 | 1 | -0/+1 |
|\ | |||||
* \ | Manual merge. | Alexey Kopytov | 2009-07-24 | 1 | -0/+13 |
|\ \ | |/ |/| | |||||
| * | Bug #46075: Assertion failed: 0, file .\protocol.cc, line 416 | Alexey Kopytov | 2009-07-24 | 1 | -0/+13 |
* | | Bug#44306: Assertion fail on duplicate key error in | Martin Hansson | 2009-05-04 | 1 | -0/+5 |
* | | Merge sunlight.local:/local_work/27216-bug-5.0-opt-mysql | evgen@sunlight.local | 2007-09-24 | 1 | -0/+12 |
|\ \ | |/ | |||||
| * | Bug#30384: Having SQL_BUFFER_RESULT option in the CREATE .. KEY(..) .. SELECT | evgen@sunlight.local | 2007-09-21 | 1 | -0/+12 |
* | | Merge mysql.com:/home/hf/work/29717/my50-29717 | holyfoot/hf@hfmain.(none) | 2007-07-31 | 1 | -0/+26 |
|\ \ | |/ | |||||
| * | merging | holyfoot/hf@mysql.com/hfmain.(none) | 2007-07-31 | 1 | -0/+26 |
* | | Merge gleb.loc:/home/uchum/work/bk/5.0-opt | gshchepa/uchum@gleb.loc | 2007-06-24 | 1 | -0/+31 |
|\ \ | |/ | |||||
| * | Fixed bug #29095. | gshchepa/uchum@gleb.loc | 2007-06-24 | 1 | -0/+31 |
| * | backport of Bug#11491 Misleading error message if not NULL column set to NULL... | gluh@mysql.com/eagle.(none) | 2007-05-30 | 1 | -2/+2 |
* | | Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt | holyfoot/hf@hfmain.(none) | 2007-03-22 | 1 | -0/+29 |
|\ \ | |/ | |||||
| * | Bug #26207: When making the key image to use | gkodinov/kgeorge@magare.gmz | 2007-03-22 | 1 | -0/+29 |
* | | after merge fix | gluh@mysql.com/eagle.(none) | 2007-02-26 | 1 | -14/+0 |
* | | Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt | gluh@eagle.(none) | 2007-02-26 | 1 | -0/+27 |
|\ \ | |/ | |||||
| * | Bug#16630: The update fields of the INSERT .. SELECT .. ON DUPLICATE KEY | evgen@moonbone.local | 2007-02-16 | 1 | -0/+13 |
* | | Post-merge fix. | igor@olga.mysql.com | 2007-02-13 | 1 | -14/+0 |
* | | Merge olga.mysql.com:/home/igor/mysql-5.0-opt | igor@olga.mysql.com | 2007-02-13 | 1 | -0/+26 |
|\ \ | |/ | |||||
| * | Bug#23170: LAST_INSERT_ID isn't reset to 0 in INSERT .. SELECT when no rows were | evgen@moonbone.local | 2007-02-09 | 1 | -0/+14 |
| * | Bug#19978: INSERT .. ON DUPLICATE erroneously reports some records were | evgen@moonbone.local | 2007-02-07 | 1 | -0/+12 |
* | | Merge mysql.com:/home/hf/work/embt/my50-embt | holyfoot/hf@deer.(none) | 2006-11-13 | 1 | -100/+0 |
|\ \ | |/ | |||||
| * | several fixes to make tests pass in embedded-server mode | holyfoot/hf@mysql.com/deer.(none) | 2006-11-13 | 1 | -100/+0 |
* | | Merge lamia.home:/home/timka/mysql/src/5.0-bug-21774-sm | timour/timka@lamia.home | 2006-09-13 | 1 | -0/+10 |
|\ \ | |/ | |||||
| * | Fix for BUG#21774: Column count doesn't match value count at row x | timour/timka@lamia.home | 2006-09-12 | 1 | -0/+10 |
| * | Merge xiphis.org:/home/antony/work2/mysql-5.0-engines | acurtis/antony@xiphis.org/ltantony.xiphis.org | 2006-08-14 | 1 | -2/+2 |
| |\ | |||||
| | * | BUG#14770 - LOAD DATA INFILE doesn't respect default values for | svoj@may.pils.ru | 2006-08-02 | 1 | -2/+2 |
* | | | Merge maint1.mysql.com:/data/localhome/tsmith/bk/mrg50-b | tsmith@maint1.mysql.com | 2006-08-03 | 1 | -0/+100 |
|\ \ \ | |/ / | |||||
| * | | Bug#20989: View '(null).(null)' references invalid table(s)... on SQL SECURIT... | tnurnberg@salvation.intern.azundris.com | 2006-07-19 | 1 | -0/+100 |
| |/ | |||||
* | | Manual merge | evgen@moonbone.local | 2006-06-28 | 1 | -0/+5 |
|\ \ | |/ | |||||
| * | merge of the changes for bug #18080 | gkodinov@mysql.com | 2006-06-21 | 1 | -0/+5 |
| |\ | |||||
| | * | Bug #18080: INSERT ... SELECT ... JOIN results in ambiguous field list error | gkodinov@mysql.com | 2006-06-19 | 1 | -0/+5 |
| * | | Merge mysql.com:/home/kgeorge/mysql/4.1/B9676 | gkodinov@mysql.com | 2006-06-19 | 1 | -0/+4 |
| |\ \ | | |/ | |/| | |||||
* | | | Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge | elliot@mysql.com | 2006-06-25 | 1 | -0/+4 |
|\ \ \ | |||||
| * \ \ | Manually merged | evgen@moonbone.local | 2006-06-20 | 1 | -0/+4 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | * Bug #9676: INSERT INTO x SELECT .. FROM x LIMIT 1; slows down with big | gkodinov@mysql.com | 2006-06-19 | 1 | -0/+4 |
* | | | WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX | ingo@mysql.com | 2006-01-23 | 1 | -2/+2 |
* | | | Fix for bug#11491 Misleading error message if not NULL column set to NULL, | gluh@eagle.intranet.mysql.r18.ru | 2005-12-01 | 1 | -2/+2 |
|/ / | |||||
* | | Merge 4.1 - 5.0 | jani@ua141d10.elisa.omakaista.fi | 2005-10-28 | 1 | -1/+11 |
* | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 | jani@ua141d10.elisa.omakaista.fi | 2005-10-27 | 1 | -0/+8 |
|\ \ | |/ | |||||
| * | Fix bug#13392 Wrong VALUES() behaviour in INSERT SELECT with ON DUPLICATE | evgen@moonbone.local | 2005-10-25 | 1 | -0/+8 |
| * | insert_select.result, insert_select.test: | evgen@moonbone.local | 2005-09-10 | 1 | -0/+10 |
* | | Implementation of WL#2486 - | timour@mysql.com | 2005-08-12 | 1 | -2/+2 |
* | | Merge with 4.1 | monty@mysql.com | 2005-07-03 | 1 | -4/+23 |
|\ \ | |/ | |||||
| * | Better bug fix for: | monty@mishka.local | 2005-06-27 | 1 | -4/+23 |
* | | Bug #9728 fix merge | evgen@moonbone.local | 2005-06-23 | 1 | -0/+15 |
|\ \ | |/ | |||||
| * | Fix bug #9728 decreased functionality in "on duplicate key update" | evgen@moonbone.local | 2005-06-22 | 1 | -0/+15 |
* | | Fix for bug #10886 merge | evgen@moonbone.local | 2005-06-22 | 1 | -0/+9 |
|\ \ | |/ | |||||
| * | Fix bug #10886 - INSERT ... SELECT ... ON DUPLICATE KEY UPDATE produces bad r... | evgen@moonbone.local | 2005-06-21 | 1 | -0/+9 |
* | | Merge embedded server testing changes from 4.1. | jimw@mysql.com | 2005-04-01 | 1 | -25/+0 |
|\ \ | |/ | |||||
| * | Remove result.es files and support for them, which requires splitting | jimw@mysql.com | 2005-03-30 | 1 | -25/+0 |