Michael Widenius 0919edf32d Automatic merge		2012-02-24 17:21:44 +02:00
..
unittest	update tests	2011-12-03 10:53:00 +01:00
CMakeLists.txt
compat_aliases.cc	Merge with 5.1 + fixes for build failures in 5.2	2011-11-29 22:48:24 +02:00
compat_aliases.h
file_formats.txt
ft_maria.c
ha_maria.cc	compilation warning - unused variable	2011-12-22 11:07:04 +01:00
ha_maria.h	Merge with 5.1 + fixes for build failures in 5.2	2011-11-29 22:48:24 +02:00
lockman.c
lockman.h
ma_bitmap.c	Merge with 5.1 + fixes for build failures in 5.2	2011-11-29 22:48:24 +02:00
ma_blockrec.c	Merge with 5.1	2011-11-30 22:57:18 +02:00
ma_blockrec.h
ma_cache.c
ma_changed.c
ma_check.c	Merge with 5.1	2011-11-30 22:57:18 +02:00
ma_check_standalone.h
ma_checkpoint.c	Fixed lp:902654 "MariaDB consistently crashes in collect_tables on Aria checkpoint execution"	2012-02-20 14:03:44 +02:00
ma_checkpoint.h
ma_checksum.c
ma_close.c
ma_commit.c
ma_commit.h
ma_control_file.c
ma_control_file.h
ma_create.c
ma_dbug.c
ma_delete.c	Fixed bug: lp:887051 ; Error in recovery with LOAD DATA + DELETE	2011-12-13 19:57:19 +02:00
ma_delete_all.c
ma_delete_table.c
ma_dynrec.c
ma_extra.c
ma_ft_boolean_search.c	Merge with MariaDB 5.1	2011-11-24 18:48:58 +02:00
ma_ft_eval.c
ma_ft_eval.h
ma_ft_nlq_search.c	Merge with MySQL 5.1.60	2011-11-23 19:32:14 +02:00
ma_ft_parser.c
ma_ft_stem.c
ma_ft_test1.c
ma_ft_test1.h
ma_ft_update.c
ma_ftdefs.h
ma_fulltext.h
ma_info.c
ma_init.c
ma_key.c
ma_key_recover.c	Fixed bug: lp:887051 ; Error in recovery with LOAD DATA + DELETE	2011-12-13 19:57:19 +02:00
ma_key_recover.h
ma_keycache.c
ma_locking.c	Fixed bug where automaticly zerofilled table was not part of recovery if crash happended before next checkpoint.	2011-12-02 17:22:17 +02:00
ma_loghandler.c	Merge with 5.1	2011-11-30 22:57:18 +02:00
ma_loghandler.h
ma_loghandler_lsn.h
ma_open.c	Automatic merge	2012-02-24 17:21:44 +02:00
ma_packrec.c
ma_page.c
ma_pagecache.c
ma_pagecache.h
ma_pagecaches.c
ma_pagecrc.c
ma_panic.c
ma_preload.c
ma_range.c
ma_recovery.c	Fixed bug: lp:887051 ; Error in recovery with LOAD DATA + DELETE	2011-12-13 19:57:19 +02:00
ma_recovery.h
ma_recovery_util.c
ma_recovery_util.h
ma_rename.c
ma_rfirst.c
ma_rkey.c
ma_rlast.c
ma_rnext.c
ma_rnext_same.c
ma_rprev.c
ma_rrnd.c
ma_rsame.c
ma_rsamepos.c
ma_rt_index.c
ma_rt_index.h
ma_rt_key.c
ma_rt_key.h
ma_rt_mbr.c
ma_rt_mbr.h
ma_rt_split.c	Merge with MariaDB 5.1	2011-11-24 18:48:58 +02:00
ma_rt_test.c
ma_scan.c
ma_search.c
ma_servicethread.c
ma_servicethread.h
ma_sort.c
ma_sp_defs.h
ma_sp_key.c
ma_sp_test.c
ma_state.c
ma_state.h
ma_static.c
ma_statrec.c
ma_test1.c
ma_test2.c
ma_test3.c
ma_test_all.res
ma_test_all.sh
ma_test_big.sh
ma_test_force_start.pl
ma_test_recovery
ma_unique.c
ma_update.c
ma_write.c	Merge with MariaDB 5.1	2011-11-24 18:48:58 +02:00
Makefile.am
maria_chk.c
maria_def.h
maria_dump_log.c
maria_ftdump.c
maria_pack.c	Merge with MariaDB 5.1	2011-11-24 18:48:58 +02:00
maria_read_log.c
maria_rename.sh
plug.in
tablockman.c
tablockman.h
test_pack
trnman.c
trnman.h
trnman_public.h