summaryrefslogtreecommitdiff
path: root/sql/sql_update.cc
Commit message (Expand)AuthorAgeFilesLines
* Initial import of WL#3726 "DDL locking for all metadata objects".Konstantin Osipov2009-11-301-2/+2
* Backport of:Konstantin Osipov2009-11-241-2/+2
* Manual merge of mysql-next-mr-runtime upstream.Davi Arnaut2009-11-191-8/+10
|\
| * Backport of Bug#15192 to mysql-next-mrDavi Arnaut2009-11-101-8/+10
* | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-0/+5
|\ \
| * \ Manual merge from mysql-5.1.Alexander Nozdrin2009-11-051-0/+5
| |\ \
| | * \ automergeJon Olav Hauglid2009-10-231-0/+5
| | |\ \
| | | * | Bug #47919 assert in open_table during ALTER temporary tableJon Olav Hauglid2009-10-231-0/+5
* | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-051-3/+3
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Manual merge from mysql-5.1.Alexander Nozdrin2009-11-051-3/+3
| |\ \ \ | | |/ /
| | * | Bug #40877: multi statement execution fails in 5.1.30Georgi Kodinov2009-10-161-3/+3
| | |/
* | | Merge with next-mr-runtime.Konstantin Osipov2009-10-221-1/+1
|\ \ \
| * \ \ AutomergeKristofer Pettersson2009-10-191-1/+1
| |\ \ \
| * | | | Bug#27145 EXTRA_ACL troublesKristofer Pettersson2009-10-191-1/+1
* | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,Konstantin Osipov2009-10-221-1/+0
| |/ / / |/| | |
* | | | Backport of 2617.65.4 from 6.0-codebase.Konstantin Osipov2009-10-161-1/+1
|/ / /
* | | WL#2110 (SIGNAL)Marc Alff2009-09-101-3/+4
|/ /
* | Merge from mysql-5.1-bugteamAlexander Nozdrin2009-08-261-0/+1
|\ \ | |/
| * Bug#46616: MergeMartin Hansson2009-08-201-0/+1
| |\
| | * Bug#46616: Assertion `!table->auto_increment_field_not_null' on Martin Hansson2009-08-201-0/+1
* | | merge of 5.1-main into mysql-trunk.Guilhem Bichot2009-08-121-2/+9
|\ \ \ | |/ /
| * | Merge of the fix for bug #40113 to 5.1.Georgi Kodinov2009-07-131-2/+9
| |\ \ | | |/
| | * Bug #40113: Embedded SELECT inside UPDATE or DELETE can timeout Georgi Kodinov2009-07-131-2/+9
* | | Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:Guilhem Bichot2009-08-041-14/+55
|\ \ \ | |/ /
| * | auto-merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteamAlfranio Correia2009-06-181-4/+2
| |\ \
| | * | BUG#43929 binlog corruption when max_binlog_cache_size is exceededAlfranio Correia2009-06-181-4/+2
| | | |
| | \ \
| *-. \ \ Merge from 5.0-bugteamStaale Smedseng2009-06-171-1/+1
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/
| | | * Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-171-1/+1
| | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-101-1/+1
| | |/
| | * Merge community up to enterprise, thus ending the community-serverChad MILLER2009-05-061-7/+7
| | |\
| | | * Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.Chad MILLER2009-04-141-1/+1
| | | |\
| | | * \ Merged from 5.0 (enterprise).Chad MILLER2008-12-171-3/+60
| | | |\ \
| | | * \ \ Merge from 5.0 trunk.Chad MILLER2008-07-141-1/+7
| | | |\ \ \
| | | * \ \ \ Merge chunk from trunk.Chad MILLER2008-07-101-2/+2
| | | |\ \ \ \
| | | * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.cornsilk.net2007-12-101-7/+7
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.cornsilk.net2007-09-101-7/+7
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releasecmiller@zippy.cornsilk.net2007-07-021-7/+7
| | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releasecmiller@zippy.cornsilk.net2007-04-261-7/+7
| | | | | | |\ \ \ \ \
| | * | | | | | | | | | BUG#37145 Killing a statement doing DDL may log binlog event with error code ...He Zhenxing2009-03-271-1/+1
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | BUG#37051 Replication rules not evaluated correctlyHe Zhenxing2009-03-051-1/+1
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | BUG#41948 Query_log_event constructor needlessly contortedHe Zhenxing2009-05-301-3/+11
| * | | | | | | | | Merge.Martin Hansson2009-05-131-5/+40
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Bug#43580: Issue with Innodb on multi-table updateMartin Hansson2009-05-051-5/+40
| * | | | | | | | | | bug#44166Sergei Golubchik2009-05-041-3/+3
| |/ / / / / / / / /
* | | | | | | | | | Merged Performance Version 0.2.1 with latest 5.1 tree (last push 11 feb 14.01...Mikael Ronstrom2009-02-171-4/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Bug #39265: fix for the bug 33699 should be revertedGleb Shchepa2009-02-051-3/+5
| * | | | | | | | | Merge main 5.1 into 5.1-buildJoerg Bruehe2008-12-101-0/+31
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added "Sun Microsystems, Inc." to copyright headers on files modifiedBuild Team2008-11-101-1/+1
* | | | | | | | | | | Workaround for DTrace-related bugs.Mikael Ronstrom2009-02-101-11/+10
* | | | | | | | | | | DTrace fixes plus fixing a too long file nameMikael Ronstrom2008-12-221-1/+1