summaryrefslogtreecommitdiff
path: root/sql/events.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.3 into 10.4Marko Mäkelä2018-11-061-9/+9
|\
| * Merge 10.2 into 10.3Marko Mäkelä2018-11-061-9/+7
| |\
| | * 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
* | | | compilation failure on WindowsSergei Golubchik2018-10-311-1/+1
* | | | Merge 10.3 into 10.4Marko Mäkelä2018-10-051-0/+2
|\ \ \ \ | |/ / /
| * | | Merge branch '10.2' into 10.3Sergei Golubchik2018-09-281-0/+2
| |\ \ \ | | |/ /
| | * | 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
* | | | | MDEV-11953: support of brackets in UNION/EXCEPT/INTERSECT operationsOleksandr Byelkin2018-07-041-4/+5
* | | | | Merge remote-tracking branch 'origin/10.3' into 10.4Alexander Barkov2018-07-031-5/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.2' into 10.3Sergei Golubchik2018-06-301-5/+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
| | | | |\ \ \ \ \ \ \
* | | | | | | | | | | | mysys: rename ME_xxx flags to match plugin apiSergei Golubchik2018-06-041-7/+7
|/ / / / / / / / / / /
* | | | | | | | | | | Add likely/unlikely to speed up executionMonty2018-05-071-5/+5
* | | | | | | | | | | Changed database, tablename and alias to be LEX_CSTRINGMonty2018-01-301-5/+5
* | | | | | | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-01-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/10.2' into bb-10.2-extMonty2018-01-011-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge remote-tracking branch 'origin/10.1' into 10.2Vicențiu Ciorbaru2017-12-221-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | MW-416sjaakola2017-12-191-1/+1
* | | | | | | | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-12-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-12-191-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge 10.1 to 10.2Marko Mäkelä2017-12-191-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | MW-416sjaakola2017-12-181-0/+18
* | | | | | | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-10-301-4/+23
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-301-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | 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
| * | | | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-181-0/+18
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | MW-416sjaakola2017-10-101-1/+1
| | * | | | | | | MW-416sjaakola2017-10-101-0/+18
* | | | | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-10-041-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-021-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /