summaryrefslogtreecommitdiff
path: root/storage/maria/maria_def.h
Commit message (Expand)AuthorAgeFilesLines
* Merge with 5.2Michael Widenius2011-03-091-6/+20
|\
| * Fixes for Aria storage engine:Michael Widenius2011-02-101-3/+10
| * Aria fixes:Michael Widenius2011-01-301-0/+2
| * Use _ma_set_fatal_error() in Aria also for HA_ERR_WRONG_IN_RECORD, to be able...Michael Widenius2011-01-261-2/+2
| * Aria issues:Michael Widenius2011-01-241-1/+6
* | Merge in new handler and handlersocket code into 5.3 mainMichael Widenius2011-02-221-0/+1
|\ \
| * \ Merge with 5.1Michael Widenius2011-01-111-1/+4
| |\ \ | | |/
| | * Bug fixing in Aria:Michael Widenius2011-01-061-0/+1
* | | Fix for lp:711565 "Index Condition Pushdown can make a thread hold MyISAM loc...Michael Widenius2011-02-181-2/+7
* | | use bulk insert and repair by sort for unique keys inSergei Golubchik2011-01-141-0/+1
* | | Added support for NO_RECORD record format (don't store any row data) for Aria.Sergei Golubchik2011-01-141-0/+12
* | | MergeIgor Babaev2010-12-271-1/+3
|\ \ \ | |/ / |/| / | |/
| * Fix for Lbug:#686010 maria.optimize corrupts stack around alloca() callMichael Widenius2010-12-101-1/+3
* | Added TRASH() to table->record[0] to find out if we access not initialzed data.Michael Widenius2010-11-271-0/+2
* | Automerge with 5.2Michael Widenius2010-11-051-2/+2
|\ \ | |/
| * When scanning pages, stop when you are at 'data_file_length'.Michael Widenius2010-11-041-1/+1
| * Fixed compiler & valgrind warnings from my previous push.Michael Widenius2010-11-031-1/+1
* | Merge 5.2->5.3Sergey Petrunya2010-10-101-8/+22
|\ \ | |/
| * Fixed bug LP#605798 "wrong data in bitmap" after recovery.Michael Widenius2010-09-101-1/+2
| * Fixed bug that 'maria_read_log -a' didn't set max_trid when reparing tables.Michael Widenius2010-09-061-0/+3
| * Fixed failing testMichael Widenius2010-08-251-1/+1
| * Fix of LP#616253 Crash in _ma_bitmap_set_full_page_bits on Aria recoveryMichael Widenius2010-08-241-1/+2
| * Added verbose mode to recoveryMichael Widenius2010-08-181-0/+1
| * Fix for LP#602604: RQG: ma_blockrec.c:6187: _ma_apply_redo_insert_row_head_or...Michael Widenius2010-07-301-2/+9
| * Fixed some bugs in the Maria storage engineMichael Widenius2010-06-141-3/+4
* | MariaDB 5.2 -> MariaDB 5.3 merge Sergey Petrunya2010-06-261-2/+4
|\ \ | |/
| * Fixed compiler warnings and sporadic failures in test casesMichael Widenius2010-03-281-2/+4
* | Merge MariaDB-5.2 -> MariaDB 5.3Sergey Petrunya2010-03-201-2/+8
|\ \ | |/
| * Added count of my_sync calls (to SHOW STATUS)Michael Widenius2010-03-091-1/+6
| * When one does a drop table, the indexes are not flushed to disk before drop a...Michael Widenius2010-02-101-0/+1
| * Remove compiler warnings (Including some warnings from -Wstrict-aliasing)Michael Widenius2009-11-301-1/+1
* | MWL#67: MRR backportSergey Petrunya2009-12-221-2/+1
* | Backport into MariaDB-5.2 the following:Sergey Petrunya2009-12-151-0/+8
|/
* BUG#39249 Maria:query cache returns out of date resultsunknown2009-10-061-1/+5
* Merge with mysql-maria treeMichael Widenius2009-02-191-1/+7
|\
| * Merge of MyISAM changes done in 5.1-main, into MariaGuilhem Bichot2009-02-121-1/+1
| * _ma_state_info_write numeric flags changed with constants.unknown2009-01-081-0/+6
* | Merge with base MySQL-5.1-mariaMichael Widenius2009-01-121-14/+46
|\ \ | |/
| * Fix for BUG#41159 "Maria: deadlock between checkpoint and maria_write() when ...Guilhem Bichot2008-12-091-2/+16
| * Fixed mutexes lock order in maria_close(): LOCK_trn_list -> MARIA_SHARE::inte...unknown2008-12-081-1/+1
| * Prevent reenabling logging by thread which tries to lock table used by bulk i...unknown2008-11-241-0/+2
| * Fixed that packed transid can be compared byte per byte and we get them in in...Michael Widenius2008-11-041-7/+8
| * Merging of changes from myisam -> maria missing in last 5.1 - 5.1->maria mergeMichael Widenius2008-10-151-1/+2
| * Fix for BUG#39697 "Maria: hang when failing to insert due to UNIQUE (seen in ...Guilhem Bichot2008-10-091-0/+13
| * mergeSergei Golubchik2008-08-281-11/+11
| |\
| * | move wt* maintainance from maria to the serverSergei Golubchik2008-08-071-2/+1
| * | maria: deadlock detection when waiting on unique key (useless until we can ro...Sergei Golubchik2008-08-061-2/+4
* | | Added MARIA_PAGE structure to keep all information about a maria key page.Michael Widenius2008-09-011-47/+60
| |/ |/|
* | Fix for Bug#36499 Maria: potential deadlockMichael Widenius2008-08-261-4/+5
* | Changed all file names in maria to LEX_STRING and removed some calls to strlen()Michael Widenius2008-08-251-7/+6
|/