Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed problems in merge | Michael Widenius | 2009-05-19 | 1 | -5/+5 |
|\ | |||||
| * | We are now using Valgrind rather than purify, and have for quite some time. | unknown | 2009-05-06 | 1 | -5/+5 |
* | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -22/+33 |
|\ \ | |||||
| * | | bug#42977 | Andrei Elkin | 2009-03-26 | 1 | -1/+1 |
| * | | Bug#42977 RBR logs for rows with more than 250 column results in corrupt binlog | Andrei Elkin | 2009-03-25 | 1 | -5/+9 |
| * | | auto-merge 5.1-bugteam (local) --> 5.1-bugteam | Alfranio Correia | 2009-03-22 | 1 | -1/+11 |
| |\ \ | |||||
| | * | | Bug #42861 Assigning invalid directories to --slave-load-tmpdir crashes the s... | Alfranio Correia | 2009-03-18 | 1 | -1/+11 |
| * | | | fixed compilation warnings. addendum to the fix for bug 29125 | Georgi Kodinov | 2009-03-20 | 1 | -3/+0 |
| * | | | auto-merge | Ignacio Galarza | 2009-03-19 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * \ \ | Merge | Leonard Zhou | 2009-03-16 | 1 | -3/+3 |
| | |\ \ \ | | | |/ / | |||||
| | * | | | BUG#22504 load data infile sql statement in replication architecture get error | Leonard Zhou | 2009-03-16 | 1 | -2/+2 |
| * | | | | auto-merge | Ignacio Galarza | 2009-03-17 | 1 | -3/+3 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-13 | 1 | -11/+11 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-10 | 1 | -18/+18 |
* | | | | | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -16/+79 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -3/+3 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | merging bug#37313fixes from 5.0-bt to 5.1-bt | Andrei Elkin | 2009-02-24 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | fixing compilation warning and adding flush logs to test of bug#37313 | Andrei Elkin | 2009-02-24 | 1 | -1/+1 |
| | * | | | | Manual merge mysql-5.0-bugteam -> mysql-5.1-bugteam. | Alexey Kopytov | 2009-02-23 | 1 | -1/+1 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Bug #37313 BINLOG Contains Incorrect server id | Andrei Elkin | 2009-02-20 | 1 | -1/+1 |
| | | | |/ | | | |/| | |||||
| | * | | | BUG#38174 secure-file-priv breaks LOAD DATA INFILE replication in statement mode | Alfranio Correia | 2009-02-21 | 1 | -2/+2 |
| | | |/ | | |/| | |||||
| * | | | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria. | Guilhem Bichot | 2009-03-11 | 1 | -13/+76 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug #41183 rpl_ndb_circular, rpl_ndb_circular_simplex need maintenance, crash | Andrei Elkin | 2009-02-04 | 1 | -1/+2 |
| | * | | Bug #41183 rpl_ndb_circular, rpl_ndb_circular_simplex need maintenance, crash | Andrei Elkin | 2009-02-04 | 1 | -13/+75 |
* | | | | Merge with mysql-maria tree | Michael Widenius | 2009-02-19 | 1 | -2/+9 |
|\ \ \ \ | |/ / / | |||||
| * | | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -36/+93 |
| |\ \ \ | | |/ / | |||||
| | * | | merged 5.1-main -> 5.1-bugteam | Georgi Kodinov | 2009-01-30 | 1 | -21/+21 |
| | |\ \ | |||||
| | * | | | Bug #31240 load data infile replication between (4.0 or 4.1) and 5.1 fails | Andrei Elkin | 2009-01-22 | 1 | -2/+9 |
* | | | | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -35/+84 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | merge: 5.1 -> 5.1-rpl | Luis Soares | 2009-01-23 | 1 | -13/+62 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Auto merge | He Zhenxing | 2009-01-14 | 1 | -8/+46 |
| | |\ \ \ | |||||
| | | * \ \ | merge fix of BUG#41961 in 5.1-bugteam with recent changes in 5.1-bugteam | Sven Sandberg | 2009-01-09 | 1 | -1/+1 |
| | | |\ \ \ | |||||
| | | * | | | | BUG#41961: Some log_event types do not skip post-header when reading | Sven Sandberg | 2009-01-09 | 1 | -8/+46 |
| | * | | | | | BUG#41986 Replication slave does not pick up proper AUTO_INCREMENT value for ... | He Zhenxing | 2009-01-14 | 1 | -0/+4 |
| | | |/ / / | | |/| | | | |||||
| | * | | | | merged 5.1-main -> 5.1-bugteam | Georgi Kodinov | 2009-01-05 | 1 | -1/+1 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | BUG#40482: server/mysqlbinlog crashes when reading invalid Incident_log_event | Sven Sandberg | 2008-12-29 | 1 | -4/+11 |
| | * | | | | Fix warnings and bug spotted by gcc-4.3. | Davi Arnaut | 2008-12-16 | 1 | -1/+1 |
| * | | | | | merge: 5.1 -> 5.1-rpl | Luis Soares | 2009-01-08 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Added "Sun Microsystems, Inc." to copyright headers on files modified | Build Team | 2008-11-10 | 1 | -1/+1 |
| | |/ / / | |||||
| * | | | | merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-r... | Andrei Elkin | 2008-11-12 | 1 | -8/+30 |
| |\ \ \ \ | | |/ / / | |||||
| * | | | | Merging 5.1 main into 5.1-rpl | Mats Kindahl | 2008-10-23 | 1 | -6/+25 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merging 5.1 main into 5.1-rpl. | Mats Kindahl | 2008-10-06 | 1 | -2/+3 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Auto Merge | He Zhenxing | 2008-09-29 | 1 | -7/+581 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge 5.1 main -> 5.1-rpl | He Zhenxing | 2008-09-06 | 1 | -7/+581 |
| | |\ \ \ \ \ \ | |||||
| * | | | | | | | | BUG#38734 rpl_server_id2 sync_with_master failed | He Zhenxing | 2008-09-28 | 1 | -18/+16 |
| |/ / / / / / / | |||||
| * | | | | | | | Auto merge | He Zhenxing | 2008-08-06 | 1 | -1/+7 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | merged 5.1 main to 5.1-rpl | Sven Sandberg | 2008-08-04 | 1 | -3/+5 |
| | |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | | BUG#37051 Replication rules not evaluated correctly | He Zhenxing | 2008-07-31 | 1 | -21/+31 |
| | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge 5.1->5.1-rpl | Magnus Svensson | 2008-05-30 | 1 | -137/+36 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl | unknown | 2008-04-02 | 1 | -3/+5 |
| |\ \ \ \ \ \ \ \ \ |