summaryrefslogtreecommitdiff
path: root/storage/maria/ha_maria.h
Commit message (Expand)AuthorAgeFilesLines
* Correct FSF addressiangilfillan2017-03-101-1/+1
* MDEV-5314 - Compiling fails on OSX using clangSergey Vojtovich2014-02-191-1/+1
* 10.0-base mergeSergei Golubchik2013-04-151-2/+0
|\
| * * move bas_ext from the handler to the handlertonSergei Golubchik2013-04-071-1/+0
| * 5.5 mergeSergei Golubchik2013-03-271-1/+0
| |\
| | * Added support for --crash-script in mysqld_safe.Michael Widenius2013-02-281-1/+0
* | | Merge 10.0-base -> 10.0.Igor Babaev2013-01-101-1/+1
|\ \ \ | |/ /
| * | The patch for the task mdev-539.Igor Babaev2012-12-201-1/+1
* | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-2/+0
|\ \ \ | |/ /
| * | simplify the handler api - table_type() is no longer abstract, not even virtualSergei Golubchik2012-12-171-2/+0
| |/
* | 10.0-base -> 10.0-montySergei Golubchik2012-10-191-6/+1
|\ \ | |/
| * Merge 5.3->5.5Sergey Petrunya2012-07-181-6/+1
| |\
| | * MDEV-398: Sergv related to spacial queriesSergey Petrunya2012-07-181-6/+1
* | | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6Michael Widenius2012-08-011-2/+2
|/ /
* | Merge of compatibility fixesMichael Widenius2012-04-021-2/+8
|\ \ | |/
| * Automatic mergeMichael Widenius2012-03-281-2/+8
| |\
| | * Merge with 5.1Michael Widenius2012-03-281-2/+8
| | |\
| | | * Fixed lp:944422 "mysql_upgrade destroys Maria tables?"Michael Widenius2012-03-281-2/+8
* | | | 5.3 mergeSergei Golubchik2012-01-131-2/+3
|\ \ \ \ | |/ / /
| * | | Merge with 5.2.Michael Widenius2011-12-111-2/+3
| |\ \ \ | | |/ /
| | * | Merge with 5.1 + fixes for build failures in 5.2Michael Widenius2011-11-291-2/+3
| | |\ \ | | | |/
| | | * Fixed that maria-recover works as expected.Michael Widenius2011-11-291-1/+2
| | | * Fixed that one can use --maria-recover=backup,forceMichael Widenius2011-11-241-1/+1
* | | | 5.3->5.5 mergeSergei Golubchik2011-11-221-0/+1
|\ \ \ \ | |/ / /
| * | | Fixed lp:879939 "assertion in ha_maria::enable_indexes with derived_with_keys...Michael Widenius2011-10-261-0/+1
* | | | merge with 5.3Sergei Golubchik2011-10-191-3/+4
|\ \ \ \ | |/ / /
| * | | Merge with MariaDB 5.2Michael Widenius2011-05-101-1/+1
| |\ \ \ | | |/ /
| | * | Merge with MariaDB 5.1Michael Widenius2011-05-031-1/+1
| | |\ \ | | | |/
| | | * Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-1/+1
| * | | Make EXPLAIN better at displaying MRR/BKA:Sergey Petrunya2011-04-021-0/+1
| * | | MRR interface: change range_info's type from char* to range_id_t typedef. The...Sergey Petrunya2011-03-041-1/+1
| * | | Merge with 5.1Michael Widenius2011-01-111-1/+0
| |\ \ \ | | |/ /
| | * | virtual columns:Sergei Golubchik2010-12-311-1/+0
| * | | MWL#121-124 DS-MRR support for key-ordered retrieval, etcSergey Petrunya2010-11-011-1/+2
| |\ \ \
| | * \ \ MWL#121: DS-MRR support for clustered primary keysSergey Petrunya2010-07-161-1/+2
| | |\ \ \
| | | * | | MWL#121: DS-MRR support for clustered primary keysSergey Petrunya2010-06-221-2/+1
| | | * | | MWL#121: DS-MRR support for clustered primary keysSergey Petrunya2010-06-191-2/+4
* | | | | | post-merge fixes.Sergei Golubchik2011-07-021-1/+1
* | | | | | lots of post-merge changesSergei Golubchik2011-04-251-3/+4
|/ / / / /
* | | | | Merge 5.2->5.3Sergey Petrunya2010-10-101-3/+5
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | provide maria* aliases for aria* command-line options,Sergei Golubchik2010-09-141-6/+0
| * | | rename maria to ariaSergei Golubchik2010-09-121-1/+1
| * | | Merge with MariaDB 5.1.49Michael Widenius2010-08-051-0/+1
| |\ \ \ | | | |/ | | |/|
| | * | Fix for LP#602604: RQG: ma_blockrec.c:6187: _ma_apply_redo_insert_row_head_or...Michael Widenius2010-07-301-0/+1
| * | | Fix for launchpad bug #612894unknown2010-08-031-0/+1
| |/ /
| * | restore the unintentinally broken ABISergei Golubchik2010-07-231-1/+1
| * | Fixed some bugs in the Maria storage engineMichael Widenius2010-06-141-1/+1
* | | Subquery cache (MWL#66) added.unknown2010-07-101-0/+4
| |/ |/|
* | MWL#67: MRR backportSergey Petrunya2009-12-221-2/+2
* | Backport into MariaDB-5.2 the following:Sergey Petrunya2009-12-151-1/+25
|/