summaryrefslogtreecommitdiff
path: root/sql/sql_update.cc
Commit message (Expand)AuthorAgeFilesLines
* merge with 5.1Sergei Golubchik2010-10-251-68/+1
|\
| * 5.1.51 mergeSergei Golubchik2010-10-191-68/+1
| |\
| | * Bug #54106 assert in Protocol::end_statement,Jon Olav Hauglid2010-08-091-68/+1
* | | merge with 5.1Sergei Golubchik2010-09-111-3/+10
|\ \ \ | |/ /
| * | Merge with MySQL 5.1.50Michael Widenius2010-08-271-3/+10
| |\ \ | | |/
| | * Bug #54734 assert in Diagnostics_area::set_ok_statusJon Olav Hauglid2010-07-191-2/+10
* | | Merge with MariaDB 5.1.49Michael Widenius2010-08-051-10/+15
|\ \ \ | |/ /
| * | Fixed compiler warningsMichael Widenius2010-08-041-17/+8
| * | Fixes bug when we run bcmp() on row when the storage engine hasn't filled in ...Michael Widenius2010-08-041-11/+22
| * | Merge with MySQL 5.1.49Michael Widenius2010-08-021-6/+9
| |\ \ | | |/
| | * 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
| | * Bug #53830: !table || (!table->read_set ||Alexey Kopytov2010-05-251-1/+1
| | * Bug #49756 Rows_examined is always 0 in the slow query log forStaale Smedseng2010-05-121-0/+3
* | | MergeIgor Babaev2010-07-171-2/+2
|\ \ \
| * | | Fixed bug #604503.Igor Babaev2010-07-171-2/+2
* | | | Fix for LP#588251: doStartTableScan() result not checked.Michael Widenius2010-07-171-8/+35
|/ / /
* | | Fixed bug #601164.Igor Babaev2010-07-021-0/+2
* | | merge 5.1->5.2Sergei Golubchik2010-06-011-27/+95
|\ \ \ | |/ /
| * | Merge with MySQL 5.1.47Michael Widenius2010-05-261-6/+12
| |\ \ | | |/
| | * Bug #47453: InnoDB incorrectly changes TIMESTAMP columns when JOINed Georgi Kodinov2010-04-281-0/+10
| * | Changed the fixes for the following bugs:Igor Babaev2010-05-251-3/+4
| * | Fixes after last merge of MySQL 5.1Michael Widenius2010-05-131-1/+1
| * | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-18/+79
| |\ \ | | |/
| | * Bug #43414 Parenthesis (and other) warnings compiling Staale Smedseng2010-02-221-1/+2
| | * 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
* | | mergedSergei Golubchik2010-03-151-5/+10
|\ \ \ | |/ /
| * | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-5/+10
| |\ \ | | |/
| | * Backport Bug#37148 to 5.1He Zhenxing2010-01-241-3/+4
| | * Bug#48157: crash in Item_field::used_tablesMartin Hansson2010-01-121-1/+5
| | * 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
* | | | merge 5.1-> 5.2unknown2009-12-081-3/+8
|\ \ \ \ | |/ / /
| * | | Merge with MySQL 5.1, with following additions:unknown2009-11-161-3/+8
| |\ \ \ | | |/ /
| | * | automergeJon Olav Hauglid2009-10-231-0/+5
| | |\ \
| | | * | Bug #47919 assert in open_table during ALTER temporary tableJon Olav Hauglid2009-10-231-0/+5
| | * | | Bug #40877: multi statement execution fails in 5.1.30Georgi Kodinov2009-10-161-3/+3
| | |/ /
* | | | Merge of the patch introducing virtual columns into maria-5.2Igor Babaev2009-11-111-0/+1
|\ \ \ \ | |/ / /
| * | | Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-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
* | | | This is based on the userstatv2 patch from Percona and OurDelta.Michael Widenius2009-10-191-6/+6
|/ / /
* | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-15/+63
|\ \ \ | |/ /
| * | 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
| * | 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
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/