Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-31 | 1 | -0/+1 | |
|\ | ||||||
| * | Manual merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2010-01-30 | 1 | -3/+4 | |
| |\ | ||||||
| | * | Backport Bug#37148 to 5.1 | He Zhenxing | 2010-01-24 | 1 | -3/+4 | |
* | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-19 | 1 | -1/+5 | |
|\ \ \ | |/ / | ||||||
| * | | Manual merge from mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-01-15 | 1 | -1/+5 | |
| |\ \ | | |/ | ||||||
| | * | Bug#48157: crash in Item_field::used_tables | Martin Hansson | 2010-01-12 | 1 | -1/+5 | |
* | | | merge mysql-next-mr --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-13 | 1 | -4/+5 | |
|\ \ \ | ||||||
| * | | | WL#2360 Performance schema | Marc Alff | 2010-01-06 | 1 | -4/+5 | |
* | | | | Manual merge from next-mr. | unknown | 2010-01-12 | 1 | -9/+10 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -9/+10 | |
* | | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-07 | 1 | -30/+19 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ... | Andrei Elkin | 2009-11-30 | 1 | -3/+8 | |
| |\ \ \ | ||||||
| * | | | | WL#2687 WL#5072 BUG#40278 BUG#47175 | Alfranio Correia | 2009-11-03 | 1 | -15/+18 | |
| * | | | | merged fixes for BUG#39934 to 5.1-rpl+3 | Sven Sandberg | 2009-09-30 | 1 | -13/+0 | |
| |\ \ \ \ | ||||||
| | * \ \ \ | Merged fix for BUG#39934 up a few revisions. | Sven Sandberg | 2009-07-14 | 1 | -13/+0 | |
| | |\ \ \ \ | ||||||
| | | * | | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-07-14 | 1 | -13/+0 | |
* | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | ||||||
| * | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-16 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | ||||||
| | * | | | | | Merging | unknown | 2009-12-14 | 1 | -1/+1 | |
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | ||||||
| | | * | | | | This is a patch for Bug#48500 | unknown | 2009-12-14 | 1 | -2/+2 | |
| | | * | | | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-08-28 | 1 | -3/+1 | |
* | | | | | | | Manual merge/pull from mysql-next-mr. | Alexander Nozdrin | 2009-11-25 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Backport of: | Konstantin Osipov | 2009-11-24 | 1 | -2/+2 | |
* | | | | | | | | Auto merge | He Zhenxing | 2009-11-21 | 1 | -8/+10 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Manual merge of mysql-next-mr-runtime upstream. | Davi Arnaut | 2009-11-19 | 1 | -8/+10 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| | * | | | | | | Backport of Bug#15192 to mysql-next-mr | Davi Arnaut | 2009-11-10 | 1 | -8/+10 | |
* | | | | | | | | BUG#37148 Most callers of mysql_bin_log.write ignore the return result | He Zhenxing | 2009-11-21 | 1 | -3/+4 | |
|/ / / / / / / | ||||||
* | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -0/+5 | |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | * | | | | | | automerge | Jon Olav Hauglid | 2009-10-23 | 1 | -0/+5 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | Bug #47919 assert in open_table during ALTER temporary table | Jon Olav Hauglid | 2009-10-23 | 1 | -0/+5 | |
| | | | |_|/ / / | | | |/| | | | | ||||||
* | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-05 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -3/+3 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | Bug #40877: multi statement execution fails in 5.1.30 | Georgi Kodinov | 2009-10-16 | 1 | -3/+3 | |
| | |/ / / / | ||||||
* | | | | | | Merge with next-mr-runtime. | Konstantin Osipov | 2009-10-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Automerge | Kristofer Pettersson | 2009-10-19 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | Bug#27145 EXTRA_ACL troubles | Kristofer Pettersson | 2009-10-19 | 1 | -1/+1 | |
* | | | | | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1, | Konstantin Osipov | 2009-10-22 | 1 | -1/+0 | |
| |/ / / / / / |/| | | | | | | ||||||
* | | | | | | | Backport of 2617.65.4 from 6.0-codebase. | Konstantin Osipov | 2009-10-16 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | WL#2110 (SIGNAL) | Marc Alff | 2009-09-10 | 1 | -3/+4 | |
|/ / / / / | ||||||
* | | | | | Merge from mysql-5.1-bugteam | Alexander Nozdrin | 2009-08-26 | 1 | -0/+1 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Bug#46616: Merge | Martin Hansson | 2009-08-20 | 1 | -0/+1 | |
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| | | ||||||
| | * | | Bug#46616: Assertion `!table->auto_increment_field_not_null' on | Martin Hansson | 2009-08-20 | 1 | -0/+1 | |
* | | | | merge of 5.1-main into mysql-trunk. | Guilhem Bichot | 2009-08-12 | 1 | -2/+9 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge of the fix for bug #40113 to 5.1. | Georgi Kodinov | 2009-07-13 | 1 | -2/+9 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Bug #40113: Embedded SELECT inside UPDATE or DELETE can timeout | Georgi Kodinov | 2009-07-13 | 1 | -2/+9 | |
* | | | | Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}: | Guilhem Bichot | 2009-08-04 | 1 | -14/+55 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | auto-merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteam | Alfranio Correia | 2009-06-18 | 1 | -4/+2 | |
| |\ \ \ | ||||||
| | * | | | BUG#43929 binlog corruption when max_binlog_cache_size is exceeded | Alfranio Correia | 2009-06-18 | 1 | -4/+2 | |
| | | |/ | | |/| | ||||||
| | | | | ||||||
| | \ \ | ||||||
| *-. \ \ | Merge from 5.0-bugteam | Staale Smedseng | 2009-06-17 | 1 | -1/+1 | |
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ |