summaryrefslogtreecommitdiff
path: root/sql/events.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2018-11-061-9/+7
|\
| * wsrep: create a macro for the error: labelSergei Golubchik2018-10-241-9/+7
* | Merge branch '10.1' into 10.2Oleksandr Byelkin2018-09-141-0/+2
|\ \ | |/
| * Merge branch '10.0-galera' into 10.1Sergei Golubchik2018-09-071-0/+2
| |\
| | * MDEV-16799: Test wsrep.variables crash at sql_class.cc:639 thd_get_ha_dataJan Lindström2018-07-241-0/+3
* | | Merge branch '10.1' into 10.2Sergei Golubchik2018-06-211-5/+3
|\ \ \ | |/ /
| * | Merge branch '10.0-galera' into 10.1Vicențiu Ciorbaru2018-06-121-5/+3
| |\ \ | | |/
| | * Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galeraJan Lindström2018-05-071-0/+15
| | |\
| | | * MW-416 Replicating DDL after ACL check, 5.6 versionsjaakola2017-10-191-0/+15
| | | * Merge tag 'mariadb-5.5.58' into 5.5-galeraJan Lindström2017-10-191-3/+5
| | | |\
| | | * | bzr merge -r3985..3997 codership/5.5Nirbhay Choubey2014-06-101-0/+41
| | | * | 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-1/+1
| | | * | | Merge with MariaDB 5.5.34.Jan Lindström2013-11-251-3/+4
| | | |\ \ \
| | | * | | | Initial push of codership-wsrep API implementation for MariaDB. Seppo Jaakola2012-04-131-0/+12
| | * | | | | Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galeraSachin Setiya2017-11-031-4/+5
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge tag 'mariadb-10.0.31' into 10.0-galeraSachin Setiya2017-05-301-0/+2
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge tag 'mariadb-10.0.24' into 10.0-galeraNirbhay Choubey2016-02-231-3/+0
| | |\ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/10.1' into 10.2Vicențiu Ciorbaru2017-12-221-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | MW-416sjaakola2017-12-191-1/+1
* | | | | | | | | | Merge 10.1 to 10.2Marko Mäkelä2017-12-191-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | MW-416sjaakola2017-12-181-0/+18
* | | | | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-10-241-4/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2017-10-221-4/+5
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2017-10-181-4/+5
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | / | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | MDEV-13459 Warnings, when compiling with gcc-7.xSergei Golubchik2017-10-171-3/+5
| | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | Silence bogus GCC 7 warnings -Wimplicit-fallthroughMarko Mäkelä2017-05-171-0/+2
| | | |_|/ / / | | |/| | | |
| | * | | | | MDEV-9088 Server crashes on shutdown after the second post of feedback reportSergei Golubchik2015-12-191-3/+0
* | | | | | | MW-416sjaakola2017-10-101-1/+1
* | | | | | | MW-416sjaakola2017-10-101-0/+18
* | | | | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT.Vladislav Vaintroub2017-09-281-1/+1
* | | | | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-221-0/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Silence bogus GCC 7 warnings -Wimplicit-fallthroughMarko Mäkelä2017-05-171-0/+2
* | | | | | | Reuse THD for new user connectionsMonty2016-06-041-1/+1
* | | | | | | MDEV-8360 Clean-up CHARSET_INFO: strnncollsp: diff_if_only_endspace_differenceAlexander Barkov2016-03-311-1/+1
* | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-03-231-8/+21
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MDEV-717 LP:1003679 - Wrong binlog order on concurrent DROP schema and CREATE...Alexey Botchkov2016-03-231-8/+21
* | | | | | | Removed TABLE->sort to make it possible to have multiple active calls toMonty2016-03-221-1/+1
|/ / / / / /
* | | | | | Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-11-191-1/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge tag 'mariadb-10.0.22' into 10.0-galeraNirbhay Choubey2015-10-311-79/+99
| |\ \ \ \ \ | | |/ / / /
| * | | | | refs codership/mysql-wsrep#202 Added schema info into wsrep messagesPhilip Stoev2015-10-191-2/+4
| * | | | | Fix for build failures on Power8Nirbhay Choubey2015-02-201-1/+1
| * | | | | bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-051-0/+1
| |\ \ \ \ \
| * | | | | | bzr merge -r4091..4101 codership/5.6/Nirbhay Choubey2014-06-191-1/+41
| * | | | | | bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-211-0/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merging mariadb-10.0.10.Nirbhay Choubey2014-04-081-0/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-261-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-251-3/+4
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-041-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Merges from lp:codership-mysql/5.5 up to rev #3893, this changes to wsrep API...Seppo Jaakola2013-11-261-1/+1