summaryrefslogtreecommitdiff
path: root/sql/sql_update.cc
Commit message (Expand)AuthorAgeFilesLines
* A review comment for the fix for Bug#46672.Konstantin Osipov2010-03-131-73/+16
* Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-241-18/+80
|\
| * Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-02-231-1/+2
| |\
| | * Bug #43414 Parenthesis (and other) warnings compiling Staale Smedseng2010-02-221-1/+2
| * | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-02-221-18/+79
| |\ \ | | |/
| | * Bug#49534: multitable IGNORE update with sql_safe_updatesMartin Hansson2010-02-101-10/+77
| | * BUG#49902 - SELECT returns incorrect resultsSergey Vojtovich2010-02-091-8/+1
* | | Fix for bug #50913 "Deadlock between open_and_lock_tables_derivedDmitry Lenev2010-02-081-0/+5
* | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-061-1/+6
|\ \ \
| * \ \ 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 next-mr -> next-4284.Konstantin Osipov2010-02-051-30/+19
|\ \ \ \ | |/ / /
| * | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-131-4/+5
| |\ \ \
| * \ \ \ Manual merge from next-mr.unknown2010-01-121-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
* | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-041-3/+4
* | | | | | | | | | Merge next-mr -> next-4284Konstantin Osipov2010-02-031-4/+5
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | WL#2360 Performance schemaMarc Alff2010-01-061-4/+5
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-031-9/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-9/+10
| |/ / / / / / /
* | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Auto mergeHe Zhenxing2009-11-211-8/+10
| |\ \ \ \ \ \ \ \
| * | | | | | | | | BUG#37148 Most callers of mysql_bin_log.write ignore the return resultHe Zhenxing2009-11-211-3/+4
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Implementation of simple deadlock detection for metadata locks.Dmitry Lenev2009-12-301-2/+4
* | | | | | | | | Apply and review:Konstantin Osipov2009-12-291-4/+0
* | | | | | | | | Backport of:Konstantin Osipov2009-12-081-2/+2
* | | | | | | | | Backport of:Konstantin Osipov2009-12-011-1/+1
* | | | | | | | | Backport of:Konstantin Osipov2009-11-301-2/+2
* | | | | | | | | 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
| | |\ \ \ \ \ \