summaryrefslogtreecommitdiff
path: root/sql/sql_insert.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0' into merge-wipSergei Golubchik2015-01-311-13/+16
|\
| * MDEV-6668: Server crashes in check_view_single_update on concurrent DDL/DML f...Michael Widenius2015-01-291-12/+15
| * 5.5 mergeSergei Golubchik2015-01-211-1/+1
| |\
| | * MDEV-7150 Wrong auto increment values on INSERT .. ON DUPLICATE KEY UPDATE wh...Sergei Golubchik2014-12-181-1/+1
* | | MDEV-7437 remove suport for "atomics" with rwlocksSergei Golubchik2015-01-131-2/+2
* | | MDEV-7324 - Lock-free hash for table definition cacheSergey Vojtovich2014-12-281-1/+1
* | | MDEV-7112 Split HA_CREATE_INFOAlexander Barkov2014-12-081-5/+7
* | | MDEV-6676: Optimistic parallel replicationKristian Nielsen2014-12-061-0/+4
* | | my_alloc.cmariadb-10.1.2Monty2014-12-051-1/+1
* | | Merge branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-021-1/+12
|\ \ \ | |/ /
| * | MDEV-6849 ON UPDATE CURRENT_TIMESTAMP doesn't always workSergei Golubchik2014-11-131-0/+11
| * | MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-301-1/+1
* | | Merge branch '10.1' of github.com:MariaDB/server into 10.1Sergei Petrunia2014-10-171-16/+12
|\ \ \
| * \ \ Merge 10.0.14 into 10.1Sergei Golubchik2014-10-151-16/+12
| |\ \ \ | | |/ /
| | * | 5.5.39 mergeSergei Golubchik2014-08-071-1/+1
| | |\ \ | | | |/
| | | * mysql-5.5.39 mergeSergei Golubchik2014-08-021-1/+1
| | | |\
| | | | * Bug#17283409 4-WAY DEADLOCK: ZOMBIES, PURGING BINLOGS,Venkatesh Duggirala2014-05-081-1/+3
| | | | * WL#7076: Backporting wl6715 to support both formats Ashish Agarwal2013-08-231-2/+3
| | | | |\
| | | | | * WL#7076: Backporting wl6715 to support both formats in 5.5, 5.6, 5.7Ashish Agarwal2013-07-021-2/+3
| | | | |/
| | * | | small cleanup of the SHOW CREATE TABLE codeSergei Golubchik2014-07-081-15/+11
* | | | | MDEV-6400: "ANALYZE SELECT ... INTO @var" doesn't set @varSergei Petrunia2014-10-171-0/+4
|/ / / /
* | | | MDEV-6396: ANALYZE INSERT/REPLACE is accepted, but does not produce a planSergei Petrunia2014-10-121-0/+5
* | | | cleanup: galera merge, simple changesSergei Golubchik2014-10-011-13/+7
* | | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-261-7/+39
|/ / /
* | | Fixed that the we don't change CREATE to CREATE OR REPLACE, except if the sla...Michael Widenius2014-03-281-2/+3
* | | MDEV-5930 Server crashes in thd_get_ha_data on CREATE OR REPLACE TABLEMichael Widenius2014-03-231-2/+1
* | | MDEV-5433 select_result::send_error() is unusedSergei Golubchik2014-03-261-40/+0
* | | Fix for MDEV-5589: "Discrepancy in binlog on half-failed CREATE OR REPLACE"Michael Widenius2014-03-201-2/+14
* | | MDEV-9095: Executing triggers on slave in row-based replicationunknown2014-03-191-44/+6
* | | MDEV-5619: CREATE OR REPLACE does not release MDL_EXCLUSIVE upon failureMichael Widenius2014-03-121-1/+7
* | | MDEV-5314 - Compiling fails on OSX using clangSergey Vojtovich2014-02-191-4/+4
* | | MDEV-5492 - Reduce usage of LOCK_open: TABLE::in_useSergey Vojtovich2014-02-131-1/+1
* | | Automatic mergeMichael Widenius2014-02-051-64/+121
|\ \ \
| * | | Replication changes for CREATE OR REPLACE TABLEMichael Widenius2014-02-051-5/+17
| * | | Implementation of MDEV-5491: CREATE OR REPLACE TABLEMichael Widenius2014-01-291-60/+105
| * | | Fixes to get valgrind to work with jemallocMichael Widenius2014-01-021-1/+1
* | | | 10.0-base mergeSergei Golubchik2014-02-031-2/+10
|\ \ \ \
| * \ \ \ 5.5 mergeSergei Golubchik2014-02-011-2/+10
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fix for MDEV-5168: MariaDB returns warnings for INSERT IGNOREMichael Widenius2014-01-261-2/+6
| | * | | Fix for MDEV-5531: double call procedure in one session - hard shutdown the s...Michael Widenius2014-01-241-0/+3
* | | | | MDEV-5426: Assertion `toku_ft_needed_unlocked(src_h)' failed (errno=11) ...Sergey Petrunya2014-01-211-1/+2
| |_|/ / |/| | |
* | | | Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication.unknown2013-11-011-4/+4
|\ \ \ \ | |/ / /
| * | | Merge MDEV-4506: Parallel replication into 10.0-base.unknown2013-11-011-4/+4
| |\ \ \
| | * | | MDEV-4506: Parallel replication: Intermediate commitunknown2013-07-121-4/+4
* | | | | Merge 10.0-base -> 10.0Sergey Petrunya2013-10-161-2/+47
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-3798: [SHOW] EXPLAIN UPDATE/DELETE, Memory leak in binlog.binlog_base64_...Sergey Petrunya2013-10-161-0/+1
| * | | | MDEV-3798: EXPLAIN UPDATE/DELETESergey Petrunya2013-10-141-2/+3
| * | | | MDEV-3798: EXPLAIN UPDATE/DELETESergey Petrunya2013-10-141-2/+1
| * | | | MDEV-5122: "Commands out of sync", "Malformed packet" or client hang up...Sergey Petrunya2013-10-111-4/+3
| * | | | MDEV-3798: EXPLAIN UPDATE/DELETESergey Petrunya2013-10-071-1/+46