summaryrefslogtreecommitdiff
path: root/sql/sql_insert.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galeraJan Lindström2018-05-071-0/+29
|\
| * Merge tag 'mariadb-5.5.59' into 5.5-galeraJan Lindström2018-01-191-1/+1
| |\
| * \ Merge tag 'mariadb-5.5.58' into 5.5-galeraJan Lindström2017-10-191-7/+7
| |\ \
| * | | MW-322 CTAS fixsjaakola2017-07-201-1/+1
| * | | MW-322 - CTAS fix merged to 5.5-v25 branchsjaakola2017-07-201-0/+29
| * | | Merge tag 'mariadb-5.5.51' into 5.5-galeraNirbhay Choubey2016-08-101-1/+1
| |\ \ \
| * \ \ \ Merge tag 'mariadb-5.5.49' into 5.5-galeraNirbhay Choubey2016-04-251-6/+7
| |\ \ \ \
| * \ \ \ \ Merge tag 'mariadb-5.5.48' into 5.5-galeraNirbhay Choubey2016-02-131-0/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge tag 'mariadb-5.5.47' into 5.5-galeraNirbhay Choubey2015-12-101-3/+13
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge tag 'mariadb-5.5.46' into 5.5-galeraNirbhay Choubey2015-10-131-16/+40
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.34' into 10.0-galeramariadb-galera-10.0.34Jan Lindström2018-02-011-1/+1
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch '5.5' into 10.0Vicențiu Ciorbaru2018-01-241-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2018-01-181-1/+1
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | | * | | | | | | Bug #26881946: INCORRECT BEHAVIOR WITH "VALUES"Sreeharsha Ramanavarapu2017-11-161-1/+7
| | | * | | | | | | BUG#23135731: INSERT WITH DUPLICATE KEY UPDATE REPORTSNisha Gopalakrishnan2016-04-221-7/+16
* | | | | | | | | | Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galeraSachin Setiya2017-11-031-7/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2017-10-181-7/+7
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | MDEV-9619: Assertion `null_ref_table' failed in virtual table_map Item_direct...Oleksandr Byelkin2017-10-131-7/+7
| | | |_|_|_|_|_|/ | | |/| | | | | |
* | | | | | | | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-08-241-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-08-101-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | MDEV-10365 - Race condition in error handling of INSERT DELAYEDSergey Vojtovich2016-08-041-1/+1
| | | |_|_|_|_|/ | | |/| | | | |
* | | | | | | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-291-10/+38
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-04-261-6/+7
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | use consistent error messaging for IGNORESergei Golubchik2016-04-201-8/+5
| | * | | | | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-04-201-5/+9
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | / | | | |_|_|_|/ | | |/| | | |
| | | * | | | BUG#22037930: INSERT IGNORE FAILS TO IGNORE FOREIGN KEYNisha Gopalakrishnan2016-02-111-4/+8
| * | | | | | Fix for MDEV-9679 main.delayed fails sporadicallyMonty2016-04-261-2/+28
| * | | | | | MDEV-8889 - Assertion `next_insert_id == 0' failed in handler::ha_external_lockSergey Vojtovich2016-04-221-2/+3
* | | | | | | Merge tag 'mariadb-10.0.24' into 10.0-galeraNirbhay Choubey2016-02-231-0/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-02-151-0/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | MDEV-7765: Crash (Assertion `!table || (!table->write_set || bitmap_is_set(ta...Oleksandr Byelkin2016-02-091-0/+2
| | | |_|_|/ | | |/| | |
* | | | | | Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-191-3/+13
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '5.5' into 10.0Sergei Golubchik2015-12-131-3/+13
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2015-12-091-3/+13
| | |\ \ \ \ | | | |/ / / | | | | | / | | | |_|/ | | |/| |
| | | * | Bug #19894161: FATAL SIGNAL 11 INSreeharsha Ramanavarapu2015-10-061-3/+13
* | | | | Merge tag 'mariadb-10.0.22' into 10.0-galeraNirbhay Choubey2015-10-311-17/+40
|\ \ \ \ \ | |/ / / /
| * | | | remove unneded #include's that had a dubious explanationSergei Golubchik2015-10-241-1/+0
| * | | | Merge branch '5.5' into 10.0Sergei Golubchik2015-10-091-16/+40
| |\ \ \ \ | | |/ / /
| | * | | Merge remote-tracking branch 'mysql/5.5' into 5.5Sergei Golubchik2015-10-081-16/+40
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'mysql-5.1' into mysql-5.5Ajo Robert2015-08-071-15/+41
| | | |\ \
| | | | * | Bug #20760261 mysqld crashed in materialized_cursor::Ajo Robert2015-08-071-15/+40
| | | | * | Updated/added copyright headers.Murthy Narkedimilli2013-02-251-1/+1
| | | | * | BUG#14548159: NUMEROUS CASES OF INCORRECT IDENTIFIERRohit Kalhans2012-09-221-10/+9
| | | * | | 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
| | | |/ / /
| | | * | | Bug#14261010: ON DUPLICATE KEY UPDATE CRASHES THE SERVERChaithra Gopalareddy2013-03-301-40/+45
| | | * | | 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
| | | |\ \ \ | | | | |/ /
| | | | * | Bug#11759688 52020: InnoDB can still deadlock on just INSERT...ON DUPLICATE KEYMarko Mäkelä2011-11-101-0/+5