summaryrefslogtreecommitdiff
path: root/storage/heap
Commit message (Expand)AuthorAgeFilesLines
* Merge with 5.2.Michael Widenius2011-12-118-11/+26
|\
| * Merge with MariaDB 5.1Michael Widenius2011-11-248-11/+26
| |\
| | * Merge with MySQL 5.1.60Michael Widenius2011-11-233-0/+3
| | |\
| | | * BUG#11759349 - 51655: CREATE TABLE IN MEMORY ENGINE DOESN'T STOREAshish Agarwal2011-09-273-0/+3
| | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-216-11/+23
| | |\ \ | | | |/
| | | * Updated/added copyright headersKent Boortz2011-07-032-7/+5
| | | |\
| | | * | Updated/added copyright headersKent Boortz2011-06-306-11/+25
* | | | | mergeSergei Golubchik2011-10-111-1/+0
|\ \ \ \ \ | |/ / / /
| * | | | merge with 5.1Sergei Golubchik2011-10-071-1/+0
| |\ \ \ \ | | |/ / /
| | * | | remove redundant declarationsSergei Golubchik2011-10-041-1/+0
| * | | | Merge with 5.1Michael Widenius2011-06-241-1/+1
| |\ \ \ \ | | |/ / /
| | * | | fix "./configure --with-debug" buildsSergei Golubchik2011-06-151-1/+1
* | | | | New status variables: Rows_tmp_read, Handler_tmp_update and Handler_tmp_writeMichael Widenius2011-06-271-13/+1
* | | | | MergeIgor Babaev2011-05-201-0/+4
|\ \ \ \ \
| * \ \ \ \ Merged the code of MWL#106 into 5.3Igor Babaev2011-05-161-0/+4
| |\ \ \ \ \
* | | | | | | Removed some alias warningsMichael Widenius2011-05-181-5/+3
* | | | | | | Merge with MariaDB 5.2Michael Widenius2011-05-102-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | Merge with MariaDB 5.1Michael Widenius2011-05-032-3/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-022-3/+3
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAKMattias Jonsson2011-03-252-3/+3
| | | | |/ | | | |/|
* | | | | Fixed all BUILD scripts to use g++ instead of gcc for linkingMichael Widenius2011-03-311-0/+10
* | | | | Merge with 5.2Michael Widenius2011-03-091-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-1/+1
| | |\ \ \ | | | |/ /
| | | * | MergeKent Boortz2010-12-291-1/+1
* | | | | Fixed build issuesMichael Widenius2011-02-235-5/+32
* | | | | Added HANDLER support for MEMORY tablesMichael Widenius2011-01-1112-16/+37
* | | | | mergeVladislav Vaintroub2010-12-061-3/+0
|\ \ \ \ \ | |/ / / /
| * | | | mergeVladislav Vaintroub2010-12-061-3/+0
| |\ \ \ \ | | |/ / /
| | * | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64Vladislav Vaintroub2010-12-061-3/+0
* | | | | Merge with 5.1-release.Michael Widenius2010-12-062-8/+18
|\ \ \ \ \ | |/ / / /
| * | | | merge with 5.1Michael Widenius2010-11-301-3/+0
| |\ \ \ \ | | |/ / /
| | * | | Fixed compiler and gmake warningsMichael Widenius2010-11-291-3/+0
| * | | | Merge MariaDB 5.1->5.2unknown2010-11-192-5/+18
| |\ \ \ \ | | |/ / /
| | * | | MWL#74: Shared libmysqld.so library.unknown2010-11-172-5/+18
* | | | | Fixed some compiler warnings found when compiling for windows.Michael Widenius2010-11-301-1/+4
* | | | | Fix for LP BUG#606013: Adding bit field support for heap tables.unknown2010-11-233-4/+74
|/ / / /
* | | | merge with 5.1Sergei Golubchik2010-09-111-2/+2
|\ \ \ \ | |/ / /
| * | | Merge with MySQL 5.1.50Michael Widenius2010-08-271-2/+2
| |\ \ \ | | |/ /
| | * | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-022-4/+4
* | | | Merge with MariaDB 5.1.49Michael Widenius2010-08-052-7/+1
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
* | | Maria WL#61unknown2010-04-011-0/+17
|/ /
* | Merge with MySQL 5.1, with following additions:unknown2009-11-161-5/+2
|\ \ | |/
| * Merge from 5.0Staale Smedseng2009-09-171-5/+2
* | Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-2/+1
|\ \ | |/
| * Merge from 5.0 for 43414Staale Smedseng2009-08-281-2/+1
* | Merge MySQL->MariaDBSergey Petrunya2009-09-083-10/+11
|\ \ | |/
| * Merge 5.1-bugteam -> 5.1-innodb_plugin.Sergey Vojtovich2009-07-142-0/+9
| |\
| | * Bug#35111 - Truncate a MyISAM partitioned table does not resetSatya B2009-07-082-0/+9
| * | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-101-10/+2
| |/