Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -16/+47 | |
|\ | ||||||
| * | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -13/+44 | |
| |\ | ||||||
| | * | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -13/+44 | |
| | |\ | ||||||
| | | * | Fixed Bug#11764168 "56976: SEVERE DENIAL OF SERVICE IN PREPARED STATEMENTS". | Dmitry Shulga | 2011-03-15 | 1 | -13/+43 | |
| * | | | Merge Mariadb 5.1->5.2 | unknown | 2011-04-12 | 1 | -3/+3 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Bug fix for lp:732124 union + limit returns wrong result | Michael Widenius | 2011-03-09 | 1 | -3/+3 | |
* | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -16/+4 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -16/+4 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -16/+4 | |
| | |\ \ | | | |/ | ||||||
| | | * | Merge | Kent Boortz | 2010-12-29 | 1 | -1/+1 | |
| | | |\ | ||||||
| | | | * | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 1 | -1/+1 | |
| | | | * | Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite run | Davi Arnaut | 2010-07-30 | 1 | -2/+2 | |
| | | * | | Fixed following problems: | Sergey Glukhov | 2010-12-14 | 1 | -15/+3 | |
* | | | | | Fix for LP#697622 Assertion `! is_set()' failed when preparing a HANDLER stat... | Michael Widenius | 2011-01-12 | 1 | -5/+2 | |
* | | | | | Implementation of MWL#172: Add support for prepared statements to HANDLER READ | Michael Widenius | 2011-01-04 | 1 | -0/+61 | |
* | | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -0/+4 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -0/+4 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | Merge with MySQL 5.1.52 | Michael Widenius | 2010-11-23 | 1 | -0/+4 | |
| | |\ \ \ | | | |/ / | ||||||
| | | * | | Bug#54494 crash with explain extended and prepared statements | Sergey Glukhov | 2010-09-23 | 1 | -0/+4 | |
* | | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 1 | -17/+56 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Automatic merge | Michael Widenius | 2010-10-01 | 1 | -1/+1 | |
| |\ \ \ \ | ||||||
| | * | | | | Change some my_bool in C++ classes and a few functions to bool to detect wron... | Michael Widenius | 2010-09-24 | 1 | -1/+1 | |
| * | | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -6/+9 | |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | ||||||
| | * | | | Fix that one can run mysql_upgrade with long table names | Michael Widenius | 2010-09-03 | 1 | -2/+2 | |
| | * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -4/+7 | |
| | |\ \ \ | | | |/ / | ||||||
| | | * | | Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite run | Davi Arnaut | 2010-07-30 | 1 | -2/+2 | |
| | | * | | Fixed bug #42496 - the server could crash on a debug assert after a failure | Dmitry Shulga | 2010-07-21 | 1 | -2/+5 | |
| * | | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -12/+48 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -12/+48 | |
| | |\ \ \ | | | |/ / | ||||||
| | | * | | Merge of mysql-5.0-bugteam into mysql-5.1-bugteam. | Davi Arnaut | 2010-06-28 | 1 | -0/+29 | |
| | | |\ \ | | | | |/ | ||||||
| | | | * | Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite run | Davi Arnaut | 2010-06-28 | 1 | -0/+28 | |
| | | | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-08-28 | 1 | -2/+1 | |
| | | * | | 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 | |
| | | |\ \ | ||||||
| | | | * | | Bug #42064: low memory crash when importing hex strings, in | Alexey Kopytov | 2010-05-21 | 1 | -6/+9 | |
| | | * | | | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -9/+8 | |
| | | |/ / | ||||||
* | | | | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 1 | -13/+17 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -0/+2 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -0/+2 | |
| | |\ \ \ | | | |/ / | ||||||
| | | * | | BUG#47418 RBR fails, failure with mixup of base/temporary/view | unknown | 2010-01-16 | 1 | -0/+2 | |
| * | | | | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -13/+15 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -13/+15 | |
| | |\ \ \ | | | |/ / | ||||||
| | | * | | Bug #47788: Crash in TABLE_LIST::hide_view_error on | Georgi Kodinov | 2009-10-19 | 1 | -0/+3 | |
| | | * | | Bug #40877: multi statement execution fails in 5.1.30 | Georgi Kodinov | 2009-10-16 | 1 | -13/+12 | |
* | | | | | Backport of subquery optimizations to 5.3. | Sergey Petrunya | 2010-01-17 | 1 | -0/+1 | |
|/ / / / | ||||||
* | | | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 1 | -7/+8 | |
|/ / / | ||||||
* | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -42/+51 | |
|\ \ \ | |/ / | ||||||
| * | | A fix for Bug#44495 "Prepared Statement: CALL p(<x>) - `thd->protocol == &thd... | Konstantin Osipov | 2009-07-15 | 1 | -18/+25 | |
| | | | ||||||
| | \ | ||||||
| *-. \ | 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 |