Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge mysql-next-mr --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-13 | 1 | -46/+59 |
|\ | |||||
| * | WL#2360 Performance schema | Marc Alff | 2010-01-06 | 1 | -46/+59 |
* | | Manual merge from next-mr. | unknown | 2010-01-12 | 1 | -39/+31 |
|\ \ | |/ | |||||
| * | Manual merge of WL#4738 from mysql-next-mr: | Alexey Kopytov | 2009-12-28 | 1 | -37/+29 |
| |\ | |||||
| | * | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -37/+29 |
| * | | Backport of WL #2934: Make/find library for doing float/double | Alexey Kopytov | 2009-12-22 | 1 | -3/+3 |
| |/ | |||||
* | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-07 | 1 | -61/+185 |
|\ \ | |/ |/| | |||||
| * | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1 | Alfranio Correia | 2009-12-17 | 1 | -23/+126 |
| |\ | |||||
| | * | mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ... | Andrei Elkin | 2009-11-30 | 1 | -8/+8 |
| | |\ | |||||
| | * \ | merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade... | Andrei Elkin | 2009-11-10 | 1 | -47/+70 |
| | |\ \ | |||||
| | * | | | WL#2687 WL#5072 BUG#40278 BUG#47175 | Alfranio Correia | 2009-11-03 | 1 | -12/+101 |
| | * | | | Manual merge 5.1-rep+2 to 5.1-rep+3 | He Zhenxing | 2009-10-18 | 1 | -38/+73 |
| | |\ \ \ | |||||
| | * \ \ \ | merged fixes for BUG#39934 to 5.1-rpl+3 | Sven Sandberg | 2009-09-30 | 1 | -12/+25 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merged fix for BUG#39934 up a few revisions. | Sven Sandberg | 2009-07-14 | 1 | -9/+22 |
| | | |\ \ \ \ | |||||
| | | | * | | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-07-14 | 1 | -9/+22 |
| * | | | | | | | Merging with mysql-5.1-rpl+2 | Mats Kindahl | 2009-12-16 | 1 | -30/+34 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | WL#5151: Conversion between different types when | Mats Kindahl | 2009-12-16 | 1 | -30/+34 |
| * | | | | | | | | Merging with mysql-5.1-rep+2 | Mats Kindahl | 2009-12-15 | 1 | -8/+25 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | BUG#49618: Field length stored incorrectly in binary log | Mats Kindahl | 2009-12-15 | 1 | -4/+6 |
| | * | | | | | | WL#5151: Conversion between different types when replicating | Mats Kindahl | 2009-12-14 | 1 | -4/+19 |
| * | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Andrei Elkin | 2009-11-30 | 1 | -8/+8 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640 | Andrei Elkin | 2009-11-06 | 1 | -47/+69 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | / | | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Auto-merge from mysql-next-mr-summit0.3. | Alexander Nozdrin | 2009-12-16 | 1 | -10/+3 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge | Mikael Ronstrom | 2009-12-14 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge WL#5138 to mysql-next-mr | Mikael Ronstrom | 2009-11-27 | 1 | -3/+2 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | WL#5138, Fixed according to code review comments from Davi | Mikael Ronstrom | 2009-11-24 | 1 | -3/+2 |
| * | | | | | | | | | WL#5138, fixed review comments | Mikael Ronstrom | 2009-11-23 | 1 | -6/+0 |
| * | | | | | | | | | WL#5138 merged to mysql-next-mr | Mikael Ronstrom | 2009-11-20 | 1 | -6/+6 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Backported my_atomic from 6.0-codebase and added support for 64-bit atomics t... | Mikael Ronstrom | 2009-10-12 | 1 | -6/+6 |
* | | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-16 | 1 | -4/+9 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-16 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Bug #34628 LOAD DATA CONCURRENT INFILE drops CONCURRENT in binary log | unknown | 2009-12-15 | 1 | -0/+4 |
| * | | | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-11 | 1 | -4/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | / / / / / / / / / | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Automerge bzr bundle in bug report into local mysql-5.1-bugteam latest. | Luis Soares | 2009-12-07 | 1 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | BUG#48357: SHOW BINLOG EVENTS: Wrong offset or I/O error | Luis Soares | 2009-11-09 | 1 | -4/+4 |
| | | | |_|_|_|/ / / / | | | |/| | | | | | | | |||||
| | * | | | | | | | | | Automerge bzr bundle from bug report. | Luis Soares | 2009-12-06 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | BUG#48340: rpl_cross_version: Found warnings/errors in server log file! | Luis Soares | 2009-11-24 | 1 | -0/+1 |
| | | |/ / / / / / / / | |||||
| | * | | | | | | | | | merge 5.1-bugteam (local) --> 5.1-bugteam | Alfranio Correia | 2009-11-21 | 1 | -4/+12 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| | | * | | | | | | | | BUG#48091 valgrind errors when slave has double not null and master has doubl... | Alfranio Correia | 2009-10-22 | 1 | -6/+11 |
| | | * | | | | | | | | BUG#48091 valgrind errors when slave has double not null and master has doubl... | Alfranio Correia | 2009-10-22 | 1 | -1/+4 |
* | | | | | | | | | | | Manual merge/pull from mysql-next-mr. | Alexander Nozdrin | 2009-11-25 | 1 | -6/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Backport of: | Konstantin Osipov | 2009-11-24 | 1 | -4/+4 |
| * | | | | | | | | | | Backport of: | Konstantin Osipov | 2009-11-23 | 1 | -2/+1 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | BUG#37148 Most callers of mysql_bin_log.write ignore the return result | He Zhenxing | 2009-11-21 | 1 | -3/+3 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-10 | 1 | -15/+15 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | backport of dbug extensions from 6.0: | Sergei Golubchik | 2009-10-30 | 1 | -15/+15 |
* | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Bug#46640: output from mysqlbinlog command in 5.1 breaks replication | unknown | 2009-10-23 | 1 | -1/+1 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-05 | 1 | -7/+7 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | / / / / / / / | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Bug #40877: multi statement execution fails in 5.1.30 | Georgi Kodinov | 2009-10-16 | 1 | -7/+7 |
| | |_|/ / / / | |/| | | | | |