summaryrefslogtreecommitdiff
path: root/sql/sql_insert.cc
Commit message (Expand)AuthorAgeFilesLines
* bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-051-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
* | bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-111-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
* | | | Merging mariadb-10.0.10.Nirbhay Choubey2014-04-081-90/+28
|\ \ \ \ | |/ / /
| * | | 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
* | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-261-70/+138
|\ \ \ \ | |/ / /
| * | | 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 with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-041-6/+51
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | | Merge fix.Jan Lindström2013-09-091-0/+6
* | | | | | Merge 10.0 to galera-10.0Jan Lindström2013-09-031-75/+74
|\ \ \ \ \ \ | |/ / / / /
| * | | | | cosmetic fixesSergei Golubchik2013-07-211-3/+3
| * | | | | 10.0-monty mergeSergei Golubchik2013-07-211-25/+23
| |\ \ \ \ \
| | * | | | | Fixes for innodb suite, merging tests from 5.6.Sergei Golubchik2013-07-151-1/+0
| | * | | | | merge of 2876.430.11 & 2876.430.1unknown2013-06-271-3/+3
| | * | | | | A fix of unions with duplicate rows and returning bug fix for lp:732124 union...unknown2013-06-261-1/+1
| | * | | | | Fixed memory leaks. alias.test now runs clean with valgrindMichael Widenius2013-06-201-2/+1
| | * | | | | Finished merging wl5986 started by Igor.unknown2013-06-191-1/+1
| | * | | | | Applied all changes from Igor and SanjaMichael Widenius2013-06-151-21/+21
| * | | | | | 10.0-base mergeSergei Golubchik2013-07-181-47/+48
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |