summaryrefslogtreecommitdiff
path: root/storage/maria/ha_maria.cc
Commit message (Expand)AuthorAgeFilesLines
* Fixed LP bug #669420.Igor Babaev2010-11-021-0/+1
* Merge from mariadb-5.1 (through mariadb-5.2)Igor Babaev2010-10-141-14/+32
|\
| * MergeIgor Babaev2010-10-141-14/+32
| |\
| | * Fixes for bugs found by running test case for LP#608369 "Page: 1 Found wrong ...Michael Widenius2010-10-131-0/+2
| | * Use less memory on stack in sql_parse.cc and in repair/check for MyISAM & AriaMichael Widenius2010-10-121-14/+30
* | | Merge 5.2->5.3Sergey Petrunya2010-10-101-101/+174
|\ \ \ | |/ /
| * | Move maria_upgrade() out of maria_init() as in standalone programs maria_data...Michael Widenius2010-09-281-1/+1
| * | merge with 5.1Sergei Golubchik2010-09-161-4/+6
| |\ \ | | |/
| | * Fix for LP#634943 "marked as crashed", "zerofilling" and "wrong data in bitma...Michael Widenius2010-09-101-4/+6
| * | provide maria* aliases for aria* command-line options,Sergei Golubchik2010-09-141-38/+31
| * | rename maria to ariaSergei Golubchik2010-09-121-27/+27
| * | merge with 5.1Sergei Golubchik2010-09-111-1/+10
| |\ \ | | |/
| | * Fixed compiler failures when compiling non debug buildMichael Widenius2010-09-071-2/+2
| | * Fixed bug that 'maria_read_log -a' didn't set max_trid when reparing tables.Michael Widenius2010-09-061-1/+10
| * | Automerge with 5.1Michael Widenius2010-08-251-2/+2
| |\ \ | | |/
| | * Increase some very old limits.Michael Widenius2010-08-241-1/+1
| | * Trivial fixes, more safe DBUG_ASSERT()'s and some more DBUG_Michael Widenius2010-08-231-1/+1
| * | Merge with MariaDB 5.1Michael Widenius2010-08-061-1/+30
| |\ \ | | |/
| | * Fix for LP#614265 Crash in _ma_unpin_all_pages / _ma_search on DELETE with Ar...Michael Widenius2010-08-061-1/+30
| * | Merge with MariaDB 5.1.49Michael Widenius2010-08-051-6/+21
| |\ \ | | |/
| | * Fix for LP#602604: RQG: ma_blockrec.c:6187: _ma_apply_redo_insert_row_head_or...Michael Widenius2010-07-301-6/+21
| * | Fix for launchpad bug #612894unknown2010-08-031-1/+1
| * | merge with 5.1Sergei Golubchik2010-07-251-3/+3
| |\ \ | | |/
| | * restore the unintentinally broken ABISergei Golubchik2010-07-231-3/+3
| * | mergedSergei Golubchik2010-06-161-30/+55
| |\ \ | | |/
| | * Fixed some bugs in the Maria storage engineMichael Widenius2010-06-141-30/+55
* | | Subquery cache (MWL#66) added.unknown2010-07-101-0/+2
* | | MariaDB 5.2 -> MariaDB 5.3 merge Sergey Petrunya2010-06-261-1/+18
|\ \ \ | |/ /
| * | Maria WL#61unknown2010-04-011-1/+18
* | | Merge MariaDB-5.2 -> MariaDB 5.3Sergey Petrunya2010-03-201-21/+146
|\ \ \ | |/ /
| * | mergedSergei Golubchik2010-03-151-1/+1
| |\ \ | | |/
| | * Fix for LPBUG#516148 Test maria.maria3 fails when --without-maria-tmp-tables ...Michael Widenius2010-02-121-1/+1
| * | Group commit for maria engine.unknown2010-02-121-1/+126
| |/
| * When one does a drop table, the indexes are not flushed to disk before drop a...Michael Widenius2010-02-101-1/+4
| * Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.unknown2009-11-301-14/+12
| |\
| | * Merge with MySQL 5.1, with following additions:unknown2009-11-161-14/+12
| * | Remove compiler warnings (Including some warnings from -Wstrict-aliasing)Michael Widenius2009-11-301-3/+2
| |/
| * Added error handling for my_seek() & my_tell() failuresMichael Widenius2009-11-071-1/+1
* | MWL#67: MRR backportSergey Petrunya2009-12-221-4/+3
* | Backport into MariaDB-5.2 the following:Sergey Petrunya2009-12-151-0/+97
|/
* Fixed compiler warning messageMichael Widenius2009-10-261-2/+2
* mergeunknown2009-10-061-0/+6
|\
| * BUG#39249 Maria:query cache returns out of date resultsunknown2009-10-061-0/+6
* | Merge MySQL->MariaDBSergey Petrunya2009-09-081-0/+12
|/
* Added some changes inspired by Zardosht Kasheff:Michael Widenius2009-06-301-8/+15
* Fixed problems in mergeMichael Widenius2009-05-191-1/+1
|\
| * We are now using Valgrind rather than purify, and have for quite some time.unknown2009-05-061-1/+1
* | bzr merge from guilhem's maria tree to our local 5.1Michael Widenius2009-04-251-2/+6
|\ \ | |/ |/|
| * merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-0/+4
| * merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-111-2/+2
View Lorry Controller Status