summaryrefslogtreecommitdiff
path: root/sql/slave.cc
Commit message (Expand)AuthorAgeFilesLines
* A pre-requisite for WL#5419 "LOCK_open scalability: Konstantin Osipov2010-06-101-1/+0
* Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-05-091-0/+31
|\
| * BUG#43407 SET GLOBAL SQL_SLAVE_SKIP_COUNTER should log previous state in erro...Alfranio Correia2010-05-041-0/+31
* | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-4/+13
* | Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-241-425/+315
|\ \
| * | Followup to Bug#45225 Locking: hang if drop table with no timeoutJon Olav Hauglid2010-02-241-0/+2
| * | BUG#50364: Automerge from mysql-trunk-bugfixing.Luis Soares2010-02-221-1/+1
| |\ \
| * \ \ Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-151-9/+9
| |\ \ \
| | * \ \ BUG#50364: manual merge to mysql-next-mr-bugfixing.Luis Soares2010-02-031-3/+3
| | |\ \ \
| | * | | | Patch to eliminate warnings in mysql-next-mr-bugteam.Mats Kindahl2010-01-251-6/+6
| * | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-051-4/+44
| |\ \ \ \ \ | | |/ / / /
| | * | | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-141-10/+10
| | |\ \ \ \
| | * \ \ \ \ merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-131-141/+183
| | |\ \ \ \ \
| | * \ \ \ \ \ Manual merge from next-mr.2010-01-121-8/+11
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-4/+44
| | |\ \ \ \ \ \ \
| | | * | | | | | | BUG#49259: Slave I/O thread could not register on masterLuis Soares2009-12-181-0/+6
| | | * | | | | | | merging 5.1->rep+2->rep+3Andrei Elkin2009-12-021-193/+0
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...Andrei Elkin2009-11-301-45/+10
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | BUG#44188: STOP SLAVE should flush info files and relay logs.Luis Soares2009-11-131-4/+38
| * | | | | | | | | | | Merge next-mr -> next-4284-merge.Konstantin Osipov2010-02-041-10/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| | * | | | | | | | | | WL#2360 Performance schemaMarc Alff2010-01-111-10/+10
| | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge next-mr -> next-4284Konstantin Osipov2010-02-031-136/+178
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | WL#2360 Performance schemaMarc Alff2010-01-061-136/+178
| | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-031-8/+11
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-8/+11
| | |/ / / / / / /
| * | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-4/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Auto-merge from mysql-next-mr-summit0.3.Alexander Nozdrin2009-12-161-2/+15
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-161-4/+2
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-2/+15
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | MergeMikael Ronstrom2009-12-141-257/+47
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | * | | | | | | | | Fixed an issue where STOP SLAVE generated a warning to error log which test c...Mikael Ronstrom2009-12-141-2/+15
| * | | | | | | | | | A prerequisite patch for the fix for Bug#46224Konstantin Osipov2009-12-221-2/+1
| * | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2009-12-161-1/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-021-256/+47
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Manual merge/pull from mysql-next-mr.Alexander Nozdrin2009-11-251-6/+3
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Bug#32115: Bad use of Name_resolution_context from current LEX in partitioningMattias Jonsson2009-11-201-1/+0
| * | | | | | | | | | | Backport of revno ## 2617.31.1, 2617.31.3, 2617.31.4, 2617.31.5,Konstantin Osipov2009-12-051-0/+3
| * | | | | | | | | | | Backport of:Konstantin Osipov2009-12-031-1/+2
| | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Manual resolving for the following filesAndrei Elkin2009-12-011-256/+47
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | / / / / | | | |_|_|_|/ / / / | | |/| | | | | | |
| | * | | | | | | | fixing the prev "auto"-merge that carried a piece of deprecated code (existin...Andrei Elkin2009-11-301-193/+0
| | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-301-0/+193
| | |\ \ \ \ \ \ \
| | * | | | | | | | Bug #48463 backporting from 6.0-rpl to celosia a set of bugsAndrei Elkin2009-11-201-5/+5
| | * | | | | | | | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)Luis Soares2009-11-131-231/+3
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | | * | | | | | | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-041-231/+3
| | * | | | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640Andrei Elkin2009-11-061-54/+56
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Bug#13963 SHOW SLAVE HOSTS is unreliable2009-10-201-8/+28
| * | | | | | | | | Backport of:Konstantin Osipov2009-11-231-6/+3
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-03-221-3/+30
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Bug #51648 DBUG_SYNC_POINT is not defined on all platforms and mtr cant pre-...Andrei Elkin2010-03-191-3/+30
* | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-03-071-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | |