summaryrefslogtreecommitdiff
path: root/sql/slave.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge from mysql-5.5-runtime to mysql-5.5-bugteamJon Olav Hauglid2010-11-181-3/+11
|\
| * Merge from mysql-5.5-bugteam to mysql-5.5-runtimeJon Olav Hauglid2010-11-171-1/+1
| |\
| * | Bug#37780: Make KILL reliable (main.kill fails randomly)Davi Arnaut2010-10-221-3/+11
* | | Bug#57306 SHOW PROCESSLIST does not display string literals well.Alexander Barkov2010-11-181-2/+2
| |/ |/|
* | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.Davi Arnaut2010-11-161-1/+1
|\ \ | |/ |/|
| * Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failureDavi Arnaut2010-11-101-1/+1
* | Manual mergeunknown2010-10-161-1/+11
|\ \ | |/
| * Bug#56118 STOP SLAVE does not wait till trx with CREATE TMP TABLE ends,unknown2010-10-161-1/+10
* | Automerge from mysql-5.1-bugteam into mysql-5.5-bugteam.Luis Soares2010-10-131-5/+59
|\ \ | |/
| * BUG 55263: automerged bzr bundle from bug report into Luis Soares2010-10-131-5/+59
| |\
| | * BUG#55263: assert in check_binlog_magicLuis Soares2010-09-241-5/+59
* | | Manual mergeunknown2010-10-091-3/+2
|\ \ \ | |/ /
| * | Bug#55375 Transaction bigger than max_binlog_cache_size crashes slaveunknown2010-10-091-1/+2
| |/
* | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2010-07-291-5/+2
|\ \
| * \ Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-201-5/+2
| |\ \ | | |/
| | * Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-201-5/+2
* | | Merge trunk-bugfixing -> trunk-runtime.Konstantin Osipov2010-07-271-12/+0
|\ \ \
| * | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-1/+0
| * | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-11/+0
| |/ /
* | | A pre-requisite patch for the fix for Bug#52044.Konstantin Osipov2010-07-271-1/+0
|/ /
* | Merge of mysql-trunk-bugfixing into mysql-trunk-merge.Davi Arnaut2010-07-151-4/+4
|\ \
| * | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-07-081-4/+4
* | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-091-4/+4
|\ \ \ | | |/ | |/|
* | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-021-3/+3
|\ \ \ | |/ / | | / | |/ |/|
| * Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-021-3/+3
| * BUG#53657: Slave crashed with error 22 when trying to lock mutexLuis Soares2010-05-241-2/+2
* | 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.unknown2010-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
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /