summaryrefslogtreecommitdiff
path: root/sql/slave.cc
Commit message (Expand)AuthorAgeFilesLines
* Removed some not needed when doing delete thd, which caused warnings aboutMonty2016-04-281-3/+2
* Merge branch '10.0' into 10.1Sergei Golubchik2016-03-211-0/+1
|\
| * MDEV-9595: Shutdown takes forever with many replication channelsKristian Nielsen2016-03-031-0/+1
* | MDEV-5273 Prepared statement doesn't return metadata after prepare.Alexey Botchkov2016-01-281-213/+212
* | Merge branch '10.0' into 10.1Sergei Golubchik2016-01-251-11/+10
|\ \ | |/
| * Merge branch 'tmp' into tmp-10.0Kristian Nielsen2016-01-151-9/+1
| |\
| * | Fixed bug in semi_sync replication tests.Monty2016-01-031-4/+4
| * | Cleanup of slave code:Monty2016-01-031-7/+6
* | | Merge branch 'tmp' into tmp-10.1Kristian Nielsen2016-01-151-9/+1
|\ \ \ | | |/ | |/|
| * | Fix error handling for GTID and domain-based parallel replicationKristian Nielsen2016-01-151-9/+1
* | | Merge branch '10.0' into 10.1Sergei Golubchik2015-12-211-9/+9
|\ \ \ | | |/ | |/|
| * | Fixes to get all test to run on MacosX Lion 10.7Monty2015-11-291-9/+9
| * | Merge branch 'mdev7818-4' into bb-10.0-knielsenKristian Nielsen2015-11-131-1/+6
| |\ \
| * | | MDEV-8476 Race condition in slave SQL thread shutdownMonty2015-11-121-4/+14
* | | | Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-11-191-21/+60
|\ \ \ \
| * \ \ \ Merge tag 'mariadb-10.0.22' into 10.0-galeraNirbhay Choubey2015-10-311-0/+6
| |\ \ \ \ | | |/ / /
| * | | | refs codership/mysql-wsrep#188Nirbhay Choubey2015-09-101-0/+2
| * | | | refs codership/mysql-wsrep#181Nirbhay Choubey2015-09-101-20/+59
| * | | | Merge tag 'mariadb-10.0.21' into 10.0-galeraNirbhay Choubey2015-08-081-10/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge tag 'mariadb-10.0.20' into 10.0-galeraNirbhay Choubey2015-06-211-6/+19
| |\ \ \ \
| * \ \ \ \ Merge tag 'mariadb-10.0.19' into 10.0-galeraNirbhay Choubey2015-05-091-26/+122
| |\ \ \ \ \
| * \ \ \ \ \ Merge tag 'mariadb-10.0.17' into 10.0-galeraNirbhay Choubey2015-02-271-3/+15
| |\ \ \ \ \ \
| * \ \ \ \ \ \ maria-10.0.16 mergeNirbhay Choubey2015-01-261-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-051-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-10.0.14 maria/10.0/Nirbhay Choubey2014-09-281-5/+90
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-111-80/+141
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-10.0.12 maria/10.0Nirbhay Choubey2014-06-191-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix for a build failure.Nirbhay Choubey2014-05-211-0/+1
| * | | | | | | | | | | | bzr merge -r3968..3984 codership/5.5 (non-Innodb changes only).Nirbhay Choubey2014-05-211-16/+35
| * | | | | | | | | | | | bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-211-11/+8
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merging mariadb-10.0.10.Nirbhay Choubey2014-04-081-11/+74
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merging revision from codership-mysql/5.5 (r3928..3968) andNirbhay Choubey2014-03-271-0/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | bzr merge -r4062..4065 codership/5.6Nirbhay Choubey2014-03-261-0/+1
| | * | | | | | | | | | | | | | bzr merge -r3946..3968 codership/5.5Nirbhay Choubey2014-03-251-0/+15
| * | | | | | | | | | | | | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-261-35/+83
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-251-5/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-041-346/+583
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Merge fix.Jan Lindström2013-09-091-17/+0
| * | | | | | | | | | | | | | | | | Merge 10.0 to galera-10.0Jan Lindström2013-09-031-57/+105
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merged with lp:maria revision #3766Seppo Jaakola2013-07-131-54/+325
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-131-0/+25
* | | | | | | | | | | | | | | | | | | | Incorrect statements binlogged on slave with do_domain_ids=(...)Nirbhay Choubey2015-11-181-16/+3
* | | | | | | | | | | | | | | | | | | | Merge branch 'mdev7818-4' into 10.1Kristian Nielsen2015-11-131-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Change Seconds_behind_master to be updated only at commit in parallel replica...Kristian Nielsen2015-11-131-1/+6
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-10-121-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | MDEV-4487 Allow replication from MySQL 5.6+ when GTID is enabled on the masterMonty2015-10-081-0/+6
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | MDEV-8264 encryption for binlogSergei Golubchik2015-09-041-1/+3
* | | | | | | | | | | | | | | | | | cleanup: Log_event::write() and MYSQL_BIN_LOG::write_cache()Sergei Golubchik2015-09-041-1/+1
* | | | | | | | | | | | | | | | | | cleanup: [partial] removal of llstr()Sergei Golubchik2015-09-041-98/+66
* | | | | | | | | | | | | | | | | | Revert f1abd015, make a smaller fixSergei Golubchik2015-09-041-2/+6
View Lorry Controller Status