Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+2 | |
|\ | ||||||
| * | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+4 | |
| |\ | ||||||
| | * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+4 | |
| | |\ | ||||||
| | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 | |
| | | |\ | ||||||
| | * | | | Fixed memory overrun in mysql_tzinfo_to_sql | Michael Widenius | 2011-05-26 | 1 | -2/+2 | |
* | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+2 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 | |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | ||||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 | |
| * | | | | | | automerge 5.1-security --> 5.5-security (bug 55424) | Gleb Shchepa | 2010-08-15 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
* | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -42/+53 | |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||||
| * | | | | | | merge with 5.1-micro | Sergei Golubchik | 2011-06-07 | 1 | -49/+45 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | revert a suggested "optimization" that introduced a bug | Sergei Golubchik | 2011-06-06 | 1 | -38/+45 | |
| | | |/ / / / | | |/| | | | | ||||||
| * | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -9/+25 | |
| |\ \ \ \ \ \ | | |/ / / / / | | | | | / / | | |_|_|/ / | |/| | | | | ||||||
* | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -17/+27 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 1 | -1/+1 | |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | ||||||
| | * | | | | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 1 | -1/+1 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| * | | | | | fix for valgrind warning | Sergei Golubchik | 2010-06-17 | 1 | -4/+13 | |
| * | | | | | few small MySQL bugs/issues that impact the engines, as discussed in the SE s... | Sergei Golubchik | 2010-06-05 | 1 | -7/+8 | |
| * | | | | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 1 | -14/+14 | |
| |/ / / / | ||||||
| * | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -25/+53 | |
| |\ \ \ \ | ||||||
| * | | | | | Fixed compiler warnings found by gcc 4.3.2 | Michael Widenius | 2009-01-31 | 1 | -2/+2 | |
* | | | | | | mysql-5.1 -> mysql-5.5 merge | Sergei Golubchik | 2010-11-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | / / | |_|_|/ / |/| | | | | ||||||
| * | | | | Bug #55424: convert_tz crashes when fed invalid data | Gleb Shchepa | 2010-08-06 | 1 | -1/+1 | |
* | | | | | A pre-requisite patch for the fix for Bug#52044. | Konstantin Osipov | 2010-07-27 | 1 | -11/+1 | |
* | | | | | WL#5486: Remove code for unsupported platforms | Davi Arnaut | 2010-07-15 | 1 | -5/+0 | |
* | | | | | WL#5419 "LOCK_open scalability: make tdc_refresh_version | Konstantin Osipov | 2010-06-11 | 1 | -1/+4 | |
* | | | | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -2/+16 | |
* | | | | | A post-review fix for type-aware metadata locks. | Konstantin Osipov | 2010-03-16 | 1 | -1/+1 | |
* | | | | | Followup to Bug#45225 Locking: hang if drop table with no timeout | Jon Olav Hauglid | 2010-02-24 | 1 | -2/+2 | |
* | | | | | Merge next-mr -> next-4284 | Konstantin Osipov | 2010-02-03 | 1 | -10/+36 | |
|\ \ \ \ \ | ||||||
| * | | | | | WL#2360 Performance schema | Marc Alff | 2010-01-06 | 1 | -10/+36 | |
* | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-03 | 1 | -0/+4 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -0/+4 | |
* | | | | | | Patch that changes metadata locking subsystem to use mutex per lock and | Dmitry Lenev | 2010-01-21 | 1 | -4/+8 | |
* | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2009-12-16 | 1 | -1/+0 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Manual merge/pull from mysql-next-mr. | Alexander Nozdrin | 2009-11-25 | 1 | -4/+4 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge with next-mr | Konstantin Osipov | 2009-11-20 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | Bug#32115: Bad use of Name_resolution_context from current LEX in partitioning | Mattias Jonsson | 2009-11-20 | 1 | -1/+0 | |
* | | | | | | | | Backport of: | Konstantin Osipov | 2009-12-08 | 1 | -0/+2 | |
| |_|/ / / / / |/| | | | | | | ||||||
* | | | | | | | Backport of: | Konstantin Osipov | 2009-11-24 | 1 | -4/+4 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Backport of Bug#15192 to mysql-next-mr | Davi Arnaut | 2009-11-10 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Backport of: | Konstantin Osipov | 2009-10-14 | 1 | -13/+14 | |
* | | | | | WL#2110 (SIGNAL) | Marc Alff | 2009-09-10 | 1 | -1/+1 | |
|/ / / / | ||||||
| | | | | ||||||
| \ \ \ | ||||||
*-. \ \ \ | Merge from 5.0-bugteam | Staale Smedseng | 2009-06-17 | 1 | -2/+2 | |
|\ \ \ \ \ | |_|_|/ / |/| | | / | | | |/ | | |/| | ||||||
| | * | | 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 | |
| |/ / | ||||||
* | | | Merge from 5.0-bugteam | Staale Smedseng | 2009-03-19 | 1 | -25/+53 | |
|\ \ \ | |/ / | | / | |/ |/| | ||||||
| * | Bug #42502 huge memory leak possible with timezone | Staale Smedseng | 2009-03-19 | 1 | -25/+52 | |
* | | merged bug 39920 and 5.1-main to 5.1-bugteam | Georgi Kodinov | 2008-12-01 | 1 | -0/+21 | |
|\ \ | |/ |