summaryrefslogtreecommitdiff
path: root/sql/slave.cc
Commit message (Expand)AuthorAgeFilesLines
* 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 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 tag 'mariadb-10.0.32' into 10.0-galeraJan Lindström2017-08-091-6/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Bug#24901077: RESET SLAVE ALL DOES NOT ALWAYS RESET SLAVESujatha Sivakumar2017-02-281-1/+3
| | | * | | | | | | | | | | | | | | | | Bug#23251517: SEMISYNC REPLICATION HANGINGSujatha Sivakumar2016-05-131-26/+12
| * | | | | | | | | | | | | | | | | | | Fix for MDEV-9670 server_id mysteriously set to 0Andrei Elkin2017-07-021-3/+29
* | | | | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.31' into 10.0-galeraSachin Setiya2017-05-301-7/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Silence bogus GCC 7 warnings -Wimplicit-fallthroughMarko Mäkelä2017-05-171-3/+2
| * | | | | | | | | | | | | | | | | | | MDEV-9998 Fix issues caught by Clang's -Wpointer-bool-conversion warningSergei Golubchik2017-05-151-3/+2
| * | | | | | | | | | | | | | | | | | | MDEV-11201: gtid_ignore_duplicates incorrectly ignores statements when GTID r...Kristian Nielsen2017-04-101-1/+2
* | | | | | | | | | | | | | | | | | | | Merge branch '10.0' into bb-10.0-galeraSachin Setiya2017-03-201-6/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Wait for slave threads to start during startupMonty2017-03-161-6/+15
* | | | | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-mergeSachin Setiya2017-03-171-61/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Add protection to not access is_open() without LOCK_log mutexMonty2017-02-281-0/+4
| * | | | | | | | | | | | | | | | | | | Don't allow one to kill START SLAVE while the slaves IO_THREAD or SQL_THREADMonty2017-02-281-8/+10
| * | | | | | | | | | | | | | | | | | | Added error checking for all calls to flush_relay_log_info() and stmt_done()Monty2017-02-281-2/+12
| * | | | | | | | | | | | | | | | | | | Added a separate lock for start/stop/reset slave.Monty2017-02-281-15/+7
| * | | | | | | | | | | | | | | | | | | MDEV-9573 'Stop slave' hangs on replication slaveMonty2017-02-281-36/+43
* | | | | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.29' into 10.0-galeraNirbhay Choubey2017-01-131-21/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /