summaryrefslogtreecommitdiff
path: root/sql/sql_insert.cc
Commit message (Expand)AuthorAgeFilesLines
* mysql-5.5.32 mergeSergei Golubchik2013-07-161-48/+46
|\
| * Bug#14261010: ON DUPLICATE KEY UPDATE CRASHES THE SERVERChaithra Gopalareddy2013-03-301-40/+45
* | strmake_buf(X,Y) helper, equivalent to strmake(X,Y,sizeof(X)-1)Sergei Golubchik2013-04-171-2/+1
* | 5.3 mergeSergei Golubchik2013-01-281-1/+1
|\ \
| * \ 5.2 mergeSergei Golubchik2013-01-281-1/+1
| |\ \
| | * | compilation error with -Wuninitialized -WerrorSergei Golubchik2013-01-281-1/+1
* | | | Merge 5.3->5.5Igor Babaev2013-01-231-0/+29
|\ \ \ \ | |/ / /
| * | | Merge 5.2->5.3Igor Babaev2013-01-211-0/+29
| |\ \ \ | | |/ /
| | * | Corrected the fix for bug mdev-3938.Igor Babaev2013-01-161-2/+2
| | * | Fixed bug mdev-3938.Igor Babaev2013-01-151-0/+29
| * | | 5.2->5.3 mergeSergei Golubchik2013-01-101-3/+2
| |\ \ \ | | |/ /
| | * | 5.1 mergeSergei Golubchik2013-01-101-3/+2
| | |\ \
| | | * \ mysql-5.1.67 mergeSergei Golubchik2013-01-091-3/+2
| | | |\ \
| | | | * | BUG#14548159: NUMEROUS CASES OF INCORRECT IDENTIFIERRohit Kalhans2012-09-221-10/+9
| * | | | | merge from 5.2unknown2012-08-241-7/+7
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge from 5.1.unknown2012-08-241-7/+7
| | |\ \ \ \ | | | |/ / /
| | | * | | MDEV-382: Incorrect quotingunknown2012-08-241-7/+7
| | * | | | Fix check of view updatability in case of underlying view changes its updatab...unknown2012-02-031-4/+13
* | | | | | Buildbot fixes and cleanups:Michael Widenius2013-01-111-6/+3
* | | | | | Fixed some race conditons and bugs related to killed queriesMichael Widenius2013-01-111-1/+4
* | | | | | Fix for MDEV-4009: main.delayed sporadically fails with "query 'REPLACE DELAY...Michael Widenius2013-01-101-0/+4
* | | | | | Fixed bug mdev-3888.Igor Babaev2012-12-041-1/+2
* | | | | | This fix+comments was originally made by Alexey KopytovMichael Widenius2012-09-181-4/+49
* | | | | | Fix for MDEV-533: Confusing error code when doing auto-increment insert for o...Michael Widenius2012-09-181-0/+5
* | | | | | MDEV-419 ensure that all HAVE_XXX constants can be set by cmakeSergei Golubchik2012-07-311-4/+0
* | | | | | Merged the implementation of MDEV-28 LIMIT ROWS EXAMINED into MariaDB 5.5.unknown2012-03-121-0/+2
|\ \ \ \ \ \
| * | | | | | Implementation of MDEV-28 LIMIT ROWS EXAMINEDunknown2012-03-111-0/+2
| |/ / / / /
* | | | | | 5.3.4 mergeSergei Golubchik2012-02-151-5/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Moving LP BUG#794005 to 5.3 + fixing INSERT of multi-table view.unknown2012-02-031-5/+14
* | | | | | mysql-5.5 mergeSergei Golubchik2012-01-161-4/+4
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Bug#11748731:SOME 'BIG' TESTS FAILING ON 6.0 Sneha Modi2011-11-211-4/+4
| * | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-11-101-0/+5
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
* | | | | | 5.3 mergeSergei Golubchik2012-01-131-16/+18
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Rewrite IGNORE handling:Michael Widenius2011-12-111-17/+12
| * | | | | Merge with 5.2.Michael Widenius2011-12-111-6/+14
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge with MariaDB 5.1Michael Widenius2011-11-241-6/+12
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Merge with MySQL 5.1.60Michael Widenius2011-11-231-0/+5
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Bug#11759688 52020: InnoDB can still deadlock on just INSERT...ON DUPLICATE KEYMarko Mäkelä2011-11-101-0/+5
| | | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-6/+7
| | | |\ \ \ | | | | |/ /
* | | | | | 5.3->5.5 mergeSergei Golubchik2011-11-221-14/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Automatic mergeMichael Widenius2011-09-261-17/+16
| |\ \ \ \ \
| | * | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ...Michael Widenius2011-09-231-17/+16
| * | | | | | fix typo: binlog_annotate_rows_events -> binlog_annotate_row_eventsSergei Golubchik2011-09-231-1/+1
| |/ / / / /
| * | | | | Merge with 5.2Michael Widenius2011-09-101-8/+9
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fixed that automatic killing of delayed insert thread (in flush, alter table ...Michael Widenius2011-09-091-8/+9
* | | | | | mergeSergei Golubchik2011-11-031-1/+1
|\ \ \ \ \ \
| * | | | | | compilation warnings on WindowsSergei Golubchik2011-11-021-1/+1
* | | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-9/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | backport from mysql-trunkGleb Shchepa2011-08-031-5/+0
| * | | | | 5.1 -> 5.5 mergeSergey Glukhov2011-08-021-2/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |