| Commit message (Expand) | Author | Age | Files | Lines |
* | Manual merge from mysql-5.1-bugteam. | Alexey Kopytov | 2010-06-12 | 1 | -8/+14 |
|\ |
|
| * | Addendum for the fix for bug #42064: | Alexey Kopytov | 2010-06-12 | 1 | -7/+12 |
| * | Manual merge from the bugfix tree. | Alexey Kopytov | 2010-06-11 | 1 | -6/+9 |
| |\ |
|
* | \ | Manual merge from mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-06-11 | 1 | -8/+13 |
|\ \ \ |
|
| * \ \ | Manual merge from the bugfix tree. | Alexey Kopytov | 2010-06-11 | 1 | -6/+9 |
| |\ \ \
| | |/ /
| |/| /
| | |/ |
|
| | * | Bug #42064: low memory crash when importing hex strings, in | Alexey Kopytov | 2010-05-21 | 1 | -6/+9 |
* | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-06-10 | 1 | -9/+8 |
|\ \ \
| |/ / |
|
| * | | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -9/+8 |
| |/ |
|
* | | Clean-up, give better names, add comments to | Konstantin Osipov | 2010-05-06 | 1 | -1/+1 |
* | | Followup to Bug#42546 Backup: RESTORE fails, thinking it finds an existing table | Jon Olav Hauglid | 2010-05-04 | 1 | -1/+1 |
* | | WL#5030: Splitting mysql_priv.h | Mats Kindahl | 2010-04-07 | 1 | -0/+1 |
* | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -1/+15 |
* | | A fix for Bug#49972 "Crash in prepared statements": | Konstantin Osipov | 2010-03-11 | 1 | -2/+1 |
* | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-06 | 1 | -0/+4 |
|\ \ |
|
| * \ | Auto-merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-27 | 1 | -0/+2 |
| |\ \
| | |/ |
|
| | * | BUG#47418 RBR fails, failure with mixup of base/temporary/view | unknown | 2010-01-16 | 1 | -0/+2 |
* | | | Merge next-mr -> next-4284 | Konstantin Osipov | 2010-02-03 | 1 | -2/+2 |
|\ \ \
| |/ / |
|
| * | | WL#2360 Performance schema | Marc Alff | 2010-01-06 | 1 | -2/+2 |
* | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-03 | 1 | -0/+1 |
|\ \ \
| |/ / |
|
| * | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -0/+1 |
* | | | Implement new type-of-operation-aware metadata locks. | Dmitry Lenev | 2010-02-01 | 1 | -11/+16 |
* | | | Backport of | Tor Didriksen | 2010-01-12 | 1 | -2/+2 |
* | | | Apply and review: | Konstantin Osipov | 2009-12-29 | 1 | -40/+10 |
* | | | A prerequisite patch for the fix for Bug#46224 | Konstantin Osipov | 2009-12-22 | 1 | -8/+5 |
* | | | Backport of revno: 2617.71.1 | Jon Olav Hauglid | 2009-12-10 | 1 | -21/+15 |
* | | | Backport of revno ## 2617.31.1, 2617.31.3, 2617.31.4, 2617.31.5, | Konstantin Osipov | 2009-12-05 | 1 | -1/+24 |
* | | | Backport of: | Konstantin Osipov | 2009-12-01 | 1 | -1/+1 |
* | | | Initial import of WL#3726 "DDL locking for all metadata objects". | Konstantin Osipov | 2009-11-30 | 1 | -1/+1 |
|/ / |
|
* | | Backport of: | Konstantin Osipov | 2009-11-23 | 1 | -12/+0 |
* | | Auto-merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -1/+1 |
|\ \ |
|
| * | | Fix automerge: use 'thd->query()' instead of 'thd->query'. | Alexander Nozdrin | 2009-11-05 | 1 | -1/+1 |
* | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -0/+3 |
|\ \ \
| |/ / |
|
| * | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -0/+3 |
| |\ \
| | |/ |
|
| | * | Bug #47788: Crash in TABLE_LIST::hide_view_error on | Georgi Kodinov | 2009-10-19 | 1 | -0/+3 |
* | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-05 | 1 | -15/+14 |
|\ \ \
| |/ / |
|
| * | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -13/+12 |
| |\ \
| | |/ |
|
| | * | Bug #40877: multi statement execution fails in 5.1.30 | Georgi Kodinov | 2009-10-16 | 1 | -13/+12 |
* | | | Merge with next-mr-runtime. | Konstantin Osipov | 2009-10-22 | 1 | -5/+8 |
|\ \ \ |
|
| * \ \ | Automerge | Kristofer Pettersson | 2009-10-19 | 1 | -9/+9 |
| |\ \ \ |
|
| * | | | | Bug#27145 EXTRA_ACL troubles | Kristofer Pettersson | 2009-10-19 | 1 | -5/+8 |
* | | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1, | Konstantin Osipov | 2009-10-22 | 1 | -42/+766 |
| |/ / /
|/| | | |
|
* | | | | Backport of: | Konstantin Osipov | 2009-10-14 | 1 | -8/+8 |
* | | | | Bug #44651 "have_community_features" variable should be renamed | Jon Olav Hauglid | 2009-10-09 | 1 | -1/+1 |
|/ / / |
|
* | | | WL#2110 (SIGNAL) | Marc Alff | 2009-09-10 | 1 | -10/+36 |
|/ / |
|
* | | merge of 5.1-main into mysql-trunk. | Guilhem Bichot | 2009-08-12 | 1 | -18/+25 |
|\ \
| |/ |
|
| * | A fix for Bug#44495 "Prepared Statement: CALL p(<x>) - `thd->protocol == &thd... | Konstantin Osipov | 2009-07-15 | 1 | -18/+25 |
* | | Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}: | Guilhem Bichot | 2009-08-04 | 1 | -30/+32 |
|\ \
| |/ |
|
| *-. | Merge from 5.0-bugteam | Staale Smedseng | 2009-06-17 | 1 | -8/+7 |
| |\ \ |
|
| | | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-06-17 | 1 | -2/+2 |
| | * | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-06-10 | 1 | -2/+2 |
| | |/ |
|