summaryrefslogtreecommitdiff
path: root/storage/maria/ma_create.c
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2017-10-021-35/+24
|\
| * cleanup: reduce code duplicationSergei Golubchik2017-09-271-34/+23
* | Fixed compiler warningMonty2017-09-271-5/+5
* | Merge 10.1 into 10.2Marko Mäkelä2017-09-251-8/+33
|\ \ | |/
| * MDEV-11846: ERROR 1114 (HY000) table full when performing GROUP BYVarun Gupta2017-09-241-8/+33
* | Added tmp_disk_table_size to limit size of Aria temp tables in tmpdirMonty2017-06-301-5/+5
|/
* Correct FSF addressiangilfillan2017-03-101-1/+1
* Merge 10.0 into 10.1Marko Mäkelä2017-03-091-27/+30
|\
| * Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-03-031-27/+30
| |\
| | * bugfix: remove my_delete_with_symlink()Sergei Golubchik2017-02-271-27/+30
* | | MDEV-10759 Fix Aria to support 2-byte collation IDsMonty2016-12-021-3/+3
* | | remove Aria-only handler flagSergei Golubchik2015-04-081-1/+1
* | | encryption cleanup: small changesSergei Golubchik2015-04-051-1/+1
* | | Push for testing of encryptionMonty2015-02-101-5/+51
|/ /
* | MDEV-5314 - Compiling fails on OSX using clangSergey Vojtovich2014-02-191-4/+5
* | Fixed MDEV-3815: Aria engine return "The table is full" (ERROR 1114) insertin...Michael Widenius2014-02-111-1/+1
* | 10.0-monty mergeSergei Golubchik2013-07-211-6/+10
|\ \
| * | Temporary commit of 10.0-mergeMichael Widenius2013-03-261-6/+10
| |/
* | remove ULL() and LL(), because they're totally unnecessarySergei Golubchik2013-04-071-6/+6
|/
* Merge mariadb 5.3->mariadb 5.5unknown2012-03-241-1/+2
|\
| * Speedups:Michael Widenius2012-03-231-1/+2
* | 5.3->5.5 mergeSergei Golubchik2011-11-221-1/+1
|\ \ | |/
| * Fixed lp:879939 "assertion in ha_maria::enable_indexes with derived_with_keys...Michael Widenius2011-10-261-1/+1
* | fix the build and compiler warnings (few of which were real bugs)Sergei Golubchik2011-10-291-3/+1
* | merge with 5.3Sergei Golubchik2011-10-191-9/+32
|\ \ | |/
| * Automerge 5.2->5.3unknown2011-07-311-4/+12
| |\
| | * Merge with 5.1Michael Widenius2011-07-251-4/+12
| | |\
| | | * Fixes lp:805930 Sysbench breaks on multiple table test with MariaDB 5.2.7 + AriaMichael Widenius2011-07-241-4/+12
| * | | Automatic mergeMichael Widenius2011-07-041-1/+1
| |\ \ \ | | |/ /
| | * | Aria fixes:Michael Widenius2011-07-041-1/+1
| * | | Merge with 5.2Michael Widenius2011-06-101-1/+2
| |\ \ \ | | |/ /
| | * | A bit better fix for tmp-table problemMichael Widenius2011-06-101-1/+2
| * | | Merge with 5.2Michael Widenius2011-03-091-1/+7
| |\ \ \ | | |/ /
| | * | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-1/+7
| | |\ \ | | | |/
| | | * Aria issues:Michael Widenius2011-01-241-1/+7
| * | | Added support for NO_RECORD record format (don't store any row data) for Aria.Sergei Golubchik2011-01-141-2/+10
| |/ /
* | | use PSI wrappers in aria and other non-MySQL codeSergei Golubchik2011-07-131-23/+28
* | | lots of post-merge changesSergei Golubchik2011-04-251-9/+9
|/ /
* | rename maria to ariaSergei Golubchik2010-09-121-2/+2
|/
* Fix for compiler warnings on windowsMichael Widenius2010-01-141-1/+1
* Merge with mysql-maria treeMichael Widenius2009-02-191-1/+2
|\
| * mergeunknown2009-02-061-1/+2
| |\
| | * _ma_state_info_write numeric flags changed with constants.unknown2009-01-081-1/+2
* | | Merge with mysql-mariaMichael Widenius2009-01-301-2/+20
|\ \ \ | |/ /
| * | mergeGuilhem Bichot2009-01-161-1/+18
| |\ \
| | * | Fix for BUG#42112 "Maria: recovery failure (pushbuild2) Assertion `rownr == 0...Guilhem Bichot2009-01-161-1/+18
| | |/
| * | Log queries to maria_log if compiled with EXTRA_DEBUGMichael Widenius2009-01-161-1/+2
| |/
* | Merge with base MySQL-5.1-mariaMichael Widenius2009-01-121-12/+13
|\ \ | |/
| * Merge of my revisionGuilhem Bichot2008-10-151-1/+2
| |\
| | * Small fixes for pushbuild: compiler warnings, checking that partitioning is e...Guilhem Bichot2008-10-151-1/+2