summaryrefslogtreecommitdiff
path: root/sql/repl_failsafe.cc
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-121-1/+6
|\
| * Manual merge from mysql-trunk.Alexander Nozdrin2009-12-111-13/+14
| |\
| * | Bug#45613 handle failures from my_hash_insertKristofer Pettersson2009-11-201-1/+6
* | | Manual resolving for the following filesAndrei Elkin2009-12-011-330/+2
|\ \ \ | |_|/ |/| |
| * | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)Luis Soares2009-11-131-324/+0
| |\ \
| | * | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-041-324/+0
| * | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640Andrei Elkin2009-11-061-1/+3
| |\ \ \ | | |/ / | |/| / | | |/
| * | Bug#13963 SHOW SLAVE HOSTS is unreliableunknown2009-10-201-6/+2
* | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-231-1/+3
|\ \ \
| * \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-141-1/+3
| |\ \ \ | | | |/ | | |/|
| | * | A patch for Bug#47474 (mysqld hits Dbug_violation_helper assertAlexander Nozdrin2009-09-231-1/+3
| | |/
* | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,Konstantin Osipov2009-10-221-2/+2
* | | Backport of:Konstantin Osipov2009-10-141-10/+11
|/ /
* | WL#2110 (SIGNAL)Marc Alff2009-09-101-1/+1
|/
* BUG#41924: high-level replication functions are not commentedSven Sandberg2009-01-091-0/+10
* Merge stella.local:/home2/mydev/mysql-5.0-axmrgunknown2008-03-201-1/+1
|\
| * Make gcov happy.unknown2008-03-181-1/+1
* | Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/...unknown2008-03-071-6/+9
|\ \
| * \ Merge mysql.com:/home/svoj/devel/mysql/BUG22989/mysql-5.0-enginesunknown2008-01-311-6/+9
| |\ \ | | |/
| | * BUG#22989 - START SLAVE causes Error on COM_REGISTER_SLAVE: 1105unknown2008-01-311-6/+9
* | | Bug#34655 Compile errorunknown2008-02-281-1/+1
* | | Rename send_eof() to my_eof() for consistency with my_ok() and my_error()unknown2008-02-191-2/+2
* | | Rename send_ok to my_ok. Similarly to my_error, it only records the status,unknown2008-02-191-1/+1
|/ /
* | Merge ramayana.hindu.god:/home/tsmith/m/bk/51unknown2008-01-221-1/+1
|\ \
| * \ Merge kaamos.(none):/data/src/mysql-5.1unknown2008-01-101-1/+1
| |\ \
| | * \ Merge mysql.com:/misc/mysql/31752_/50-31752_unknown2007-11-261-1/+1
| | |\ \ | | | |/
| | | * Merge mysql.com:/misc/mysql/31752_/41-31752_unknown2007-11-261-1/+1
| | | |\
| | | | * Bug#31752: check strmake() boundsunknown2007-11-261-1/+1
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2007-12-201-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | Bug#12713 "Error in a stored function called from a SELECT doesn't unknown2007-12-121-1/+3
| |/ / /
* | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-forcollapseandmergeunknown2007-12-141-22/+41
|\ \ \ \
| * | | | Doxygenized comments.unknown2007-10-111-22/+41
| |/ / /
* | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-comeng-unificationunknown2007-10-171-11/+11
|\ \ \ \ | |/ / /
| * | | Renaming MASTER_INFO to Master_info in order to follow the codingunknown2007-08-161-3/+3
| * | | WL#3817: Simplify string / memory area types and make things more consistent ...unknown2007-05-101-8/+8
* | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-enterprise-former...unknown2007-04-271-5/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-04-031-5/+5
| |\ \ \ | | |/ / | |/| |
| | * | Merge mysqldev@production.mysql.com:my/build-200702201448-5.0.36/mysql-5.0-re...unknown2007-02-271-5/+5
| | |\ \
| | | * | Prevent bugs by making DBUG_* expressions syntactically equivalent unknown2007-02-221-5/+5
| | | * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-communityunknown2007-01-031-3/+3
| | | |\ \
| | | | * | Bug#24795: Add SHOW PROFILEunknown2007-01-031-3/+3
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-02-211-6/+6
| |\ \ \ \ \ | | |/ / / / | |/| | | |
* | | | | | Merge romeo.(none):/home/bkroot/mysql-5.1-new-rplunknown2007-04-121-0/+1
|\ \ \ \ \ \
| * | | | | | BUG#25688 (RBR: circular replication may cause STMT_END_F flags to beunknown2007-04-121-0/+1
* | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/bug19991/my51-bug19991unknown2007-03-291-0/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Bug#19991 CHANGE MASTER need option ssl-verify-server-certunknown2007-03-291-0/+4
* | | | | | | Fixed compiler warningsunknown2007-02-231-8/+4
|/ / / / / /
* | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1unknown2007-02-061-6/+6
|\ \ \ \ \ \
| * \ \ \ \ \ Merge mysql.com:/home/my/mysql-5.0unknown2007-01-271-6/+6
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-01-221-6/+6
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
View Lorry Controller Status