summaryrefslogtreecommitdiff
path: root/sql/sql_update.cc
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-311-0/+1
|\
| * Manual merge from mysql-5.1-bugteam.Alexander Nozdrin2010-01-301-3/+4
| |\
| | * Backport Bug#37148 to 5.1He Zhenxing2010-01-241-3/+4
* | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-191-1/+5
|\ \ \ | |/ /
| * | Manual merge from mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-151-1/+5
| |\ \ | | |/
| | * Bug#48157: crash in Item_field::used_tablesMartin Hansson2010-01-121-1/+5
* | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-131-4/+5
|\ \ \
| * | | WL#2360 Performance schemaMarc Alff2010-01-061-4/+5
* | | | Manual merge from next-mr.unknown2010-01-121-9/+10
|\ \ \ \ | |/ / /
| * | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-9/+10
* | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-30/+19
|\ \ \ \ | |/ / / |/| | |
| * | | mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...Andrei Elkin2009-11-301-3/+8
| |\ \ \
| * | | | WL#2687 WL#5072 BUG#40278 BUG#47175Alfranio Correia2009-11-031-15/+18
| * | | | merged fixes for BUG#39934 to 5.1-rpl+3Sven Sandberg2009-09-301-13/+0
| |\ \ \ \
| | * \ \ \ Merged fix for BUG#39934 up a few revisions.Sven Sandberg2009-07-141-13/+0
| | |\ \ \ \
| | | * | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-141-13/+0
* | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-161-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-161-1/+1
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Mergingunknown2009-12-141-1/+1
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | This is a patch for Bug#48500unknown2009-12-141-2/+2
| | | * | | | Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-08-281-3/+1
* | | | | | | Manual merge/pull from mysql-next-mr.Alexander Nozdrin2009-11-251-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Backport of:Konstantin Osipov2009-11-241-2/+2
* | | | | | | | Auto mergeHe Zhenxing2009-11-211-8/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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
* | | | | | | | BUG#37148 Most callers of mysql_bin_log.write ignore the return resultHe Zhenxing2009-11-211-3/+4
|/ / / / / / /
* | | | | | | 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
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/