summaryrefslogtreecommitdiff
path: root/sql/slave.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \
| | * | | | WL#3700: Handler API change: all index search methods - that is,serg@janus.mylan2007-01-291-0/+2
| | | |/ / | | |/| |
* | | | | Removing global events_till_disconnect variable as it is replaced by a member...rafal@quant.(none)2007-03-021-3/+0
* | | | | Merge rsomla@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rplrafal@quant.(none)2007-03-011-0/+4
|\ \ \ \ \
| * \ \ \ \ Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpllars/lthalmann@dl145k.mysql.com2007-03-011-0/+4
| |\ \ \ \ \
| | * | | | | Removing two more compilation warnings.rafal@quant.(none)2007-03-011-0/+2
* | | | | | | Fixing manual merge error.rafal@quant.(none)2007-03-011-7/+0
|/ / / / / /
* | | | | | Merge quant.(none):/ext/mysql/bk/mysql-5.0-bug25306rafal@quant.(none)2007-03-011-6/+23
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rplrafal@quant.(none)2007-02-271-5/+14
| |\ \ \ \ \
| | * \ \ \ \ Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rplrafal@quant.(none)2007-02-231-5/+14
| | |\ \ \ \ \
| | | * | | | | BUG#25306 (Race conditions during replication slave shutdown (valgrind stacks)):rafal@quant.(none)2007-02-031-5/+14
| | | | |_|_|/ | | | |/| | |
| * | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpllars/lthalmann@mysql.com/dl145j.mysql.com2007-02-251-0/+64
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpllars/lthalmann@mysql.com/dl145h.mysql.com2007-02-241-0/+64
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-02-211-13/+17
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintramil/ram@mysql.com/myoffice.izhnet.ru2007-02-051-1/+7
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2007-02-251-0/+64
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145h.mysql.com2007-02-241-0/+64
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | Merge dl145h.mysql.com:/users/gbichot/mysql-5.0-rplgbichot@dl145h.mysql.com2007-02-231-2/+2
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | | * | | | | | | the fix for BUG#24432gbichot@dl145h.mysql.com2007-02-231-2/+2
| | | | |_|_|/ / / | | | |/| | | | |
| | * | | | | | | Manual merge from 5.0-rpl, of fixes for:guilhem@gbichot3.local2007-02-151-20/+20
| | * | | | | | | Merge gbichot3.local:/home/mysql_src/mysql-5.0-rpl-25507guilhem@gbichot3.local2007-02-151-0/+64
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | / | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Fix for BUG#24432guilhem@gbichot3.local2007-02-081-0/+64
| | | | |_|_|/ | | | |/| | |
* | | | | | | Fixed compiler warningsmonty@mysql.com/narttu.mysql.fi2007-02-231-8/+1
|/ / / / / /
* | | | | | Merge siva.hindu.god:/home/tsmith/m/bk/51tsmith@siva.hindu.god2007-02-081-1/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1tomas@poseidon.mysql.com2007-02-051-1/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge dev3-63.(none):/home/zhl/mysql/tree-merge/5.1/mysql-5.1-new-ndb-bjlzhou/zhl@dev3-63.(none)2007-02-011-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Merge dli@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bjdli@dev3-164.dev.cn.tlan2006-12-221-1/+1
| | | |\ \ \ \ \
| | | | * | | | | ndb - fixed for BUG#19896 Last_Errno: 4294967295, Error in Write_rows event: ...dli@dev3-164.dev.cn.tlan2006-12-221-1/+1
* | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1msvensson@neptunus.(none)2007-02-061-11/+15
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | After merge fixesmonty@mysql.com/narttu.mysql.fi2007-01-291-0/+1
| * | | | | | | | Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2007-01-271-11/+14
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-01-221-13/+17
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | After merge fixes:monty@mysql.com/narttu.mysql.fi2006-12-151-1/+3
| | | * | | | | Fixed compiler warnings detected by option -Wshadow and -Wunused:monty@mysql.com/narttu.mysql.fi2006-12-151-12/+14
* | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maintramil/ram@myoffice.izhnet.ru2007-02-051-1/+7
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge mysql.com:/usr/home/ram/work/bug10798/my50-bug10798ramil/ram@myoffice.izhnet.ru2007-02-051-1/+7
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Merge mysql.com:/usr/home/ram/work/bug10798/my41-bug10798ramil/ram@mysql.com/myoffice.izhnet.ru2007-02-051-1/+7
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | Fix for bug #10798: If relay log fails to rotate, slave will crash afterramil/ram@mysql.com/myoffice.izhnet.ru2006-12-181-0/+7
* | | | | | | | | Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943msvensson@pilot.mysql.com2007-01-291-1/+0
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943msvensson@pilot.mysql.com2007-01-291-1/+0
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Bug#22943 syscall pruning in libmysqlmsvensson@pilot.mysql.com2007-01-291-1/+0
| | | |_|/ / / | | |/| | | |
* | | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2007-01-121-0/+5
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge romeo.(none):/home/bk/b22864-mysql-5.1-new-rplmats@romeo.(none)2006-12-211-0/+5
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | BUG#22864 (Rollback following CREATE... SELECT discards 'CREATE TABLE'mats@romeo.(none)2006-12-211-0/+6
* | | | | | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-231-2/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |