Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-10-02 | 1 | -35/+24 |
|\ | |||||
| * | cleanup: reduce code duplication | Sergei Golubchik | 2017-09-27 | 1 | -34/+23 |
* | | Fixed compiler warning | Monty | 2017-09-27 | 1 | -5/+5 |
* | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-09-25 | 1 | -8/+33 |
|\ \ | |/ | |||||
| * | MDEV-11846: ERROR 1114 (HY000) table full when performing GROUP BY | Varun Gupta | 2017-09-24 | 1 | -8/+33 |
* | | Added tmp_disk_table_size to limit size of Aria temp tables in tmpdir | Monty | 2017-06-30 | 1 | -5/+5 |
|/ | |||||
* | Correct FSF address | iangilfillan | 2017-03-10 | 1 | -1/+1 |
* | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-09 | 1 | -27/+30 |
|\ | |||||
| * | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-03-03 | 1 | -27/+30 |
| |\ | |||||
| | * | bugfix: remove my_delete_with_symlink() | Sergei Golubchik | 2017-02-27 | 1 | -27/+30 |
* | | | MDEV-10759 Fix Aria to support 2-byte collation IDs | Monty | 2016-12-02 | 1 | -3/+3 |
* | | | remove Aria-only handler flag | Sergei Golubchik | 2015-04-08 | 1 | -1/+1 |
* | | | encryption cleanup: small changes | Sergei Golubchik | 2015-04-05 | 1 | -1/+1 |
* | | | Push for testing of encryption | Monty | 2015-02-10 | 1 | -5/+51 |
|/ / | |||||
* | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -4/+5 |
* | | Fixed MDEV-3815: Aria engine return "The table is full" (ERROR 1114) insertin... | Michael Widenius | 2014-02-11 | 1 | -1/+1 |
* | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -6/+10 |
|\ \ | |||||
| * | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -6/+10 |
| |/ | |||||
* | | remove ULL() and LL(), because they're totally unnecessary | Sergei Golubchik | 2013-04-07 | 1 | -6/+6 |
|/ | |||||
* | Merge mariadb 5.3->mariadb 5.5 | unknown | 2012-03-24 | 1 | -1/+2 |
|\ | |||||
| * | Speedups: | Michael Widenius | 2012-03-23 | 1 | -1/+2 |
* | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fixed lp:879939 "assertion in ha_maria::enable_indexes with derived_with_keys... | Michael Widenius | 2011-10-26 | 1 | -1/+1 |
* | | fix the build and compiler warnings (few of which were real bugs) | Sergei Golubchik | 2011-10-29 | 1 | -3/+1 |
* | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -9/+32 |
|\ \ | |/ | |||||
| * | Automerge 5.2->5.3 | unknown | 2011-07-31 | 1 | -4/+12 |
| |\ | |||||
| | * | Merge with 5.1 | Michael Widenius | 2011-07-25 | 1 | -4/+12 |
| | |\ | |||||
| | | * | Fixes lp:805930 Sysbench breaks on multiple table test with MariaDB 5.2.7 + Aria | Michael Widenius | 2011-07-24 | 1 | -4/+12 |
| * | | | Automatic merge | Michael Widenius | 2011-07-04 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Aria fixes: | Michael Widenius | 2011-07-04 | 1 | -1/+1 |
| * | | | Merge with 5.2 | Michael Widenius | 2011-06-10 | 1 | -1/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | A bit better fix for tmp-table problem | Michael Widenius | 2011-06-10 | 1 | -1/+2 |
| * | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -1/+7 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -1/+7 |
| | |\ \ | | | |/ | |||||
| | | * | Aria issues: | Michael Widenius | 2011-01-24 | 1 | -1/+7 |
| * | | | Added support for NO_RECORD record format (don't store any row data) for Aria. | Sergei Golubchik | 2011-01-14 | 1 | -2/+10 |
| |/ / | |||||
* | | | use PSI wrappers in aria and other non-MySQL code | Sergei Golubchik | 2011-07-13 | 1 | -23/+28 |
* | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -9/+9 |
|/ / | |||||
* | | rename maria to aria | Sergei Golubchik | 2010-09-12 | 1 | -2/+2 |
|/ | |||||
* | Fix for compiler warnings on windows | Michael Widenius | 2010-01-14 | 1 | -1/+1 |
* | Merge with mysql-maria tree | Michael Widenius | 2009-02-19 | 1 | -1/+2 |
|\ | |||||
| * | merge | unknown | 2009-02-06 | 1 | -1/+2 |
| |\ | |||||
| | * | _ma_state_info_write numeric flags changed with constants. | unknown | 2009-01-08 | 1 | -1/+2 |
* | | | Merge with mysql-maria | Michael Widenius | 2009-01-30 | 1 | -2/+20 |
|\ \ \ | |/ / | |||||
| * | | merge | Guilhem Bichot | 2009-01-16 | 1 | -1/+18 |
| |\ \ | |||||
| | * | | Fix for BUG#42112 "Maria: recovery failure (pushbuild2) Assertion `rownr == 0... | Guilhem Bichot | 2009-01-16 | 1 | -1/+18 |
| | |/ | |||||
| * | | Log queries to maria_log if compiled with EXTRA_DEBUG | Michael Widenius | 2009-01-16 | 1 | -1/+2 |
| |/ | |||||
* | | Merge with base MySQL-5.1-maria | Michael Widenius | 2009-01-12 | 1 | -12/+13 |
|\ \ | |/ | |||||
| * | Merge of my revision | Guilhem Bichot | 2008-10-15 | 1 | -1/+2 |
| |\ | |||||
| | * | Small fixes for pushbuild: compiler warnings, checking that partitioning is e... | Guilhem Bichot | 2008-10-15 | 1 | -1/+2 |