summaryrefslogtreecommitdiff
path: root/sql/sql_update.cc
Commit message (Expand)AuthorAgeFilesLines
* manual merge from mysql-5.1-bugteamJon Olav Hauglid2010-08-091-69/+1
|\
| * Bug #54106 assert in Protocol::end_statement,Jon Olav Hauglid2010-08-091-68/+1
* | Rename select_send::abort() to select_send::abort_result_set()Alexander Nozdrin2010-07-281-2/+2
* | manual merge from mysql-5.1-bugteamJon Olav Hauglid2010-07-191-2/+10
|\ \ | |/
| * Bug #54734 assert in Diagnostics_area::set_ok_statusJon Olav Hauglid2010-07-191-2/+10
* | Bug #30584: delete with order by and limit clauses does notGleb Shchepa2010-06-231-24/+17
* | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-101-4/+4
|\ \ | |/
| * Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-06-101-4/+4
| * A 5.1-only version of fix for bug #46947 "Embedded SELECTDmitry Lenev2010-05-281-1/+1
* | Manual merge from mysql-trunk-bugfixing.Alexander Nozdrin2010-06-071-1/+1
|\ \
| * \ Auto-merge from mysql-trunk.Alexander Nozdrin2010-05-281-0/+13
| |\ \
| * \ \ manual merge from mysql-trunk-bugfixingJon Olav Hauglid2010-05-181-6/+4
| |\ \ \
| * | | | Committing on behalf or Dmitry Lenev:Konstantin Osipov2010-04-281-1/+1
* | | | | Automerge.Alexey Kopytov2010-05-271-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | Bug #53830: !table || (!table->read_set ||Alexey Kopytov2010-05-251-1/+1
* | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-05-241-0/+3
|\ \ \ \ | |/ / /
| * | | Bug #49756 Rows_examined is always 0 in the slow query log forStaale Smedseng2010-05-121-0/+3
* | | | Manual merge from mysql-trunk.Alexander Nozdrin2010-05-201-6/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | Patch for Bug#21818 (Return value of ROW_COUNT() is incorrectAlexander Nozdrin2010-05-141-6/+4
| | |/ | |/|
* | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-04-301-0/+10
|\ \ \ | |/ / |/| / | |/
| * Bug #47453: InnoDB incorrectly changes TIMESTAMP columns when JOINed Georgi Kodinov2010-04-281-0/+10
* | merge from mysql-trunk-bugfixingJon Olav Hauglid2010-04-201-1/+17
|\ \
| * | WL#5030: Splitting mysql_priv.hMats Kindahl2010-04-071-0/+1
| * | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-1/+16
* | | Fix assorted compiler warnings.Davi Arnaut2010-03-161-2/+0
|/ /
* | 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.2010-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