summaryrefslogtreecommitdiff
path: root/sql/slave.cc
Commit message (Expand)AuthorAgeFilesLines
* MDEV-22203: WSREP_ON is unnecessarily expensive to evaluateMarko Mäkelä2020-04-271-3/+5
* Merge branch '5.5' into 10.1Oleksandr Byelkin2020-01-191-2/+2
|\
| * Use get_ident_len in heartbeat event error messagesMarkus Mäkelä2020-01-131-2/+2
* | MDEV-19572 async slave node fails to apply MyISAM only writes (#1418)seppo2019-11-261-1/+6
* | MDEV-18497 CTAS async replication from mariadb master crashes galera nodes (#...seppo2019-11-181-0/+26
* | imporve clang buildEugene Kosov2019-06-251-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.0-galera' into 10.1Vicențiu Ciorbaru2018-06-121-1/+1
|\ \
| * \ Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galeraJan Lindström2018-05-071-1/+1
| |\ \
| | * | MW-384 protect access to wsrep_ready variable with mutexAlexey Yurchenko2017-10-191-1/+1
| | * | Merge tag 'mariadb-5.5.58' into 5.5-galeraJan Lindström2017-10-191-1/+0
| | |\ \ | | | |/
| | * | Merge tag 'mariadb-5.5.57' into 5.5-galeraJan Lindström2017-07-201-2/+4
| | |\ \
| | * \ \ Merge tag 'mariadb-5.5.50' into 5.5-galeramariadb-galera-5.5.50Nirbhay Choubey2016-06-231-2/+2
| | |\ \ \
| | * \ \ \ Merge tag 'mariadb-5.5.45' into 5.5-galeraNirbhay Choubey2015-08-071-9/+1
| | |\ \ \ \
| | * \ \ \ \ Merge tag 'mariadb-5.5.44' into 5.5-galeraNirbhay Choubey2015-06-211-2/+2
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge tag 'mariadb-5.5.43' into 5.5-galeraNirbhay Choubey2015-05-041-3/+19
| | |\ \ \ \ \ \
| | * | | | | | | Backport fix for MDEV-7673, MDEV-7203 and MDEV-7192 from 10.0-galeraNirbhay Choubey2015-03-111-35/+1
| | * | | | | | | Local merge of mariadb-5.5.39Nirbhay Choubey2014-08-061-9/+30
| | |\ \ \ \ \ \ \
| | * | | | | | | | Merge lp:codership-mysql/5.5 -r3961..3980.Jan Lindström2014-04-161-0/+33
| | * | | | | | | | Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.Jan Lindström2014-04-161-0/+3
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge from maria/5.5 (-rtag:mariadb-5.5.36).Nirbhay Choubey2014-02-251-2/+2
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge of maria/5.5 into maria-5.5-galera.Nirbhay Choubey2014-01-291-4/+8
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge with MariaDB 5.5.34.Jan Lindström2013-11-251-2/+10
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32Seppo Jaakola2013-08-211-14/+32
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | References lp:1169326 - merged fix from LP wsrep-5.5-23Seppo Jaakola2013-06-131-17/+0
| | * | | | | | | | | | | | | References: MDEV-4572 - merge with mariaDB 5.5.31Seppo Jaakola2013-05-261-19/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ References: MDEV-4572 - merge with mariaDB 5.5.30Seppo Jaakola2013-05-241-0/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | References: lp:1066784 - Merged revisions 3810-3827 from lp:codership-mysqlSeppo Jaakola2012-11-281-3/+3
| | * | | | | | | | | | | | | | | References lp:1066784Seppo Jaakola2012-10-231-0/+17
| | * | | | | | | | | | | | | | | References lp:1051808 - merged with lp:maria/5.5Seppo Jaakola2012-09-171-7/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ References lp:1034621 - Merge up to mysql-5.5.25 levelSeppo Jaakola2012-08-091-1/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ references lp:1011983Seppo Jaakola2012-06-121-3/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge with mariaDB 5.5.23: bzr merge lp:maria/5.5Seppo Jaakola2012-04-261-16/+90
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | Initial push of codership-wsrep API implementation for MariaDB. Seppo Jaakola2012-04-131-0/+8
| * | | | | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galeraSachin Setiya2017-11-031-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.32' into 10.0-galeraJan Lindström2017-08-091-6/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.31' into 10.0-galeraSachin Setiya2017-05-301-7/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '10.0' into bb-10.0-galeraSachin Setiya2017-03-201-6/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-mergeSachin Setiya2017-03-171-61/+76
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.29' into 10.0-galeraNirbhay Choubey2017-01-131-21/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | MDEV-16005 sporadic failures with galera tests MW-328B and MW-328Csjaakola2018-04-241-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2017-10-221-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2017-10-181-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2017-10-171-1/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | Bug#24763131 LOCAL-INFILE DEFAULT SHOULD BE DISABLEDVenkatesh Duggirala2017-08-231-1/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2017-08-081-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | move the error message where it belongsSergei Golubchik2017-07-271-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.5' into 10.0Vicențiu Ciorbaru2017-07-251-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'mysql/5.5' into 5.5Sergei Golubchik2017-07-181-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | |
View Lorry Controller Status