Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | More fixes for LOCK TABLE and REPAIR/FLUSH | Michael Widenius | 2012-05-17 | 1 | -1/+1 |
* | Fixed bug LP:973039 - Assertion `share->in_trans == 0' failed in maria_close ... | Michael Widenius | 2012-05-16 | 1 | -1/+1 |
* | fixes for non-debug builds (CMAKE_BUILD_TYPE=Release or RelWithDebInfo) | Sergei Golubchik | 2012-01-17 | 1 | -1/+1 |
* | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -2/+3 |
|\ | |||||
| * | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -14/+141 |
| |\ | |||||
| | * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -14/+141 |
| | |\ | |||||
| | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -14/+141 |
| | | |\ | |||||
| | | | * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -13/+137 |
| | | | |\ | |||||
| | | | * \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | | | |\ \ | |||||
| | | | | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | * | | | | | Merge with alias as String | Michael Widenius | 2011-02-28 | 1 | -5/+2 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | | * | | | | Change TABLE->alias to String for less memory reallocation | Michael Widenius | 2011-02-28 | 1 | -5/+2 |
* | | | | | | | merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | compilation warnings on Windows | Sergei Golubchik | 2011-11-02 | 1 | -2/+2 |
* | | | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Updated/added copyright headers | Kent Boortz | 2011-07-04 | 1 | -1/+2 |
* | | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -5/+2 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Implementation of MWL#172: Add support for prepared statements to HANDLER READ | Michael Widenius | 2011-01-04 | 1 | -0/+1 |
| * | | | | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Merge with MySQL 5.1.52 | Michael Widenius | 2010-11-23 | 1 | -0/+9 |
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | / / / | | | | |/ / / | | | |/| | | | |||||
| * | | | | | | Code cleanup to get fewer reallocs() during execution. | Michael Widenius | 2010-11-24 | 1 | -5/+2 |
| |/ / / / / | |||||
* | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -43/+165 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Manual-merge of patch for bug#11753738 from mysql-5.1 tree. | Dmitry Shulga | 2011-06-10 | 1 | -10/+139 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Fixed bug#11753738 (formely known as bug#45235) - 5.1 DOES NOT SUPPORT 5.0-ONLY | Dmitry Shulga | 2011-06-10 | 1 | -12/+136 |
| | | |/ / | | |/| | | |||||
| * | | | | A patch for Bug#11763166 (55847: SHOW WARNINGS returns empty | Alexander Nozdrin | 2011-04-15 | 1 | -13/+12 |
| * | | | | Patch for Bug#11765684 (58674: SP-cache does not detect changes in | Alexander Nozdrin | 2011-03-10 | 1 | -0/+7 |
| * | | | | Bug #11764779 (former 57649) | Jon Olav Hauglid | 2011-03-07 | 1 | -3/+2 |
| * | | | | Patch that refactors global read lock implementation and fixes | Dmitry Lenev | 2010-11-11 | 1 | -14/+0 |
| * | | | | Merge from mysql-5.5-bugteam to mysql-5.5-runtime | Jon Olav Hauglid | 2010-09-30 | 1 | -0/+9 |
| |\ \ \ \ | |||||
| * | | | | | Bug #56595 RENAME TABLE causes assert on OS X | Jon Olav Hauglid | 2010-09-16 | 1 | -2/+4 |
| * | | | | | Bug#27480 (Extend CREATE TEMPORARY TABLES privilege | Alexander Nozdrin | 2010-08-31 | 1 | -1/+1 |
* | | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -1/+2 |
* | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -2/+2 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | Fix for: LP #634955: Assert in _ma_update_at_original_place() | Michael Widenius | 2010-11-02 | 1 | -3/+0 |
| * | | | | Fix that one can run mysql_upgrade with long table names | Michael Widenius | 2010-09-03 | 1 | -2/+2 |
* | | | | | Auto-merge from mysql-5.1-bugteam. | Dmitry Shulga | 2010-09-07 | 1 | -0/+9 |
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | |||||
| * | | | Fixed bug #55421 - Protocol::end_statement(): Assertion `0' on | Dmitry Shulga | 2010-09-07 | 1 | -0/+9 |
| |/ / | |||||
| * | | Manual merge from the bugfix tree. | Alexey Kopytov | 2010-06-11 | 1 | -3/+3 |
| |\ \ | |||||
* | | | | A fix for Bug#41158 "DROP TABLE holds LOCK_open during unlink()". | Konstantin Osipov | 2010-08-09 | 1 | -15/+4 |
* | | | | A pre-requisite patch for the fix for Bug#52044. | Konstantin Osipov | 2010-07-27 | 1 | -13/+14 |
* | | | | Merge trunk-bugfixing -> trunk-runtime | Konstantin Osipov | 2010-06-17 | 1 | -7/+6 |
|\ \ \ \ | |||||
| * \ \ \ | Manual merge from mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-06-11 | 1 | -3/+3 |
| |\ \ \ \ | |||||
| | * \ \ \ | Manual merge from the bugfix tree. | Alexey Kopytov | 2010-06-11 | 1 | -3/+3 |
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ / | |||||
| | | * | | Bug #42064: low memory crash when importing hex strings, in | Alexey Kopytov | 2010-05-21 | 1 | -3/+3 |
| * | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-06-10 | 1 | -4/+3 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -4/+3 |
| | |/ / | |||||
* | | | | Fix for bug #51263 "Deadlock between transactional | Dmitry Lenev | 2010-05-26 | 1 | -1/+1 |
* | | | | Pre-requisite patch for bug #51263 "Deadlock between | Dmitry Lenev | 2010-05-25 | 1 | -3/+3 |
|/ / / | |||||
* | | | Committing on behalf or Dmitry Lenev: | Konstantin Osipov | 2010-04-28 | 1 | -0/+7 |
* | | | WL#5030: Splitting mysql_priv.h | Mats Kindahl | 2010-04-07 | 1 | -0/+1 |