summaryrefslogtreecommitdiff
path: root/sql/slave.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge sita.local:/Users/tsmith/m/bk/maint/51-target22tsmith@sita.local2007-08-291-27/+64
|\
| * BUG#29968 (rpl_ndb_circular.test and rpl_ndb_log.test fail):mats@kindahl-laptop.dnsalias.net2007-08-291-27/+64
* | Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rplmats@kindahl-laptop.dnsalias.net2007-08-171-71/+71
|\ \ | |/ |/|
| * Renaming MASTER_INFO to Master_info in order to follow the codingmats@kindahl-laptop.dnsalias.net2007-08-161-42/+42
| * Renaming RELAY_LOG_INFO and st_relay_log_info to follow coding standardsmats@kindahl-laptop.dnsalias.net2007-08-161-30/+30
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.1monty@nosik.monty.fi2007-08-021-3/+4
|\ \ | |/ |/|
| * Slow query log to file now displays queries with microsecond precissionmonty@mysql.com/nosik.monty.fi2007-07-301-3/+4
* | WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)malff/marcsql@weblab.(none)2007-07-271-1/+1
|/
* Merge polly.local:/home/kaa/src/maint/bug24192/my51-bug24192kaa@polly.local2007-07-111-5/+9
|\
| * Merge polly.local:/home/kaa/src/maint/bug24192/my50-bug24192kaa@polly.local2007-07-111-5/+9
| |\
| | * Fix for bug #24192 "MySQL replication does not exit server when running out o...kaa@polly.local2007-07-111-13/+17
* | | Fix for bug #19328: Slave timeout with COM_REGISTER_SLAVE error causing stopramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-06-291-100/+208
* | | BUG#24954 (Last_errno and Last_error not set after master_retry_count hasmats@kindahl-laptop.dnsalias.net2007-06-111-17/+17
* | | Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-rplmats@kindahl-laptop.dnsalias.net2007-06-091-118/+86
|\ \ \
| * | | BUG#24954 (Last_errno and Last_error not set after master_retry_count was rea...mats@kindahl-laptop.dnsalias.net2007-06-091-118/+87
* | | | Merge quant.(none):/ext/mysql/bk/mysql-5.1-bug21123rafal@quant.(none)2007-06-071-3/+4
|\ \ \ \
| * | | | BUG#21123 (Slave fails to reconnect on update_slave_list):rafal@quant.(none)2007-05-311-2/+3
| * | | | BUG#21132 (Slave fails to reconnect on update_slave_list)rafal@quant.(none)2007-05-281-1/+1
* | | | | Added casts to avoid compiler warnings and fixed a wrong type.jani@a88-113-38-195.elisa-laajakaista.fi2007-05-311-2/+2
* | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@a88-113-38-195.elisa-laajakaista.fi2007-05-241-15/+15
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | WL#3817: Simplify string / memory area types and make things more consistent ...monty@mysql.com/narttu.mysql.fi2007-05-101-15/+15
| | |/ / | |/| |
* | | | manual merge 5.0-runtime -> 5.1->runtime, with 25411 part Imalff/marcsql@weblab.(none)2007-04-251-1/+2
|/ / /
* | | Merge romeo.(none):/home/bk/merge-mysql-5.0mats@romeo.(none)2007-04-201-0/+1
|\ \ \ | | |/ | |/|
| * | BUG#26551 (Aborted query for non-transactional table breaks replication):mats@romeo.(none)2007-04-121-0/+1
| * | Merge polly.local:/tmp/maint/bug23775/my50-bug23775kaa@polly.local2007-03-201-1/+2
| |\ \
* | \ \ Merge romeo.(none):/home/bkroot/mysql-5.1-rplmats@romeo.(none)2007-04-201-2/+4
|\ \ \ \
| * | | | Fixed federated and some replication tests to not stop slave until it's up an...monty@mysql.com/narttu.mysql.fi2007-04-171-2/+4
* | | | | Reverting to use time_t instead of my_time_t since the latter causedmats@romeo.(none)2007-04-171-1/+1
* | | | | Fixing portability problem by using my_time_t instead of time_t.mats@romeo.(none)2007-04-131-3/+2
* | | | | Merge romeo.(none):/home/bkroot/mysql-5.1-new-rplmats@romeo.(none)2007-04-121-19/+21
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | BUG#25688 (RBR: circular replication may cause STMT_END_F flags to bemats@romeo.(none)2007-04-121-19/+21
* | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1msvensson@pilot.blaudden2007-04-021-0/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge pilot.blaudden:/home/msvensson/mysql/bug19991/my51-bug19991msvensson@pilot.blaudden2007-03-291-0/+9
| |\ \ \ \
| | * | | | Bug#19991 CHANGE MASTER need option ssl-verify-server-certmsvensson@pilot.blaudden2007-03-291-0/+9
* | | | | | Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rplcbell/Chuck@mysql_cab_desk.2007-03-291-2/+17
|\ \ \ \ \ \
| * \ \ \ \ \ Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rplcbell/Chuck@mysql_cab_desk.2007-03-291-2/+17
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rplcbell/Chuck@mysql_cab_desk.2007-03-261-2/+17
| | |\ \ \ \ \ \
| | | * | | | | | WL#3629 - Replication of Invocation and Invoked Featurescbell/Chuck@mysql_cab_desk.2007-03-161-2/+17
* | | | | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2007-03-291-85/+113
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Eliminating some compiler warnings.mats@romeo.(none)2007-03-271-2/+2
| |/ / / / / /
| * | | | | | Merge romeo.(none):/home/bkroot/mysql-5.1-new-rplmats@romeo.(none)2007-03-221-83/+111
| |\ \ \ \ \ \
| | * | | | | | BUG#23171: Illegal group log positionmats@romeo.(none)2007-03-221-18/+79
| | * | | | | | BUG#23171 (Illegal slave restart position):mats@romeo.(none)2007-01-171-58/+17
| | * | | | | | BUG#23171 (Illegal slave restart group position):mats@romeo.(none)2006-11-101-6/+14
* | | | | | | | Merge polly.local:/tmp/maint/bug23775/my51-bug23775kaa@polly.local2007-03-201-1/+2
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge polly.local:/tmp/maint/bug23775/my50-bug23775kaa@polly.local2007-03-161-1/+2
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Fix for bug #23775 "Replicated event larger that max_allowed_packet infinitel...kaa@polly.local2007-03-161-1/+2
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1serg@janus.mylan2007-03-161-0/+2
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1serg@janus.mylan2007-02-261-8/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1serg@janus.mylan2007-02-211-0/+2
| |\ \ \ \ \ \ \ \ \