summaryrefslogtreecommitdiff
path: root/include/maria.h
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.2 into 10.3Marko Mäkelä2019-07-021-2/+1
|\
| * Remove the unused function maria_cloneMarko Mäkelä2019-06-241-2/+1
* | Merge 10.2 into 10.3Marko Mäkelä2019-05-141-1/+1
|\ \ | |/
| * Merge 10.1 into 10.2Marko Mäkelä2019-05-131-1/+1
| |\
| | * Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-111-1/+1
| | |\
| | | * Update FSF addressMichal Schorm2019-05-101-1/+1
* | | | Merge 10.2 into 10.3Marko Mäkelä2018-04-241-1/+1
|\ \ \ \ | |/ / /
| * | | Remove most 'register' use in C++Marko Mäkelä2018-04-241-1/+1
| |/ /
* | | Fix that end_bulk_insert() doesn't write to to-be-deleted filesMonty2017-05-171-1/+1
* | | Added "const" to new data for handler::update_row()Michael Widenius2017-04-181-1/+1
|/ /
* | Correct FSF addressiangilfillan2017-03-101-1/+1
* | MDEV-10759 Fix Aria to support 2-byte collation IDsMonty2016-12-021-1/+1
* | Merge branch '10.0' into 10.1Sergei Golubchik2015-10-121-1/+1
|\ \
| * | MDEV-8450: PATCH] Wrong macro expansion in Query_cache::send_result_to_client()Oleksandr Byelkin2015-09-061-1/+1
* | | Push for testing of encryptionMonty2015-02-101-0/+2
* | | Merge branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-021-2/+0
|\ \ \ | |/ /
| * | MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-301-2/+0
* | | cleanup: move safe_str*() from sql_acl.cc to m_string.hSergei Golubchik2014-10-101-3/+4
|/ /
* | MDEV-5314 - Compiling fails on OSX using clangSergey Vojtovich2014-02-191-4/+4
* | 5.5 mergeSergei Golubchik2013-07-171-1/+1
|\ \ | |/
| * - Added -Wno-uninitialized to avoid warnings in release buildsMichael Widenius2013-06-091-1/+1
* | remove ULL() and LL(), because they're totally unnecessarySergei Golubchik2013-04-071-10/+11
* | The patch for the task mdev-539.Igor Babaev2012-12-201-1/+2
|/
* 5.3 mergeSergei Golubchik2012-05-041-70/+0
|\
| * MDEV-207 Install headers required to build external storage pluginsSergei Golubchik2012-04-231-72/+0
* | 5.3 mergeSergei Golubchik2012-01-131-0/+2
|\ \ | |/
| * Merge with 5.2.Michael Widenius2011-12-111-0/+2
| |\
| | * Merge with 5.1 + fixes for build failures in 5.2Michael Widenius2011-11-291-0/+2
| | |\
| | | * Fixed that maria-recover works as expected.Michael Widenius2011-11-291-0/+2
* | | | 5.3->5.5 mergeSergei Golubchik2011-11-221-0/+2
|\ \ \ \ | |/ / /
| * | | Fixed lp:879939 "assertion in ha_maria::enable_indexes with derived_with_keys...Michael Widenius2011-10-261-0/+2
| |/ /
* | | merge with 5.3Sergei Golubchik2011-10-191-1/+2
|\ \ \ | |/ /
| * | Merge with MariaDB 5.1Michael Widenius2011-05-031-0/+1
| |\ \ | | |/
| | * Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-0/+1
| * | Merge MariaDB 5.1->5.2unknown2010-11-191-1/+2
| |\ \ | | |/
| | * Added option BACKUP_ALL to mysqld --myisam-recover to also get a backup of th...Michael Widenius2010-11-071-1/+2
* | | use PSI wrappers in aria and other non-MySQL codeSergei Golubchik2011-07-131-3/+3
* | | post-merge fixes.Sergei Golubchik2011-07-021-5/+1
|/ /
* | Move maria_upgrade() out of maria_init() as in standalone programs maria_data...Michael Widenius2010-09-281-0/+1
* | provide maria* aliases for aria* command-line options,Sergei Golubchik2010-09-141-4/+7
|/
* restore the unintentinally broken ABISergei Golubchik2010-07-231-1/+1
* Fixed some compiler warnings and errors in test suite found by buildbotMichael Widenius2010-01-271-1/+1
* Merge with mysql-maria treeMichael Widenius2009-02-191-1/+1
|\
| * Merge of MyISAM changes done in 5.1-main, into MariaGuilhem Bichot2009-02-121-1/+1
* | Merge with mysql-mariaMichael Widenius2009-01-301-1/+3
|\ \ | |/
| * post-review fixesSergei Golubchik2009-01-151-1/+3
* | Merge with base MySQL-5.1-mariaMichael Widenius2009-01-121-1/+6
|\ \ | |/
| * Merging of changes from myisam -> maria missing in last 5.1 - 5.1->maria mergeMichael Widenius2008-10-151-1/+6
* | Added MARIA_PAGE structure to keep all information about a maria key page.Michael Widenius2008-09-011-2/+3
|/
* Added versioning of Maria indexMichael Widenius2008-06-261-11/+28