summaryrefslogtreecommitdiff
path: root/sql/sql_repl.cc
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-051-3/+6
|\
| * Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-191-3/+6
| |\
| | * Manual merge from mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-151-3/+6
| | |\
| | | * BUG #28421 Infinite loop on slave relay logsunknown2010-01-081-3/+6
* | | | BUG#50364: manual merge to mysql-next-mr-bugfixing.Luis Soares2010-02-031-1/+1
|\ \ \ \
| * | | | BUG#50364: FLUSH LOGS crashes the server (rpl.rpl_heartbeat_basicLuis Soares2010-02-031-1/+1
| | |/ / | |/| |
* | | | Patch to eliminate warnings in mysql-next-mr-bugteam.Mats Kindahl2010-01-251-2/+2
| |/ / |/| |
* | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-141-16/+16
|\ \ \
| * | | WL#2360 Performance schemaMarc Alff2010-01-111-16/+16
* | | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-131-45/+49
|\ \ \ \ | |/ / /
| * | | WL#2360 Performance schemaMarc Alff2010-01-061-45/+49
* | | | Manual merge from next-mr.unknown2010-01-121-143/+8
|\ \ \ \ | |/ / /
| * | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-143/+8
* | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...Andrei Elkin2009-11-301-27/+6
| |\ \ \
| * \ \ \ merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade...Andrei Elkin2009-11-101-10/+4
| |\ \ \ \
| * \ \ \ \ Manual merge 5.1-rep+2 to 5.1-rep+3He Zhenxing2009-10-181-84/+399
| |\ \ \ \ \
| * \ \ \ \ \ merged fixes for BUG#39934 to 5.1-rpl+3Sven Sandberg2009-09-301-1/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merged fix for BUG#39934 up a few revisions.Sven Sandberg2009-07-141-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-141-1/+1
* | | | | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-021-27/+6
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Manual resolving for the following filesAndrei Elkin2009-12-011-27/+6
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | / / | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | Bug #48463 backporting from 6.0-rpl to celosia a set of bugsAndrei Elkin2009-11-201-19/+4
| | * | | | | | | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)Luis Soares2009-11-131-8/+2
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | | * | | | | | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-041-8/+2
| | | | |_|_|/ / | | | |/| | | |
| | * | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640Andrei Elkin2009-11-061-10/+4
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | / | | | | |_|_|/ | | | |/| | |
* | | | | | | BUG#37148 Most callers of mysql_bin_log.write ignore the return resultHe Zhenxing2009-11-211-5/+8
|/ / / / / /
* | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-021-1/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Automerge from mysql-next-mr.Alexander Nozdrin2009-10-271-84/+399
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Automerge from mysql-next-mr.Alexander Nozdrin2009-10-221-10/+4
| |\ \ \ \ \ \ \
| * | | | | | | | bug#34741 prepared show master logs without binlogging debug assertSergei Golubchik2009-10-191-1/+1
* | | | | | | | | Fix automerge: s/hash_search/my_hash_search/.Alexander Nozdrin2009-10-281-1/+1
* | | | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-281-84/+399
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-221-84/+399
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | |
| | * | | | | | Postfix after merge semi-sync with heartbeatHe Zhenxing2009-10-141-2/+4
| | * | | | | | Manual merge semi-sync to 5.1-rep+2He Zhenxing2009-10-031-38/+128
| | |\ \ \ \ \ \
| | | * | | | | | Backporting WL#4398 WL#1720He Zhenxing2009-09-261-38/+126
| | | | |_|/ / / | | | |/| | | |
| | * | | | | | Backport BUG#12190 CHANGE MASTER has differ path requiremts on MASTER_LOG_FIL...He Zhenxing2009-10-021-2/+4
| | * | | | | | merge from 5.1-rpl+2 repo to a local branch with HB and bug@27808 fixesAndrei Elkin2009-10-011-17/+50
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Automerge: mysql-5.1-rep+2 (local backports) --> mysql-5.1-rep+2 (local latest)Luis Soares2009-09-301-0/+13
| | | |\ \ \ \ \ \
| | | | * | | | | | BUG#28796: CHANGE MASTER TO MASTER_HOST="" leads to invalid master.infoLuis Soares2009-09-291-0/+13
| | | * | | | | | | BUG#40337 Fsyncing master and relay log to disk after every event is too slowAlfranio Correia2009-09-291-2/+10
| | | * | | | | | | BUG#35542 Add option to sync master and relay log to disk after every eventAlfranio Correia2009-09-291-16/+2
| | | |/ / / / / /
| | | * | | | | | BUG#28777, WL#4293: SHOW BINLOG EVENTS does not work on relay logLuis Soares2009-09-291-10/+27
| | | |/ / / / /
| | * | | | | | backporting bug@27808 fixesAndrei Elkin2009-10-011-13/+45
| | * | | | | | WL#342 heartbeatAndrei Elkin2009-09-291-17/+173
| | |/ / / / /
* | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-231-10/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-141-10/+4
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | | | |/ / / | | |/| | |
| | * | | | Bug #42914 Log event that larger than max_allowed_packet results in stop of s...unknown2009-09-181-10/+4
| | |/ / /
* | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,Konstantin Osipov2009-10-221-3/+3
|/ / / /