summaryrefslogtreecommitdiff
path: root/sql/sql_update.cc
Commit message (Expand)AuthorAgeFilesLines
* MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-1/+2
* Merged the fix for bug mdev-4019.Igor Babaev2013-01-131-0/+2
|\
| * Fixed bug mdev-4019.Igor Babaev2013-01-131-0/+2
* | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-2/+6
|\ \ | |/
| * 5.3->5.5 mergeSergei Golubchik2012-11-221-2/+6
| |\
| | * Merge MariaDB 5.2->5.3unknown2012-11-201-2/+6
| | |\
| | | * Fixed bug mdev-3845.Igor Babaev2012-11-091-2/+6
| | | * Fix check of view updatability in case of underlying view changes its updatab...unknown2012-02-031-1/+2
| | | * Fix gcc 4.6 warning after merge with 5.1unknown2011-10-271-2/+2
* | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-12-131-1/+1
* | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-10-171-27/+19
* | | | Automatic mergeMichael Widenius2012-09-221-1/+1
|\ \ \ \ | |/ / /
| * | | 5.3 mergeSergei Golubchik2012-08-311-1/+1
| |\ \ \ | | |/ /
| | * | MDEV-492: fixed incorrect error check.unknown2012-08-291-1/+1
* | | | MDEV-415: Back-port of the WL task #1393 from the mysql-5.6 code line.Igor Babaev2012-09-011-2/+4
|/ / /
* | | Fix for bug lp:944706, task MDEV-193unknown2012-05-171-1/+1
* | | 5.3 mergeSergei Golubchik2012-05-041-4/+0
|\ \ \ | |/ /
| * | MDEV-216 lp:976104 - Assertion `0' failed in my_message_sql on UPDATE IGNORE,...Sergei Golubchik2012-04-261-4/+0
* | | Merge mariadb 5.3->mariadb 5.5unknown2012-03-241-2/+4
|\ \ \ | |/ /
| * | Speedup:Michael Widenius2012-03-231-2/+4
* | | 5.3.4 mergeSergei Golubchik2012-02-151-2/+2
|\ \ \ | |/ /
| * | Moving LP BUG#794005 to 5.3 + fixing INSERT of multi-table view.unknown2012-02-031-2/+2
* | | 5.3->5.5 mergeSergei Golubchik2011-11-221-8/+8
|\ \ \ | |/ /
| * | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ...Michael Widenius2011-09-231-8/+8
* | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-2/+2
|\ \ \
| * \ \ Updated/added copyright headersKent Boortz2011-07-041-10/+20
| |\ \ \
| * \ \ \ Updated/added copyright headersKent Boortz2011-06-301-2/+2
| |\ \ \ \
* | \ \ \ \ merge with 5.3Sergei Golubchik2011-10-191-63/+104
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Fixed LP bug #794901.Igor Babaev2011-07-161-9/+6
| * | | | | Merge with the latest 5.3 code.Igor Babaev2011-07-111-2/+6
| |\ \ \ \ \
| | * | | | | Fixed LP bug #794890.Igor Babaev2011-06-131-2/+6
| * | | | | | New status variables: Rows_tmp_read, Handler_tmp_update and Handler_tmp_writeMichael Widenius2011-06-271-1/+1
| |/ / / / /
| * | | | | Applied Sanja's patch to fix LP bug #784297 in the tree for mwl106.Igor Babaev2011-05-271-2/+2
| * | | | | MergeIgor Babaev2011-05-201-31/+63
| |\ \ \ \ \
| | * \ \ \ \ Merged the code of MWL#106 into 5.3Igor Babaev2011-05-161-31/+63
| | |\ \ \ \ \
| | | * \ \ \ \ Merge of the mwl106 tree into the latest 5.3 tree.Igor Babaev2010-09-231-31/+63
| | | |\ \ \ \ \
| | | | * | | | | MWL#106: Backport optimizations for derived tables and views.Igor Babaev2010-05-261-31/+63
| * | | | | | | | Merge with 5.3 mainMichael Widenius2011-05-161-0/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | MWL#89unknown2011-03-301-0/+4
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge MWL#89 into 5.3 main.unknown2011-01-111-0/+4
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge 5.3-mwl89 into 5.3.unknown2010-12-031-0/+4
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ MWL#89: Cost-based choice between Materialization and IN->EXISTS transformationunknown2010-11-051-0/+4
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | MWL#89: Cost-based choice between Materialization and IN->EXISTS transformationunknown2010-09-051-0/+4
| | | | | | |/ / / / / /
| * | | | | | | | | | | Merge with MariaDB 5.2Michael Widenius2011-05-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | / | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | Merge Mariadb 5.1->5.2unknown2011-04-121-1/+1
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Bug fix for lp:732124 union + limit returns wrong resultMichael Widenius2011-03-091-1/+1
| * | | | | | | | | | | Merge with 5.2Michael Widenius2011-03-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | / / / / / / / / | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-1/+1
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / | | | | |/| | | | | |
| | * | | | | | | | | Merge with alias as StringMichael Widenius2011-02-281-1/+2
| | |\ \ \ \ \ \ \ \ \