summaryrefslogtreecommitdiff
path: root/sql/sql_trigger.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | | | | | | | | | | | | | Merge 10.1 into 10.2Marko Mäkelä2018-05-291-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | MDEV-16093 Memory leak with triggersMonty2018-05-261-0/+6
* | | | | | | | | | | | | | | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-05-201-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | MDEV-15347: Valgrind or ASAN errors in mysql_make_view on query from informat...Oleksandr Byelkin2018-05-151-4/+2
* | | | | | | | | | | | | | | | | | | | Merge 10.1 into 10.2Marko Mäkelä2018-04-241-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge 10.0 into 10.1Marko Mäkelä2018-04-241-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2018-04-201-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2018-04-191-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | BUG#27216817: INNODB: FAILING ASSERTION:mysql-5.5.60Nisha Gopalakrishnan2018-02-261-2/+2
| | | | * | | | | | | | | | | | | | | | Bug #17503460 MYSQL READ ONLY DOESN'T WORK FOR DROP TRIGGERBharathy Satish2014-01-071-0/+7
| | | | * | | | | | | | | | | | | | | | Updated/added copyright headersMurthy Narkedimilli2014-01-061-1/+1
| | | | * | | | | | | | | | | | | | | | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-191-1/+1
| | | | * | | | | | | | | | | | | | | | Updated/added copyright headersKent Boortz2011-07-041-1/+2
| | | | * | | | | | | | | | | | | | | | Manual-merge of patch for bug#11753738 from mysql-5.1 tree.Dmitry Shulga2011-06-101-10/+139
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | Fixed bug#11753738 (formely known as bug#45235) - 5.1 DOES NOT SUPPORT 5.0-ONLYDmitry Shulga2011-06-101-12/+136
| | | | * | | | | | | | | | | | | | | | | A patch for Bug#11763166 (55847: SHOW WARNINGS returns emptyAlexander Nozdrin2011-04-151-13/+12
| | | | * | | | | | | | | | | | | | | | | Patch for Bug#11765684 (58674: SP-cache does not detect changes inAlexander Nozdrin2011-03-101-0/+7
| | | | * | | | | | | | | | | | | | | | | Bug #11764779 (former 57649)Jon Olav Hauglid2011-03-071-3/+2
| | | | * | | | | | | | | | | | | | | | | Patch that refactors global read lock implementation and fixesDmitry Lenev2010-11-111-14/+0
| | | | * | | | | | | | | | | | | | | | | Merge from mysql-5.5-bugteam to mysql-5.5-runtimeJon Olav Hauglid2010-09-301-0/+9
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Auto-merge from mysql-5.1-bugteam.Dmitry Shulga2010-09-071-0/+9
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / /
| | | | | | * | | | | | | | | | | | | | | | Fixed bug #55421 - Protocol::end_statement(): Assertion `0' onDmitry Shulga2010-09-071-0/+9
| | | | | | * | | | | | | | | | | | | | | | Manual merge from the bugfix tree.Alexey Kopytov2010-06-111-3/+3
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | Bug #56595 RENAME TABLE causes assert on OS XJon Olav Hauglid2010-09-161-2/+4
| | | | * | | | | | | | | | | | | | | | | | | Bug#27480 (Extend CREATE TEMPORARY TABLES privilegeAlexander Nozdrin2010-08-311-1/+1
| | | | |/ / / / / / / / / / / / / / / / / /