summaryrefslogtreecommitdiff
path: root/sql/sql_plugin.cc
Commit message (Expand)AuthorAgeFilesLines
* MDEV-21258: Can't uninstall plugin if the library file doesn't existOleksandr Byelkin2020-07-291-17/+26
* Fixed deadlock with LOCK TABLES and ALTER TABLEMonty2020-05-231-1/+1
* Merge branch '10.1' into 10.2Oleksandr Byelkin2019-07-261-2/+5
|\
| * Merge branch '5.5' into 10.1Oleksandr Byelkin2019-07-251-2/+5
| |\
| | * Bug#27167197 USING ? IN INSTALL PLUGIN QUERY ABORTS DEBUG, AND HANGS OPTIMIZE...Sergei Golubchik2019-07-241-2/+2
| | * Bug#27302459: EMPTY VALUE IN MYSQL.PLUGIN TABLE CAUSES SERVER TO EXIT ON STARTUPSergei Golubchik2019-07-241-0/+3
* | | Merge 10.1 into 10.2Eugene Kosov2019-07-091-4/+5
|\ \ \ | |/ /
| * | MDEV-19636 Usage message for plugin activation - add FORCE_PLUS_PERMANENTAnel Husakovic2019-07-021-4/+5
* | | Merge 10.1 into 10.2Eugene Kosov2019-06-231-0/+3
|\ \ \ | |/ /
| * | MDEV-18661 loading the audit plugin causes performance regression.Alexey Botchkov2019-06-151-0/+3
* | | 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 10.1 into 10.2Marko Mäkelä2018-11-061-6/+4
|\ \ \ | |/ /
| * | wsrep: create a macro for the error: labelSergei Golubchik2018-10-241-6/+4
* | | Merge branch '10.1' into 10.2Sergei Golubchik2018-06-211-2/+1
|\ \ \ | |/ /
| * | Fix another double WSREP_ISOLATION_BEGIN merge errorSergei Golubchik2018-06-201-1/+0
| * | Fix double WSREP_ISOLATION_BEGIN merge errorVicențiu Ciorbaru2018-06-201-2/+0
| * | Merge branch '10.0-galera' into 10.1Vicențiu Ciorbaru2018-06-121-0/+3
| |\ \
| | * \ 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-6/+27
| | |\ \ \
| | | * \ \ Merge tag 'mariadb-5.5.60' into 5.5-galeraJan Lindström2018-04-241-3/+18
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | MW-416 Replicating DDL after ACL check, 5.6 versionsjaakola2017-10-191-4/+15
| | | * | | Merge tag 'mariadb-5.5.58' into 5.5-galeraJan Lindström2017-10-191-71/+60
| | | |\ \ \
| | | * \ \ \ Merge tag 'mariadb-5.5.57' into 5.5-galeraJan Lindström2017-07-201-9/+11
| | | |\ \ \ \
| | | * \ \ \ \ Merge remote-tracking branch 'origin/5.5' into 5.5-galeraNirbhay Choubey2016-10-141-84/+67
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge tag 'mariadb-5.5.51' into 5.5-galeraNirbhay Choubey2016-08-101-61/+65
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge tag 'mariadb-5.5.44' into 5.5-galeraNirbhay Choubey2015-06-211-27/+11
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch '5.5' into 5.5-galeraNirbhay Choubey2015-02-181-1/+1
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Local merge of mariadb-5.5.39Nirbhay Choubey2014-08-061-1/+1
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-5.5.38 maria/5.5Nirbhay Choubey2014-06-101-1/+2
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.Jan Lindström2014-04-161-4/+11
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge from maria/5.5 (-rtag:mariadb-5.5.36).Nirbhay Choubey2014-02-251-2/+12
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge of maria/5.5 into maria-5.5-galera.Nirbhay Choubey2014-01-291-83/+84
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge with MariaDB 5.5.34.Jan Lindström2013-11-251-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ mariadb-5.5.33 mergeSergei Golubchik2013-09-181-5/+72
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32Seppo Jaakola2013-08-211-4/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ References: MDEV-4572 - merge with mariaDB 5.5.31Seppo Jaakola2013-05-261-1/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ References lp:1115708 - merged with lp:mariadb/5.5 revision 3657Seppo Jaakola2013-02-051-10/+32
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ References lp:1066784 - bzr merge lp:maria/5.5 (rev: 3562)Seppo Jaakola2012-10-241-2/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ References lp:1051808 - merged with lp:maria/5.5Seppo Jaakola2012-09-171-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ references lp:1011983Seppo Jaakola2012-06-121-3/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge with mariaDB 5.5.23: bzr merge lp:maria/5.5Seppo Jaakola2012-04-261-20/+44
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | Initial push of codership-wsrep API implementation for MariaDB. Seppo Jaakola2012-04-131-0/+6
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.34' into 10.0-galeramariadb-galera-10.0.34Jan Lindström2018-02-011-1/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galeraSachin Setiya2017-11-031-39/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.32' into 10.0-galeraJan Lindström2017-08-091-9/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.31' into 10.0-galeraSachin Setiya2017-05-301-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.28' into 10.0-galeraNirbhay Choubey2016-10-281-84/+67
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-08-241-61/+65
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \