summaryrefslogtreecommitdiff
path: root/sql/slave.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge with MySQL 5.1.53Michael Widenius2010-11-251-7/+71
| | |\ \ \ \ \ \ \
* | | | | | | | | | merge with xtradb-5.5.15Sergei Golubchik2011-07-181-0/+8
* | | | | | | | | | 5.5-mergeSergei Golubchik2011-07-021-61/+133
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | BUG#11762616: BUG#55229: 'POSTION'Luis Soares2011-05-061-3/+3
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | BUG#11762616: BUG#55229: 'POSTION' Luis Soares2011-05-061-3/+3
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | BUG#11877568 - RPL_SEMI_SYNC FAILS IN PBAlfranio Correia2011-03-161-10/+10
| * | | | | | | | Manual Merge.unknown2011-01-241-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Postfix BUG#58546unknown2011-01-241-1/+1
| * | | | | | | | Manual mergeLibing Song2011-01-191-24/+24
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Bug#58546 test rpl_packet timeout failure sporadically on PBLibing Song2011-01-191-11/+11
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | BUG#46166Luis Soares2010-12-071-1/+2
| * | | | | | | BUG#46166Luis Soares2010-12-071-6/+7
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | BUG#46166: MYSQL_BIN_LOG::new_file_impl is not propagating error Luis Soares2010-11-301-5/+6
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge from mysql-5.5-runtime to mysql-5.5-bugteamJon Olav Hauglid2010-11-181-3/+11
| |\ \ \ \ \ \
View Lorry Controller Status