Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge | Mikael Ronström | 2011-02-10 | 31 | -79/+589 |
|\ | |||||
| * | Merge from mysql-5.5.9-release | Jonathan Perkin | 2011-02-08 | 10 | -4/+135 |
| |\ | |||||
| | * | merge | Georgi Kodinov | 2011-01-12 | 3 | -4110/+26 |
| | |\ | |||||
| | * | | BUG#59267 LOAD DATA LOCAL INFILE not executed on slave with SBR | Alfranio Correia | 2011-01-12 | 2 | -2/+39 |
| | * | | merge | Georgi Kodinov | 2011-01-10 | 10 | -37/+162 |
| | |\ \ | |||||
| | * \ \ | automerge | Georgi Kodinov | 2011-01-07 | 67 | -254/+1580 |
| | |\ \ \ | |||||
| | * \ \ \ | merge | Georgi Kodinov | 2010-12-23 | 2 | -2/+2 |
| | |\ \ \ \ | |||||
| | | * | | | | fixed the binlog problem | Georgi Kodinov | 2010-12-23 | 2 | -2/+2 |
| | | * | | | | merge | Georgi Kodinov | 2010-12-23 | 626 | -4205/+3345 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | merge | Georgi Kodinov | 2010-12-17 | 28 | -250/+1304 |
| | | |\ \ \ \ \ | |||||
| | * | \ \ \ \ \ | merge | Georgi Kodinov | 2010-12-23 | 1006 | -329063/+3523 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | merge | Georgi Kodinov | 2010-12-17 | 81 | -427/+2341 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | merge 5.1-security => 5.5-security | Kristofer Pettersson | 2010-12-16 | 3 | -0/+30 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | | | |||||
| | | * | | | | | | | | Bug58747 57359 patch: breaks secure_file_priv+not secure yet+still accesses o... | Kristofer Pettersson | 2010-12-16 | 3 | -0/+30 |
| | * | | | | | | | | | Merge from mysql-5.1-security to mysql-5.5-security. | Sunny Bains | 2010-11-30 | 3 | -0/+64 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | |||||
| | | * | | | | | | | | Fix Bug# 56228 - Dropping tables from within an active statement crashes server | Sunny Bains | 2010-11-30 | 3 | -0/+73 |
| * | | | | | | | | | | bzr merger from mysql-5.1 to mysql-5.5 | Vinay Fisrekar | 2011-02-07 | 2 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Bug#59955 - engines/funcs/ps_string_not_null test needs better cleanup | Vinay Fisrekar | 2011-02-07 | 2 | -1/+1 |
| * | | | | | | | | | | | Bug#43828, Bug#59494. | Serge Kozlov | 2011-02-04 | 2 | -15/+34 |
| * | | | | | | | | | | | BUG#59147: automerge mysql-5.1 into mysql-5.5. | Luis Soares | 2011-02-04 | 2 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | BUG#59147: Automerged bzr bundle form bug report into mysql-5.1 . | Luis Soares | 2011-02-04 | 2 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | BUG#59147: rpl_circular_for_4_hosts fails sporadically | Luis Soares | 2011-02-03 | 2 | -4/+4 |
| * | | | | | | | | | | | | Merged fix for bug #58650 "Failing assertion: | Dmitry Lenev | 2011-02-02 | 1 | -0/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | Fix for bug #58650 "Failing assertion: primary_key_no == -1 || | Dmitry Lenev | 2011-02-02 | 2 | -0/+24 |
| | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | Post-fix for BUG#59338. | Alfranio Correia | 2011-01-31 | 2 | -3/+3 |
| * | | | | | | | | | | | merge mysql-5.1 --> mysql-5.5 | Alfranio Correia | 2011-01-31 | 6 | -41/+74 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | merge mysql-5.1 (local) --> mysql-5.1 | Alfranio Correia | 2011-01-31 | 1 | -1/+0 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | BUG#55675 rpl.rpl_log_pos fails sporadically with error binlog truncated in t... | Alfranio Correia | 2011-01-28 | 1 | -1/+0 |
| | * | | | | | | | | | | | merge mysql-5.1 (local) --> mysql-5.1 | Alfranio Correia | 2011-01-31 | 4 | -40/+75 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | BUG#59338 Inconsistency in binlog for statements that don't change any rows S... | Alfranio Correia | 2011-01-28 | 4 | -40/+75 |
| | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | | Merge mysql-5.1-innodb -> mysql-5.1 | Vasil Dimov | 2011-01-30 | 6 | -0/+622 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge mysql-5.1 -> mysql-5.1-innodb | Vasil Dimov | 2011-01-24 | 8 | -4120/+141 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | \ \ \ \ \ \ \ \ \ \ \ | Merge mysql-5.5-innodb -> mysql-5.5 | Vasil Dimov | 2011-01-30 | 4 | -0/+313 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge mysql-5.5 -> mysql-5.5-innodb | Vasil Dimov | 2011-01-24 | 24 | -4480/+520 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge from mysql-5.1-innodb to mysql-5.5-innodb | Jimmy Yang | 2011-01-14 | 3 | -0/+308 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | Fix Bug#30423 "InnoDBs treatment of NULL in index stats causes bad | Jimmy Yang | 2011-01-14 | 4 | -0/+612 |
| | * | | | | | | | | | | | | | | | Merge mysql-5.1-innodb -> mysql-5.5-innodb | Vasil Dimov | 2011-01-12 | 1 | -0/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | | Suppress InnoDB warning about long semaphore wait if running under Valgrind | Vasil Dimov | 2011-01-12 | 2 | -0/+10 |
| * | | | | | | | | | | | | | | | | merge | Mattias Jonsson | 2011-01-28 | 4 | -14/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | merge | Mattias Jonsson | 2011-01-27 | 7 | -18/+20 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | Bug#59418: parts suite have several failures with --embedded-server | Mattias Jonsson | 2011-01-18 | 7 | -18/+20 |
| | * | | | | | | | | | | | | | | | due to merge. | Horst.Hunger | 2011-01-27 | 2 | -0/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge | Mattias Jonsson | 2011-01-26 | 2 | -0/+9 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | Bug#57924: crash when creating partitioned table with | Mattias Jonsson | 2011-01-10 | 2 | -0/+9 |
| | * | | | | | | | | | | | | | | | | | Merge of results of the review done in 5.1-bugteam to 5.1. | Horst.Hunger | 2011-01-27 | 7 | -4/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | 2. review update for bug#52501 fixing a syntax error, a not actual result fil... | Horst.Hunger | 2010-11-11 | 7 | -4/+7 |
| * | | | | | | | | | | | | | | | | | | merge mysql-5.1 --> mysql-5.5 | Alfranio Correia | 2011-01-26 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | | | | | | | | / / / / / / / / / / / | | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Disabled rpl_row_until and rpl_stm_until due to BUG#59543. | Alfranio Correia | 2011-01-26 | 1 | -0/+2 |
| | | |_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | merge | Mikael Ronstrom | 2011-01-20 | 14 | -304/+377 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | Manual merge | Libing Song | 2011-01-19 | 3 | -2/+106 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / |