summaryrefslogtreecommitdiff
path: root/sql/sql_update.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge polly.local:/home/kaa/src/maint/bug22364/my51-bug22364kaa@polly.local2007-04-271-9/+9
|\
| * Merge polly.local:/home/kaa/src/maint/bug22364/my50-bug22364kaa@polly.local2007-04-271-9/+9
| |\
| | * Fix for bug #22364 "Inconsistent "matched rows" when executing UPDATE"kaa@polly.local2007-04-231-10/+9
* | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@ua141d10.elisa.omakaista.fi2007-04-101-28/+28
|\ \ \
| * | | Manual merge from 5.0jani@ua141d10.elisa.omakaista.fi2007-03-291-1/+1
| * | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marveljani@ua141d10.elisa.omakaista.fi2007-03-291-27/+27
| |\ \ \ | | |/ / | |/| |
| | * | Bug #27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF()aelkin/elkin@andrepl.(none)2007-03-231-24/+24
| | |/
| | * Merge bk@192.168.21.1:mysql-5.0holyfoot/hf@mysql.com/hfmain.(none)2007-03-081-3/+3
| | |\
| | * \ Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimemalff/marcsql@weblab.(none)2007-03-061-1/+1
| | |\ \
* | | \ \ Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndbJustin.He/justin.he@dev3-240.dev.cn.tlan2007-04-051-2/+4
|\ \ \ \ \
| * \ \ \ \ Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndbJustin.He/justin.he@dev3-240.dev.cn.tlan2007-04-051-2/+4
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Bug#27127, Incorrect behaviour of timestamp column with DEFAULT CURRENT_TIMES...Justin.He/justin.he@dev3-240.dev.cn.tlan2007-03-221-2/+4
* | | | | | Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1mskold/marty@linux.site2007-04-041-1/+25
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge from 5.0mskold/marty@mysql.com/linux.site2007-04-041-12/+9
| * | | | | Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0mskold/marty@linux.site2007-04-041-1/+28
| |\ \ \ \ \
| | * | | | | Bug #26242 UPDATE with subquery and triggers failing with cluster tablesmskold/marty@mysql.com/linux.site2007-04-041-0/+26
* | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-optgkodinov/kgeorge@magare.gmz2007-03-091-8/+8
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | WL#3527: Extend IGNORE INDEX so places where index is ignored gkodinov/kgeorge@macbook.gmz2007-03-051-8/+8
* | | | | | | Merge bk@192.168.21.1:mysql-5.1holyfoot/hf@hfmain.(none)2007-03-081-3/+3
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge mysql.com:/home/hf/work/mrg/mysql-5.0-optholyfoot/hf@hfmain.(none)2007-03-081-3/+3
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optevgen@moonbone.local2007-03-021-3/+3
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | Bug#25122: Views based on a self-joined table aren't insertable.evgen@moonbone.local2007-03-021-3/+3
| | * | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.0gluh@mysql.com/eagle.(none)2007-02-261-0/+5
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-02-211-1/+0
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
* | | | | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-8407_bmalff/marcsql@weblab.(none)2007-03-061-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Bug#8407 (Stored functions/triggers ignore exception handler)malff/marcsql@weblab.(none)2007-03-051-1/+1
* | | | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.0-optgluh@eagle.(none)2007-02-261-0/+5
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Bug#23800: Outer fields in correlated subqueries is used in a temporary tableevgen@moonbone.local2007-02-211-0/+5
| | |/ / / / / | |/| | | | |
* | | | | | | Post-merge fix.igor@olga.mysql.com2007-02-131-1/+1
* | | | | | | Merge olga.mysql.com:/home/igor/mysql-5.0-optigor@olga.mysql.com2007-02-131-1/+10
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | |
| * | | | | Fixed bug #25931.igor@olga.mysql.com2007-02-071-0/+9
| * | | | | Bug#19978: INSERT .. ON DUPLICATE erroneously reports some records wereevgen@moonbone.local2007-02-071-1/+1
| * | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.0-optgluh@mysql.com/eagle.(none)2007-01-261-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0istruewing@chilla.local2007-01-031-1/+1
| |\ \ \ \ \
* | \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1monty@narttu.mysql.fi2007-01-291-1/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2007-01-271-1/+0
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-01-221-1/+0
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Fixed compiler warnings detected by option -Wshadow and -Wunused:monty@mysql.com/narttu.mysql.fi2006-12-151-1/+0
* | | | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.1-optgluh@eagle.(none)2007-01-261-1/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge macbook.gmz:/Users/kgeorge/mysql/work/mysql-5.0-optgkodinov/kgeorge@macbook.gmz2007-01-231-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | / / / | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Bug#25172: Not checked buffer size leads to a server crash.evgen@moonbone.local2007-01-191-1/+1
| | |/ / / / /
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1istruewing@chilla.local2007-01-031-74/+61
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.0-enginessvoj@june.mysql.com2006-12-291-74/+61
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-enginessvoj@mysql.com/june.mysql.com2006-12-291-2/+1
| | |\ \ \ \ \
| | * | | | | | After merge fix.svoj@mysql.com/april.(none)2006-12-271-3/+5
| | * | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-4.1-enginessvoj@mysql.com/april.(none)2006-12-201-76/+62
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-enginessvoj@mysql.com/april.(none)2006-12-201-72/+59
| | | |\ \ \ \ \
| | | | * | | | | BUG#21310 - Trees in SQL causing a "crashed" table with MyISAM storage enginesvoj@mysql.com/april.(none)2006-12-201-72/+59
| | | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1kostja@bodhi.local2006-11-021-2/+2
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_ID.kroki/tomash@moonlight.intranet2006-10-061-2/+2