Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-03-02 | 1 | -0/+3 |
|\ | |||||
| * | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-02-24 | 1 | -0/+3 |
| |\ | |||||
| | * | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-02-22 | 1 | -0/+3 |
| | |\ | |||||
| | | * | Bug #47905 stored procedures with conditional statements not | Staale Smedseng | 2010-02-11 | 1 | -0/+3 |
| | * | | Manual merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2010-01-30 | 1 | -0/+1 |
| | |\ \ | | | |/ | |||||
| | | * | Backport Bug#37148 to 5.1 | He Zhenxing | 2010-01-24 | 1 | -0/+1 |
* | | | | Followup to Bug#45225 Locking: hang if drop table with no timeout | Jon Olav Hauglid | 2010-02-24 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-06 | 1 | -2/+9 |
|\ \ \ | |||||
| * \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-19 | 1 | -2/+9 |
| |\ \ \ | | |/ / | |||||
| | * | | Fixed a build failure in mysql-trunk-merge caused by a bad | Alexey Kopytov | 2009-12-28 | 1 | -3/+3 |
| | * | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-25 | 1 | -2/+9 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#47649 crash during CALL procedure | Sergey Glukhov | 2009-12-23 | 1 | -2/+9 |
* | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-05 | 1 | -9/+8 |
|\ \ \ \ | |/ / / | |||||
| * | | | merge mysql-next-mr --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-14 | 1 | -3/+3 |
| |\ \ \ | |||||
| * \ \ \ | Manual merge from next-mr. | unknown | 2010-01-12 | 1 | -10/+11 |
| |\ \ \ \ | |||||
| * \ \ \ \ | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-07 | 1 | -10/+7 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1 | Alfranio Correia | 2009-12-17 | 1 | -10/+7 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ... | Andrei Elkin | 2009-11-30 | 1 | -21/+22 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | WL#2687 WL#5072 BUG#40278 BUG#47175 | Alfranio Correia | 2009-11-03 | 1 | -1/+1 |
| | | * | | | | | | Manual merge 5.1-rep+2 to 5.1-rep+3 | He Zhenxing | 2009-10-18 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | merged fixes for BUG#39934 to 5.1-rpl+3 | Sven Sandberg | 2009-09-30 | 1 | -9/+6 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-07-22 | 1 | -8/+5 |
| | | | * | | | | | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-07-14 | 1 | -1/+1 |
| | * | | | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Alfranio Correia | 2009-12-17 | 1 | -6/+18 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | / | | | | |_|_|_|_|_|/ | | | |/| | | | | | | |||||
* | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-04 | 1 | -0/+1 |
* | | | | | | | | | | Merge next-mr -> next-4284-merge. | Konstantin Osipov | 2010-02-04 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| * | | | | | | | | | WL#2360 Performance schema | Marc Alff | 2010-01-11 | 1 | -3/+3 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-03 | 1 | -10/+10 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -10/+10 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 1 | -10/+20 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge to latest mysql-next-mr | Mikael Ronstrom | 2009-12-16 | 1 | -6/+18 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-12 | 1 | -6/+18 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| | | * | | | | | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2009-12-11 | 1 | -33/+65 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Manual merge from the mysql-5.1-bugteam. | Alexey Kopytov | 2009-11-24 | 1 | -6/+18 |
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | | | |||||
| | | | * | | | | | | merge | Kristofer Pettersson | 2009-11-20 | 1 | -6/+18 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * | | | | | | Bug#45613 handle failures from my_hash_insert | Kristofer Pettersson | 2009-11-20 | 1 | -6/+18 |
| * | | | | | | | | | | Merge | Mikael Ronstrom | 2009-12-14 | 1 | -4/+2 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| * | | | | | | | | | | Merge WL#5138 to mysql-next-mr | Mikael Ronstrom | 2009-11-27 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | WL#5138, Fixed according to code review comments from Davi | Mikael Ronstrom | 2009-11-24 | 1 | -2/+2 |
| * | | | | | | | | | | | WL#5138, fixed review comments | Mikael Ronstrom | 2009-11-23 | 1 | -2/+0 |
| * | | | | | | | | | | | WL#5138 merged to mysql-next-mr | Mikael Ronstrom | 2009-11-20 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Backported my_atomic from 6.0-codebase and added support for 64-bit atomics t... | Mikael Ronstrom | 2009-10-12 | 1 | -2/+2 |
* | | | | | | | | | | | | | Implement new type-of-operation-aware metadata locks. | Dmitry Lenev | 2010-02-01 | 1 | -2/+4 |
* | | | | | | | | | | | | | Backport of | Tor Didriksen | 2010-01-12 | 1 | -5/+2 |
* | | | | | | | | | | | | | Apply and review: | Konstantin Osipov | 2009-12-29 | 1 | -11/+4 |
* | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2009-12-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-02 | 1 | -3/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Manual merge/pull from mysql-next-mr. | Alexander Nozdrin | 2009-11-25 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Auto merge | He Zhenxing | 2009-11-21 | 1 | -5/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge with next-mr | Konstantin Osipov | 2009-11-20 | 1 | -4/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / | | | |/| | | | | | | | | | | |