Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-02-05 | 1 | -3/+6 |
|\ | |||||
| * | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-19 | 1 | -3/+6 |
| |\ | |||||
| | * | Manual merge from mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-01-15 | 1 | -3/+6 |
| | |\ | |||||
| | | * | BUG #28421 Infinite loop on slave relay logs | unknown | 2010-01-08 | 1 | -3/+6 |
* | | | | BUG#50364: manual merge to mysql-next-mr-bugfixing. | Luis Soares | 2010-02-03 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | BUG#50364: FLUSH LOGS crashes the server (rpl.rpl_heartbeat_basic | Luis Soares | 2010-02-03 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Patch to eliminate warnings in mysql-next-mr-bugteam. | Mats Kindahl | 2010-01-25 | 1 | -2/+2 |
| |/ / |/| | | |||||
* | | | merge mysql-next-mr --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-14 | 1 | -16/+16 |
|\ \ \ | |||||
| * | | | WL#2360 Performance schema | Marc Alff | 2010-01-11 | 1 | -16/+16 |
* | | | | merge mysql-next-mr --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-13 | 1 | -45/+49 |
|\ \ \ \ | |/ / / | |||||
| * | | | WL#2360 Performance schema | Marc Alff | 2010-01-06 | 1 | -45/+49 |
* | | | | Manual merge from next-mr. | unknown | 2010-01-12 | 1 | -143/+8 |
|\ \ \ \ | |/ / / | |||||
| * | | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -143/+8 |
* | | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-07 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ... | Andrei Elkin | 2009-11-30 | 1 | -27/+6 |
| |\ \ \ | |||||
| * \ \ \ | merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade... | Andrei Elkin | 2009-11-10 | 1 | -10/+4 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Manual merge 5.1-rep+2 to 5.1-rep+3 | He Zhenxing | 2009-10-18 | 1 | -84/+399 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | merged fixes for BUG#39934 to 5.1-rpl+3 | Sven Sandberg | 2009-09-30 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merged fix for BUG#39934 up a few revisions. | Sven Sandberg | 2009-07-14 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-07-14 | 1 | -1/+1 |
* | | | | | | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-02 | 1 | -27/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Manual resolving for the following files | Andrei Elkin | 2009-12-01 | 1 | -27/+6 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | / / | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| | * | | | | | | | Bug #48463 backporting from 6.0-rpl to celosia a set of bugs | Andrei Elkin | 2009-11-20 | 1 | -19/+4 |
| | * | | | | | | | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest) | Luis Soares | 2009-11-13 | 1 | -8/+2 |
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| | | * | | | | | | BUG#48048: Deprecated constructs need removal in Betony | Luis Soares | 2009-11-04 | 1 | -8/+2 |
| | | | |_|_|/ / | | | |/| | | | | |||||
| | * | | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640 | Andrei Elkin | 2009-11-06 | 1 | -10/+4 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | / | | | | |_|_|/ | | | |/| | | | |||||
* | | | | | | | BUG#37148 Most callers of mysql_bin_log.write ignore the return result | He Zhenxing | 2009-11-21 | 1 | -5/+8 |
|/ / / / / / | |||||
* | | | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-02 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Automerge from mysql-next-mr. | Alexander Nozdrin | 2009-10-27 | 1 | -84/+399 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Automerge from mysql-next-mr. | Alexander Nozdrin | 2009-10-22 | 1 | -10/+4 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | bug#34741 prepared show master logs without binlogging debug assert | Sergei Golubchik | 2009-10-19 | 1 | -1/+1 |
* | | | | | | | | | Fix automerge: s/hash_search/my_hash_search/. | Alexander Nozdrin | 2009-10-28 | 1 | -1/+1 |
* | | | | | | | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-28 | 1 | -84/+399 |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Luis Soares | 2009-10-22 | 1 | -84/+399 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Postfix after merge semi-sync with heartbeat | He Zhenxing | 2009-10-14 | 1 | -2/+4 |
| | * | | | | | | Manual merge semi-sync to 5.1-rep+2 | He Zhenxing | 2009-10-03 | 1 | -38/+128 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Backporting WL#4398 WL#1720 | He Zhenxing | 2009-09-26 | 1 | -38/+126 |
| | | | |_|/ / / | | | |/| | | | | |||||
| | * | | | | | | Backport BUG#12190 CHANGE MASTER has differ path requiremts on MASTER_LOG_FIL... | He Zhenxing | 2009-10-02 | 1 | -2/+4 |
| | * | | | | | | merge from 5.1-rpl+2 repo to a local branch with HB and bug@27808 fixes | Andrei Elkin | 2009-10-01 | 1 | -17/+50 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Automerge: mysql-5.1-rep+2 (local backports) --> mysql-5.1-rep+2 (local latest) | Luis Soares | 2009-09-30 | 1 | -0/+13 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | BUG#28796: CHANGE MASTER TO MASTER_HOST="" leads to invalid master.info | Luis Soares | 2009-09-29 | 1 | -0/+13 |
| | | * | | | | | | | BUG#40337 Fsyncing master and relay log to disk after every event is too slow | Alfranio Correia | 2009-09-29 | 1 | -2/+10 |
| | | * | | | | | | | BUG#35542 Add option to sync master and relay log to disk after every event | Alfranio Correia | 2009-09-29 | 1 | -16/+2 |
| | | |/ / / / / / | |||||
| | | * | | | | | | BUG#28777, WL#4293: SHOW BINLOG EVENTS does not work on relay log | Luis Soares | 2009-09-29 | 1 | -10/+27 |
| | | |/ / / / / | |||||
| | * | | | | | | backporting bug@27808 fixes | Andrei Elkin | 2009-10-01 | 1 | -13/+45 |
| | * | | | | | | WL#342 heartbeat | Andrei Elkin | 2009-09-29 | 1 | -17/+173 |
| | |/ / / / / | |||||
* | | | | | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-23 | 1 | -10/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-10-14 | 1 | -10/+4 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | | | |/ / / | | |/| | | | |||||
| | * | | | | Bug #42914 Log event that larger than max_allowed_packet results in stop of s... | unknown | 2009-09-18 | 1 | -10/+4 |
| | |/ / / | |||||
* | | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1, | Konstantin Osipov | 2009-10-22 | 1 | -3/+3 |
|/ / / / |