summaryrefslogtreecommitdiff
path: root/sql/slave.cc
Commit message (Expand)AuthorAgeFilesLines
* 5.2 merge.Sergei Golubchik2012-08-221-9/+16
|\
| * 5.1 mergeSergei Golubchik2012-08-221-9/+16
| |\
| | * merge with MySQL 5.1.65Sergei Golubchik2012-08-221-9/+16
| | |\
| | | * BUG#12400221 - 60926: BINARY LOG EVENTS LARGER THAN MAX_ALLOWED_PACKETManish Kumar2012-06-121-6/+6
| | | |\
| | | | * BUG#12400221 - 60926: BINARY LOG EVENTS LARGER THAN MAX_ALLOWED_PACKETManish Kumar2012-05-211-5/+6
| | | |/
| | | * Bug#12636001 : deadlock from thd_security_contextGopal Shankar2012-05-171-2/+2
| | | * BUG#11754117 incorrect logging of INSERT into auto-increment Andrei Elkin2012-04-201-1/+8
* | | | 5.2 mergeSergei Golubchik2012-05-201-10/+88
|\ \ \ \ | |/ / /
| * | | 5.1 mergeSergei Golubchik2012-05-181-10/+88
| |\ \ \ | | |/ /
| | * | post-merge fixesSergei Golubchik2012-05-181-1/+5
| | * | merge with mysql-5.1.63Sergei Golubchik2012-05-171-9/+83
| | |\ \ | | | |/
| | | * BUG#12400313 RELAY_LOG_SPACE_LIMIT IS NOT WORKING IN MANY CASESLuis Soares2012-03-121-9/+83
* | | | When we fail during slave thread initialisation, keep mi->run_lockunknown2012-02-131-4/+4
* | | | 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
| | | |\
| | | | * BUG#11762616: BUG#55229: 'POSTION' Luis Soares2011-05-061-3/+3
| | | * | Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | | |\ \ | | | | |/ | | | |/|
| | | | * Updated/added copyright headersKent Boortz2011-06-301-2/+3
* | | | | 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
* | | | | 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
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Postfix BUG#58546unknown2011-01-241-1/+1
| | | * | | Bug#58546 test rpl_packet timeout failure sporadically on PBLibing Song2011-01-191-11/+11
* | | | | | 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
| | |\ \ \ \ | | | |/ / /
| | | * | | BUG#46166: MYSQL_BIN_LOG::new_file_impl is not propagating error Luis Soares2010-11-301-5/+6
| | | |/ /
| | | * | Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failureDavi Arnaut2010-11-101-1/+1
* | | | | 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
| |\ \ \ | | |/ /
| | * | Bug#56118 STOP SLAVE does not wait till trx with CREATE TMP TABLE ends,unknown2010-10-161-1/+10
| | * | BUG 55263: automerged bzr bundle from bug report into Luis Soares2010-10-131-5/+59
| | |\ \
| | | * | BUG#55263: assert in check_binlog_magicLuis Soares2010-09-241-5/+59
| | * | | Bug#55375 Transaction bigger than max_binlog_cache_size crashes slaveunknown2010-10-091-1/+2
| | |/ /