summaryrefslogtreecommitdiff
path: root/sql/sql_update.cc
Commit message (Expand)AuthorAgeFilesLines
* merge.Sergei Golubchik2010-11-251-44/+73
|\
| * Fixed usage of wrong variable in case of errorsMichael Widenius2010-11-051-2/+2
| * 5.2 mergeSergei Golubchik2010-10-281-68/+1
| |\
| | * merge with 5.1Sergei Golubchik2010-10-251-68/+1
| | |\
| | | * 5.1.51 mergeSergei Golubchik2010-10-191-68/+1
| | | |\
| * | | \ Merge 5.2->5.3Sergey Petrunya2010-10-101-21/+62
| |\ \ \ \ | | |/ / /
| | * | | merge with 5.1Sergei Golubchik2010-09-111-3/+10
| | |\ \ \ | | | |/ /
| | | * | Merge with MySQL 5.1.50Michael Widenius2010-08-271-3/+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
| | | |\ \ \
| | * | \ \ \ 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
| * | | | | | Subquery cache (MWL#66) added.unknown2010-07-101-1/+1
| * | | | | | MariaDB 5.2 -> MariaDB 5.3 merge Sergey Petrunya2010-06-261-27/+95
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | merge 5.1->5.2Sergei Golubchik2010-06-011-27/+95
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge with MySQL 5.1.47Michael Widenius2010-05-261-6/+12
| | | |\ \ \ \
| | | * | | | | 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
| | | |\ \ \ \ \
| * | | \ \ \ \ \ Merge MariaDB-5.2 -> MariaDB 5.3Sergey Petrunya2010-03-201-7/+17
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | mergedSergei Golubchik2010-03-151-5/+10
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-5/+10
| | | |\ \ \ \ \ \
| | * | \ \ \ \ \ \ merge 5.1-> 5.2unknown2009-12-081-3/+8
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge with MySQL 5.1, with following additions:unknown2009-11-161-3/+8
| | | |\ \ \ \ \ \ \
| * | | | | | | | | | Backport of subquery optimizations to 5.3.Sergey Petrunya2010-01-171-1/+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
| | |\ \ \ \ \ \ \ \
| * | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ bzr merge from guilhem's maria tree to our local 5.1Michael Widenius2009-04-251-3/+5
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-111-3/+5
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-121-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ Merge with base MySQL 5.1Michael Widenius2009-02-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Fixed compiler warnings found by gcc 4.3.2Michael Widenius2009-01-311-1/+1
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my...Guilhem Bichot2008-12-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or...Guilhem Bichot2008-11-211-2/+33
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merged 5.1 with maria 5.1Michael Widenius2008-10-101-7/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-51/+37
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2008-02-051-4/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2007-12-271-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge jani@marvel:/my/bk/mysql-maria.newunknown2007-12-181-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | Fixed bug in undo_key_delete; Caused crashed key files in recoveryunknown2007-12-171-1/+1
* | | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
View Lorry Controller Status