summaryrefslogtreecommitdiff
path: root/sql/slave.cc
Commit message (Expand)AuthorAgeFilesLines
* manual merge 5.0-runtime -> 5.1->runtime, with 25411 part Iunknown2007-04-251-1/+2
* Merge romeo.(none):/home/bk/merge-mysql-5.0unknown2007-04-201-0/+1
|\
| * BUG#26551 (Aborted query for non-transactional table breaks replication):unknown2007-04-121-0/+1
| * Merge polly.local:/tmp/maint/bug23775/my50-bug23775unknown2007-03-201-1/+2
| |\
* | \ Merge romeo.(none):/home/bkroot/mysql-5.1-rplunknown2007-04-201-2/+4
|\ \ \
| * | | Fixed federated and some replication tests to not stop slave until it's up an...unknown2007-04-171-2/+4
* | | | Reverting to use time_t instead of my_time_t since the latter causedunknown2007-04-171-1/+1
* | | | Fixing portability problem by using my_time_t instead of time_t.unknown2007-04-131-3/+2
* | | | Merge romeo.(none):/home/bkroot/mysql-5.1-new-rplunknown2007-04-121-19/+21
|\ \ \ \ | |/ / / |/| | |
| * | | BUG#25688 (RBR: circular replication may cause STMT_END_F flags to beunknown2007-04-121-19/+21
* | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1unknown2007-04-021-0/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Merge pilot.blaudden:/home/msvensson/mysql/bug19991/my51-bug19991unknown2007-03-291-0/+9
| |\ \ \
| | * | | Bug#19991 CHANGE MASTER need option ssl-verify-server-certunknown2007-03-291-0/+9
* | | | | Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rplunknown2007-03-291-2/+17
|\ \ \ \ \
| * \ \ \ \ Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rplunknown2007-03-291-2/+17
| |\ \ \ \ \
| | * \ \ \ \ Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rplunknown2007-03-261-2/+17
| | |\ \ \ \ \
| | | * | | | | WL#3629 - Replication of Invocation and Invoked Featuresunknown2007-03-161-2/+17
* | | | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rplunknown2007-03-291-85/+113
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | |
| * | | | | | Eliminating some compiler warnings.unknown2007-03-271-2/+2
| |/ / / / /
| * | | | | Merge romeo.(none):/home/bkroot/mysql-5.1-new-rplunknown2007-03-221-83/+111
| |\ \ \ \ \
| | * | | | | BUG#23171: Illegal group log positionunknown2007-03-221-18/+79
| | * | | | | BUG#23171 (Illegal slave restart position):unknown2007-01-171-58/+17
| | * | | | | BUG#23171 (Illegal slave restart group position):unknown2006-11-101-6/+14
* | | | | | | Merge polly.local:/tmp/maint/bug23775/my51-bug23775unknown2007-03-201-1/+2
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge polly.local:/tmp/maint/bug23775/my50-bug23775unknown2007-03-161-1/+2
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Fix for bug #23775 "Replicated event larger that max_allowed_packet infinitel...unknown2007-03-161-1/+2
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-03-161-0/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-02-261-8/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-02-211-0/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | WL#3700: Handler API change: all index search methods - that is,unknown2007-01-291-0/+2
| | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | Removing global events_till_disconnect variable as it is replaced by a member...unknown2007-03-021-3/+0
* | | | | | | | | Merge rsomla@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rplunknown2007-03-011-0/+4
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rplunknown2007-03-011-0/+4
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Removing two more compilation warnings.unknown2007-03-011-0/+2
* | | | | | | | | | Fixing manual merge error.unknown2007-03-011-7/+0
|/ / / / / / / / /
* | | | | | | | | Merge quant.(none):/ext/mysql/bk/mysql-5.0-bug25306unknown2007-03-011-6/+23
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | / / | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rplunknown2007-02-271-5/+14
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rplunknown2007-02-231-5/+14
| | |\ \ \ \ \ \ \
| | | * | | | | | | BUG#25306 (Race conditions during replication slave shutdown (valgrind stacks)):unknown2007-02-031-5/+14
| | | | |_|_|/ / / | | | |/| | | | |
| * | | | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rplunknown2007-02-251-0/+64
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rplunknown2007-02-241-0/+64
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-02-211-13/+17
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-02-051-1/+7
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rplunknown2007-02-251-0/+64
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rplunknown2007-02-241-0/+64
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge dl145h.mysql.com:/users/gbichot/mysql-5.0-rplunknown2007-02-231-2/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | the fix for BUG#24432unknown2007-02-231-2/+2
| | | | |_|_|/ / / / / | | | |/| | | | | | |
| | * | | | | | | | | Manual merge from 5.0-rpl, of fixes for:unknown2007-02-151-20/+20
| | * | | | | | | | | Merge gbichot3.local:/home/mysql_src/mysql-5.0-rpl-25507unknown2007-02-151-0/+64
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | / / / | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | | * | | | | | | Fix for BUG#24432unknown2007-02-081-0/+64
| | | | |_|_|/ / / | | | |/| | | | |