Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with 5.2. | Michael Widenius | 2011-12-11 | 8 | -11/+26 |
|\ | |||||
| * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 8 | -11/+26 |
| |\ | |||||
| | * | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 3 | -0/+3 |
| | |\ | |||||
| | | * | BUG#11759349 - 51655: CREATE TABLE IN MEMORY ENGINE DOESN'T STORE | Ashish Agarwal | 2011-09-27 | 3 | -0/+3 |
| | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 6 | -11/+23 |
| | |\ \ | | | |/ | |||||
| | | * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 2 | -7/+5 |
| | | |\ | |||||
| | | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 6 | -11/+25 |
* | | | | | merge | Sergei Golubchik | 2011-10-11 | 1 | -1/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | merge with 5.1 | Sergei Golubchik | 2011-10-07 | 1 | -1/+0 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | remove redundant declarations | Sergei Golubchik | 2011-10-04 | 1 | -1/+0 |
| * | | | | Merge with 5.1 | Michael Widenius | 2011-06-24 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | fix "./configure --with-debug" builds | Sergei Golubchik | 2011-06-15 | 1 | -1/+1 |
* | | | | | New status variables: Rows_tmp_read, Handler_tmp_update and Handler_tmp_write | Michael Widenius | 2011-06-27 | 1 | -13/+1 |
* | | | | | Merge | Igor Babaev | 2011-05-20 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 1 | -0/+4 |
| |\ \ \ \ \ | |||||
* | | | | | | | Removed some alias warnings | Michael Widenius | 2011-05-18 | 1 | -5/+3 |
* | | | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 2 | -3/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 2 | -3/+3 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 2 | -3/+3 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAK | Mattias Jonsson | 2011-03-25 | 2 | -3/+3 |
| | | | |/ | | | |/| | |||||
* | | | | | Fixed all BUILD scripts to use g++ instead of gcc for linking | Michael Widenius | 2011-03-31 | 1 | -0/+10 |
* | | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -1/+1 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge | Kent Boortz | 2010-12-29 | 1 | -1/+1 |
* | | | | | Fixed build issues | Michael Widenius | 2011-02-23 | 5 | -5/+32 |
* | | | | | Added HANDLER support for MEMORY tables | Michael Widenius | 2011-01-11 | 12 | -16/+37 |
* | | | | | merge | Vladislav Vaintroub | 2010-12-06 | 1 | -3/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | merge | Vladislav Vaintroub | 2010-12-06 | 1 | -3/+0 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64 | Vladislav Vaintroub | 2010-12-06 | 1 | -3/+0 |
* | | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 2 | -8/+18 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -3/+0 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fixed compiler and gmake warnings | Michael Widenius | 2010-11-29 | 1 | -3/+0 |
| * | | | | Merge MariaDB 5.1->5.2 | unknown | 2010-11-19 | 2 | -5/+18 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | MWL#74: Shared libmysqld.so library. | unknown | 2010-11-17 | 2 | -5/+18 |
* | | | | | Fixed some compiler warnings found when compiling for windows. | Michael Widenius | 2010-11-30 | 1 | -1/+4 |
* | | | | | Fix for LP BUG#606013: Adding bit field support for heap tables. | unknown | 2010-11-23 | 3 | -4/+74 |
|/ / / / | |||||
* | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 2 | -4/+4 |
* | | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 2 | -7/+1 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
* | | | Maria WL#61 | unknown | 2010-04-01 | 1 | -0/+17 |
|/ / | |||||
* | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -5/+2 |
|\ \ | |/ | |||||
| * | Merge from 5.0 | Staale Smedseng | 2009-09-17 | 1 | -5/+2 |
* | | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -2/+1 |
|\ \ | |/ | |||||
| * | Merge from 5.0 for 43414 | Staale Smedseng | 2009-08-28 | 1 | -2/+1 |
* | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 3 | -10/+11 |
|\ \ | |/ | |||||
| * | Merge 5.1-bugteam -> 5.1-innodb_plugin. | Sergey Vojtovich | 2009-07-14 | 2 | -0/+9 |
| |\ | |||||
| | * | Bug#35111 - Truncate a MyISAM partitioned table does not reset | Satya B | 2009-07-08 | 2 | -0/+9 |
| * | | Backport WL#3653 to 5.1 to enable bundled innodb plugin. | Vladislav Vaintroub | 2009-06-10 | 1 | -10/+2 |
| |/ |