summaryrefslogtreecommitdiff
path: root/storage/heap
Commit message (Expand)AuthorAgeFilesLines
* 5.3 mergeSergei Golubchik2012-01-133-3/+4
|\
| * 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
| | | |\
| | | * \ Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-216-11/+23
| | | |\ \
| * | | \ \ 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
* | | | | | mergeSergei Golubchik2011-11-031-2/+2
|\ \ \ \ \ \
| * | | | | | build on windowsSergei Golubchik2011-11-021-2/+2
* | | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-0317-34/+45
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Bug#11759349 -- Merge of patch from mysql-5.1.Ashish Agarwal2011-09-273-0/+3
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | BUG#11759349 - 51655: CREATE TABLE IN MEMORY ENGINE DOESN'T STOREAshish Agarwal2011-09-273-0/+3
| | | |_|_|/ | | |/| | |
| | * | | | Updated/added copyright headersKent Boortz2011-07-032-7/+5
| | |\ \ \ \
| * | | | | | Merging into mysql-5.5.16-release.Mats Kindahl2011-08-151-1/+2
| * | | | | | Updated/added copyright headersKent Boortz2011-07-042-2/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Updated/added copyright headersKent Boortz2011-06-3016-32/+36
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / /
| | * | | | | Updated/added copyright headersKent Boortz2011-06-306-11/+25
* | | | | | | merge with 5.3Sergei Golubchik2011-10-1917-45/+166
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | 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
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| * | | | | | | 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
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| * | | | | | | 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
| |/ / / / / /
* | | | | | | compilation fixes: without dbug, without sslSergei Golubchik2011-07-161-2/+2
* | | | | | | less boilerplate code - move common operations to wrappersSergei Golubchik2011-07-141-21/+0
* | | | | | | post-merge fixes.Sergei Golubchik2011-07-022-8/+0
* | | | | | | 5.5-mergeSergei Golubchik2011-07-0211-108/+15
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Manual merge from 5.1Mattias Jonsson2011-04-202-3/+3
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAKMattias Jonsson2011-03-252-3/+3
| | | |_|/ / | | |/| | |