summaryrefslogtreecommitdiff
path: root/sql/repl_failsafe.cc
Commit message (Expand)AuthorAgeFilesLines
* MDEV-6152: Remove calls to current_thd while creating ItemMonty2015-08-271-8/+17
* Stage 2 of MDEV-6152:Monty2015-08-211-6/+7
* MDEV-8010 - Avoid sql_alloc() in Items (Patch #1)Sergey Vojtovich2015-08-211-6/+6
* MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-301-0/+1
* Merge 10.0-base -> 10.0 (GTID).unknown2013-04-171-4/+5
|\
| * MDEV-500: Session variable for server_idunknown2012-10-231-4/+5
* | 10.0-base -> 10.0-montySergei Golubchik2012-10-191-1/+0
|\ \ | |/
| * Merge from 5.3unknown2012-08-241-1/+0
| |\
* | | fixes for test failuresSergei Golubchik2012-09-271-2/+0
|/ /
* | 5.3 mergeSergei Golubchik2012-01-131-1/+2
|\ \ | |/
| * Merge with 5.2.Michael Widenius2011-12-111-2/+4
| |\
| | * Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-2/+4
| | |\
* | | \ mysql-5.5.18 mergeSergei Golubchik2011-11-031-2/+2
|\ \ \ \
| * \ \ \ Updated/added copyright headersKent Boortz2011-06-301-2/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | |\ \ \
| | | * \ \ Merge chunk from trunk.Chad MILLER2008-07-101-6/+9
| | | |\ \ \
| | | * \ \ \ Merge chunk from trunk.Chad MILLER2008-07-101-1/+1
| | | |\ \ \ \
* | | | \ \ \ \ merge with 5.3Sergei Golubchik2011-10-191-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
| * | | | | | Backport MySQL WL#2540 into MariaDB.unknown2011-05-031-2/+4
| | |_|_|_|/ | |/| | | |
| * | | | | Merge with MySQL 5.1.49Michael Widenius2010-08-021-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | BUG#53657: Slave crashed with error 22 when trying to lock mutexLuis Soares2010-05-241-1/+1
| | * | | | Bug#49501 Inefficient information_schema check (system collation), addonSergey Glukhov2010-01-221-1/+1
| | * | | | Bug#49501 Inefficient information_schema check (system collation)Sergey Glukhov2010-01-191-1/+1
| * | | | | Fix a bunch of Windows warningsBo Thorsen2010-04-211-0/+5
| |/ / / /
* | | | | WL#5670: Proposal: Remove SHOW NEW MASTER statementSven Sandberg2011-02-161-366/+0
* | | | | Fix for crash in mysqld --verbose --help while initializing optionLuis Soares2010-10-111-2/+2
* | | | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-3/+0
* | | | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-96/+0
* | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-07-081-2/+2
* | | | | WL#5419 "LOCK_open scalability: make tdc_refresh_version Konstantin Osipov2010-06-111-1/+0
* | | | | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-1/+4
* | | | | Patch to eliminate warnings in mysql-next-mr-bugteam.Mats Kindahl2010-01-251-1/+1
* | | | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-141-4/+4
|\ \ \ \ \
| * | | | | WL#2360 Performance schemaMarc Alff2010-01-111-4/+4
* | | | | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-131-32/+57
|\ \ \ \ \ \ | |/ / / / /
| * | | | | WL#2360 Performance schemaMarc Alff2010-01-061-32/+57
* | | | | | Manual merge from next-mr.unknown2010-01-121-5/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-5/+2
* | | | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-2/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1Alfranio Correia2009-12-211-2/+9
| |\ \ \ \ \
| | * | | | | BUG#49259: Slave I/O thread could not register on masterLuis Soares2009-12-181-2/+9
| * | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Alfranio Correia2009-12-171-1/+6
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / /
* | | | | | 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