summaryrefslogtreecommitdiff
path: root/sql/sql_trigger.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.2 into 10.3Marko Mäkelä2020-06-061-1/+14
|\
| * Merge 10.1 into 10.2Julius Goryavsky2020-06-051-1/+14
| |\
| | * MDEV-22763 backporting MDEV-20225 fix into 10.1sjaakola2020-06-031-2/+14
| * | Merge branch '10.1' into 10.2Sergei Petrunia2020-01-171-1/+1
| |\ \ | | |/
| | * MDEV-21341: Fix UBSAN failures: Issue SixSergei Petrunia2020-01-141-1/+1
* | | MDEV-21341: Fix UBSAN failures: Issue Sixbb-10.3-mdev21341-issueSixSergei Petrunia2020-01-121-1/+1
* | | Merge 10.2 into 10.3Marko Mäkelä2019-05-141-1/+1
|\ \ \ | |/ /
| * | Merge 10.1 into 10.2Marko Mäkelä2019-05-131-1/+1
| |\ \ | | |/
| | * Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-111-1/+1
| | |\
| | | * Update FSF AddressVicențiu Ciorbaru2019-05-111-1/+1
* | | | Merge branch '10.2' into 10.3Sergei Golubchik2019-03-171-2/+2
|\ \ \ \ | |/ / /
| * | | Merge branch '10.1' into 10.2Sergei Golubchik2019-03-151-2/+2
| |\ \ \ | | |/ /
| | * | fix gcc 8 compiler warningsSergei Golubchik2019-03-141-2/+2
* | | | cleanup: trg2bit() helperSergei Golubchik2019-01-251-4/+2
* | | | Merge 10.2 into 10.3Marko Mäkelä2018-11-061-3/+2
|\ \ \ \ | |/ / /
| * | | Merge 10.1 into 10.2Marko Mäkelä2018-11-061-3/+2
| |\ \ \ | | |/ /
| | * | wsrep: create a macro for the error: labelSergei Golubchik2018-10-241-3/+2
* | | | Merge branch '10.2' into 10.3Sergei Golubchik2018-09-281-2/+6
|\ \ \ \ | |/ / /
| * | | Merge branch '10.1' into 10.2Oleksandr Byelkin2018-09-141-2/+6
| |\ \ \ | | |/ /
| | * | Merge branch '10.0-galera' into 10.1Sergei Golubchik2018-09-071-1/+5
| | |\ \
| | | * | Fix compile error.Jan Lindström2018-07-191-1/+3
| | * | | MDEV-15890 Strange error message if you try to FLUSH TABLES <view> after LOCK...Alexey Botchkov2018-09-021-1/+1
* | | | | Merge branch '10.2' into 10.3Sergei Golubchik2018-06-301-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-06-211-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '10.0-galera' into 10.1Vicențiu Ciorbaru2018-06-121-1/+1
| | |\ \ \ | | | |/ /
| | | * | Merge tag 'mariadb-10.0.35' into 10.0-galeraJan Lindström2018-05-071-1/+1
| | | |\ \
| | | * \ \ Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galeraJan Lindström2018-05-071-0/+6
| | | |\ \ \
| | | | * \ \ Merge tag 'mariadb-5.5.60' into 5.5-galeraJan Lindström2018-04-241-0/+1
| | | | |\ \ \ | | | | | | |/ | | | | | |/|
| | | | * | | MW-416 Replicating DDL after ACL check, 5.6 versionsjaakola2017-10-191-0/+5
| | | | * | | Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-mergeSachin Setiya2017-04-181-0/+3
| | | | |\ \ \
| | | | * \ \ \ Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.Jan Lindström2014-04-161-0/+7
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge from maria/5.5 (-rtag:mariadb-5.5.36).Nirbhay Choubey2014-02-251-1/+1
| | | | |\ \ \ \ \
| | | | * | | | | | Merging revision 3839..3932 from codership-mysql/5.5.Nirbhay Choubey2014-01-091-2/+2
| | | | * | | | | | Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32Seppo Jaakola2013-08-211-1/+1
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ References: MDEV-4572 - merge with mariaDB 5.5.31Seppo Jaakola2013-05-261-3/+0
| | | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ References lp:1051808 - merged with lp:maria/5.5Seppo Jaakola2012-09-171-0/+3
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ references lp:1011983Seppo Jaakola2012-06-121-1/+1
| | | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Initial push of codership-wsrep API implementation for MariaDB. Seppo Jaakola2012-04-131-0/+52
| | | * | | | | | | | | | | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-mergeSachin Setiya2017-03-171-0/+3
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-291-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | MDEV-7996 : CURRENT_USER definer does not replicate for triggersNirbhay Choubey2015-04-161-2/+6
| | | * | | | | | | | | | | | | bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-051-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-211-0/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-261-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-041-60/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | Merges from lp:codership-mysql/5.5 up to rev #3893, this changes to wsrep API...Seppo Jaakola2013-11-261-2/+2
| | | * | | | | | | | | | | | | | | | | Merge 10.0 to galera-10.0Jan Lindström2013-09-031-12/+43
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-131-0/+52
* | | | | | | | | | | | | | | | | | | | | MDEV-16385 ROW SP variable is allowed in unexpected contextAlexander Barkov2018-06-051-2/+1
* | | | | | | | | | | | | | | | | | | | | Merge 10.2 into 10.3Marko Mäkelä2018-05-291-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /