summaryrefslogtreecommitdiff
path: root/sql/sql_insert.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge 5.5 into 10.1Marko Mäkelä2019-09-111-1/+1
|\
| * MDEV-19837 and MDEV-19816: Change some commentsStephen Long2019-08-211-1/+1
* | MDEV-17614 INSERT on dup key update is replication unsafeSachin2019-08-091-0/+1
* | Merge branch '5.5' into 10.1Oleksandr Byelkin2019-07-251-1/+5
|\ \ | |/
| * MDEV-15572: view.test, server crash with --big-tables=1Oleksandr Byelkin2019-07-181-1/+5
* | imporve clang buildEugene Kosov2019-06-251-3/+3
* | Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-111-1/+1
|\ \ | |/
| * Update FSF AddressVicențiu Ciorbaru2019-05-111-1/+1
* | fix gcc 8 compiler warningsSergei Golubchik2019-03-141-4/+2
* | Merge branch '10.0' into 10.1Oleksandr Byelkin2019-03-011-2/+1
|\ \
| * \ Merge branch '5.5' into 10.0Oleksandr Byelkin2019-02-281-2/+1
| |\ \ | | |/
| | * MDEV-17055: Server crashes in find_order_in_list upon 2nd (3rd) execution of ...Oleksandr Byelkin2019-02-281-1/+0
| | * A cleanup in derived table handling: removing duplicate code from st_select_l...Alexander Barkov2019-02-281-1/+1
* | | MDEV-9519: Data corruption will happen on the Galera cluster size changeJulius Goryavsky2019-02-251-2/+0
* | | Merge branch '10.0' into 10.1Sergei Golubchik2018-10-301-1/+1
|\ \ \ | |/ /
| * | Remove unused code.Sergey Vojtovich2018-10-191-1/+1
* | | Merge branch '10.0-galera' into 10.1Vicențiu Ciorbaru2018-06-121-0/+32
|\ \ \
| * \ \ 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 tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galeraSachin Setiya2017-11-031-7/+7
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-08-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-291-10/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.24' into 10.0-galeraNirbhay Choubey2016-02-231-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-191-3/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.22' into 10.0-galeraNirbhay Choubey2015-10-311-17/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-06-231-24/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | MDEV-8260 : Issues related to concurrent CTASNirbhay Choubey2015-06-191-22/+49
| | * | | | | | | | | | | | | | | | Merge revisions from maria/5.5 (5.5.41)Nirbhay Choubey2014-12-221-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Local merge of mariadb-5.5.39Nirbhay Choubey2014-08-061-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge of maria/5.5 into maria-5.5-galera.Nirbhay Choubey2014-01-291-2/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32Seppo Jaakola2013-08-211-48/+46
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ References: MDEV-4572 - merge with mariaDB 5.5.31Seppo Jaakola2013-05-261-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | References: MDEV-4572 - merge with lp:codership-mysql/5.5-23 revisions 3858.....Seppo Jaakola2013-05-251-1/+14
| | * | | | | | | | | | | | | | | | | | | | | References lp:1115708 - merged with lp:mariadb/5.5 revision 3657Seppo Jaakola2013-02-051-8/+42
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ References lp:1066784 - bzr merge lp:maria/5.5 (rev: 3562)Seppo Jaakola2012-10-241-4/+54
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | References lp:1066784Seppo Jaakola2012-10-231-15/+8
| | * | | | | | | | | | | | | | | | | | | | | | | References lp:1051808 - merged with lp:codership-mysql 5.5.27 based trunkSeppo Jaakola2012-09-181-1/+17
| | * | | | | | | | | | | | | | | | | | | | | | | References lp:1034621 - Merge up to mysql-5.5.25 levelSeppo Jaakola2012-08-091-4/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | Initial push of codership-wsrep API implementation for MariaDB. Seppo Jaakola2012-04-131-0/+22
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2015-02-181-12/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ maria-10.0.16 mergeNirbhay Choubey2015-01-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status