summaryrefslogtreecommitdiff
path: root/sql/slave.cc
Commit message (Expand)AuthorAgeFilesLines
* debug_sync is now a service, available to dynamically loaded plugins.Sergei Golubchik2012-03-281-3/+3
* mysql-5.5.22 mergeSergei Golubchik2012-03-281-2/+2
|\
| * Updated/added copyright headersMySQL Build Team2012-02-161-1/+1
| |\
* | \ merge with mysql-5.5.21Sergei Golubchik2012-03-091-34/+34
|\ \ \ | |/ /
| * | BUG#11752315 - 43460: STOP SLAVE UNABLE TO COMPLETE WHEN SLAVE THREAD IS TRYI...Manish Kumar2012-01-231-34/+34
* | | Merge MWL#234: @@skip_replication feature to MariaDB 5.5.unknown2012-03-011-1/+63
|\ \ \
| * | | MWL#234: Implement option to switch between master-side and client-side filte...unknown2011-08-161-2/+3
| * | | MWL#234: After-review fixes, including better names for the new system variab...unknown2011-08-121-13/+21
| * | | MWL#234: Support for marking binlog events to not be replicated, and for tell...unknown2011-08-111-0/+52
* | | | 5.3.4 mergeSergei Golubchik2012-02-151-4/+4
|\ \ \ \
| * | | | When we fail during slave thread initialisation, keep mi->run_lockunknown2012-02-131-4/+4
* | | | | mysql-5.5 mergeSergei Golubchik2012-01-161-2/+14
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | reverting the initial patch for bug#13437900 for refinement.Andrei Elkin2011-11-291-1/+1
| * | | | BUG#13427949: CHANGE MASTER TO USER='' (EMPTY USER) CAUSES ERRORS ON VALGRING Luis Soares2011-11-241-1/+13
* | | | | 5.3 mergeSergei Golubchik2012-01-131-2/+2
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge with 5.2.Michael Widenius2011-12-111-12/+16
| |\ \ \ \
| | * \ \ \ Merge with 5.1Michael Widenius2011-11-301-1/+1
| | |\ \ \ \
| | | * | | | Fixed compiler warningsMichael Widenius2011-11-301-1/+1
| | * | | | | Merge with MariaDB 5.1Michael Widenius2011-11-241-11/+15
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-11/+15
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | BUG#11878104: FIXES OF BUG 11752963 - 44312 TO BACKPORT TO MYSQL-5.1Rohit Kalhans2011-08-261-5/+6
| | | | * | | Updated/added copyright headersKent Boortz2011-07-031-3/+3
| | | | |\ \ \
* | | | | | | | After-merge fixes for 5.5 merge.unknown2011-12-141-1/+5
* | | | | | | | 5.3->5.5 mergeSergei Golubchik2011-11-221-4/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fixed test case that changed when max_user_connections was made signed.Michael Widenius2011-09-271-0/+1
| * | | | | | | Automatic mergeMichael Widenius2011-09-261-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ...Michael Widenius2011-09-231-1/+1
| * | | | | | | | fix typo: binlog_annotate_rows_events -> binlog_annotate_row_eventsSergei Golubchik2011-09-231-3/+3
| |/ / / / / / /
| * | | | | | | Merge with 5.2Michael Widenius2011-09-101-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Fixed that automatic killing of delayed insert thread (in flush, alter table ...Michael Widenius2011-09-091-0/+1
| | | |_|_|_|/ | | |/| | | |
* | | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-2/+6
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Bug#12897501 REPLICATION DOES NOT SUPPORT WINDOWS AUTH PLUG-IN Rafal Somla2011-09-141-0/+4
| * | | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+2
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | |\ \ \ \ \
| | | * | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+3
* | | | | | | | cleanupsSergei Golubchik2011-10-191-5/+2
* | | | | | | | safe_mutex deadlock detector post-merge fixesSergei Golubchik2011-10-191-2/+4
* | | | | | | | merge with 5.3Sergei Golubchik2011-10-191-27/+343
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge with 5.1-microsecondsMichael Widenius2011-05-281-1/+5
| |\ \ \ \ \ \ \
| | * | | | | | | lp:705210 Compiling with BUILD/compile-pentium64-debug failsSergei Golubchik2011-03-261-1/+1
| | * | | | | | | wl#173 - temporal types with sub-second resolutionSergei Golubchik2011-03-011-1/+5
| * | | | | | | | Merge with MariaDB 5.2Michael Widenius2011-05-101-12/+13
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | Merge with MariaDB 5.1Michael Widenius2011-05-031-12/+13
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | | * | | | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-12/+13
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| * | | | | | | | Backport MySQL WL#2540 into MariaDB.unknown2011-05-031-12/+293
| * | | | | | | | Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl.unknown2011-04-011-5/+6
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-5/+6
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-5/+6
| | | |\ \ \ \ \ \
| * | | | | | | | | Merge Percona patch MWL#47 into mariadb 5.2-percona.unknown2011-01-101-15/+48
| |/ / / / / / / /
| * | | | | | | | merge with 5.1Michael Widenius2010-11-301-7/+71
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /