..
unittest
5.2->5.3 merge
2011-12-12 13:00:33 +01:00
CMakeLists.txt
merge
2011-10-11 12:55:42 +02:00
file_formats.txt
ft_maria.c
Fixed some compiler warnings and errors in test suite found by buildbot
2010-01-27 23:53:08 +02:00
ha_maria.cc
Remove engine-specific (but identical) icp callbacks. create one reusable
2012-02-17 13:27:41 +01:00
ha_maria.h
Merge with 5.2.
2011-12-11 11:34:44 +02:00
lockman.c
Merge with 5.1-microseconds
2011-05-28 05:11:32 +03:00
lockman.h
ma_bitmap.c
Fixed lp:925377 "Querying myisam table metadata while 'alter table..enable keys' is running may corrupt the table"
2012-02-28 23:18:52 +02:00
ma_blockrec.c
Merge with 5.1
2011-11-30 22:57:18 +02:00
ma_blockrec.h
Fixes bugs found by testcase for lp:815022 and lp:726374 "ma_blockrec.c:3000: write_block_record: Assertion `cur_block[1].page_count == 0' failed with a multi-index Aria workload"
2011-08-15 16:39:53 +03:00
ma_cache.c
- maria/ma_test_all.sh can now be run with --tmpdir=/dev/shm for faster testing
2011-02-25 14:55:40 +02:00
ma_changed.c
ma_check.c
Merge with 5.2.
2011-12-11 11:34:44 +02:00
ma_check_standalone.h
Added progress reporting for alter table, LOAD DATA INFILE and for aria tables: check table, repair table, analyze table.
2011-07-01 15:08:30 +03:00
ma_checkpoint.c
Merge with MariaDB 5.2
2012-02-21 01:58:50 +02:00
ma_checkpoint.h
rename maria to aria
2010-09-12 18:40:01 +02:00
ma_checksum.c
ma_close.c
Fixed portability problem with partiton_error.test
2011-06-13 12:46:11 +03:00
ma_commit.c
post-review fixes
2009-01-15 22:27:36 +01:00
ma_commit.h
ma_control_file.c
rename maria to aria
2010-09-12 18:40:01 +02:00
ma_control_file.h
rename maria to aria
2010-09-12 18:40:01 +02:00
ma_create.c
Fixed lp:879939 "assertion in ha_maria::enable_indexes with derived_with_keys=on"
2011-10-26 20:25:18 +03:00
ma_dbug.c
Fixed lp:925377 "Querying myisam table metadata while 'alter table..enable keys' is running may corrupt the table"
2012-02-28 23:18:52 +02:00
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
Fixes for Aria storage engine:
2011-02-10 20:33:51 +02:00
ma_delete_table.c
Fixes for Aria storage engine:
2011-02-10 20:33:51 +02:00
ma_dynrec.c
Fix gcc 4.6 warning after merge with 5.1
2011-10-27 19:18:25 +03:00
ma_extra.c
Automatic merge with 5.2
2011-08-15 22:14:08 +03:00
ma_ft_boolean_search.c
Merge with 5.2.
2011-12-11 11:34:44 +02:00
ma_ft_eval.c
ma_ft_eval.h
ma_ft_nlq_search.c
Merge with 5.2.
2011-12-11 11:34:44 +02:00
ma_ft_parser.c
Applied Antony T Curtis patch for declaring many CHARSET objects as const
2010-01-06 21:20:16 +02:00
ma_ft_stem.c
ma_ft_test1.c
ma_ft_test1.h
ma_ft_update.c
Fix gcc 4.6 warnings about assigned but not used variables.
2011-10-27 15:22:52 +03:00
ma_ftdefs.h
Fixes after comments from last push:
2009-11-30 15:36:06 +02:00
ma_fulltext.h
Merge with mysql-maria
2009-01-30 23:55:42 +02:00
ma_info.c
Fixed lp:879939 "assertion in ha_maria::enable_indexes with derived_with_keys=on"
2011-10-26 20:25:18 +03:00
ma_init.c
Merge with MariaDB 5.1
2011-05-03 19:10:10 +03:00
ma_key.c
Merge with 5.2
2011-03-09 15:47:59 +02:00
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
Fixes some bug in Aria recovery:
2010-10-07 12:51:34 +03:00
ma_keycache.c
Aria issues:
2011-01-24 15:19:40 +02:00
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.2.
2011-12-11 11:34:44 +02:00
ma_loghandler.h
Fix of compiler errors.
2011-05-16 16:13:34 +03:00
ma_loghandler_lsn.h
ma_norec.c
Added support for NO_RECORD record format (don't store any row data) for Aria.
2011-01-14 11:54:39 +01:00
ma_open.c
Fixed lp:925377 "Querying myisam table metadata while 'alter table..enable keys' is running may corrupt the table"
2012-02-28 23:18:52 +02:00
ma_packrec.c
Use _ma_set_fatal_error() in Aria also for HA_ERR_WRONG_IN_RECORD, to be able to get an assert as soon as a failure is detected.
2011-01-26 15:29:36 +02:00
ma_page.c
Fixes bugs found by testcase for lp:815022 and lp:726374 "ma_blockrec.c:3000: write_block_record: Assertion `cur_block[1].page_count == 0' failed with a multi-index Aria workload"
2011-08-15 16:39:53 +03:00
ma_pagecache.c
Fixed bug lp:814054 'Assertion `block->hash_link == hash_link && hash_link->block == block' in ma_pagecache.c:2275 with Aria'
2011-08-10 22:44:39 +03:00
ma_pagecache.h
Merge with 5.1 to get in changes from MySQL 5.1.55
2011-02-28 19:39:30 +02:00
ma_pagecaches.c
ma_pagecrc.c
Fixes for Aria storage engine:
2011-02-10 20:33:51 +02:00
ma_panic.c
Aria issues:
2011-01-24 15:19:40 +02:00
ma_preload.c
Merge with base MySQL-5.1-maria
2009-01-12 13:12:00 +02:00
ma_range.c
Added MARIA_PAGE structure to keep all information about a maria key page.
2008-09-01 20:31:40 +03:00
ma_recovery.c
Ensure that we mark all processed tables as 'properly closed'.
2012-03-05 21:59:00 +02:00
ma_recovery.h
Fixed portability problem with partiton_error.test
2011-06-13 12:46:11 +03:00
ma_recovery_util.c
Aria issues:
2011-01-24 15:19:40 +02:00
ma_recovery_util.h
ma_rename.c
Fix for Bug#40311 Assert in MARIA_RECORD_POS during pushbuild 2 test:
2008-12-22 02:17:37 +02:00
ma_rfirst.c
ma_rkey.c
Merge with 5.2
2011-03-09 15:47:59 +02:00
ma_rlast.c
ma_rnext.c
Merge in new handler and handlersocket code into 5.3 main
2011-02-22 11:15:47 +02:00
ma_rnext_same.c
Fix for lp:711565 "Index Condition Pushdown can make a thread hold MyISAM locks as well as be unKILLable for long time"
2011-02-18 17:43:59 +02:00
ma_rprev.c
Fix for lp:711565 "Index Condition Pushdown can make a thread hold MyISAM locks as well as be unKILLable for long time"
2011-02-18 17:43:59 +02:00
ma_rrnd.c
ma_rsame.c
Fixed wrong test in maria_rsame() that caused ma_test_all to fail.
2011-01-11 13:27:16 +02:00
ma_rsamepos.c
ma_rt_index.c
bug 857066 Wrong result with ST_DISJOINT when using an index
2011-11-29 02:11:13 +04:00
ma_rt_index.h
Added MARIA_PAGE structure to keep all information about a maria key page.
2008-09-01 20:31:40 +03:00
ma_rt_key.c
Fixes some bug in Aria recovery:
2010-10-07 12:51:34 +03:00
ma_rt_key.h
Added MARIA_PAGE structure to keep all information about a maria key page.
2008-09-01 20:31:40 +03:00
ma_rt_mbr.c
Added MARIA_PAGE structure to keep all information about a maria key page.
2008-09-01 20:31:40 +03:00
ma_rt_mbr.h
Added MARIA_PAGE structure to keep all information about a maria key page.
2008-09-01 20:31:40 +03:00
ma_rt_split.c
Merge with MariaDB 5.1
2011-11-24 18:48:58 +02:00
ma_rt_test.c
- maria/ma_test_all.sh can now be run with --tmpdir=/dev/shm for faster testing
2011-02-25 14:55:40 +02:00
ma_scan.c
ma_search.c
Merge with 5.2
2011-03-09 15:47:59 +02:00
ma_servicethread.c
Separated service thread framework to be used for update/delete purge (WL#3067) and group commit (WL#3080).
2009-01-12 21:27:02 +02:00
ma_servicethread.h
Separated service thread framework to be used for update/delete purge (WL#3067) and group commit (WL#3080).
2009-01-12 21:27:02 +02:00
ma_sort.c
Added progress reporting for alter table, LOAD DATA INFILE and for aria tables: check table, repair table, analyze table.
2011-07-01 15:08:30 +03:00
ma_sp_defs.h
ma_sp_key.c
ma_sp_test.c
ma_state.c
Fix for: LP #634955 : Assert in _ma_update_at_original_place()
2010-11-02 17:22:57 +02:00
ma_state.h
Fix for: LP #634955 : Assert in _ma_update_at_original_place()
2010-11-02 17:22:57 +02:00
ma_static.c
Added option "AND DISABLE CHECKPOINT" to "FLUSH TABLES WITH READ LOCK"
2011-04-28 18:02:26 +03:00
ma_statrec.c
Use _ma_set_fatal_error() in Aria also for HA_ERR_WRONG_IN_RECORD, to be able to get an assert as soon as a failure is detected.
2011-01-26 15:29:36 +02:00
ma_test1.c
Merge with 5.2
2011-03-09 15:47:59 +02:00
ma_test2.c
- maria/ma_test_all.sh can now be run with --tmpdir=/dev/shm for faster testing
2011-02-25 14:55:40 +02:00
ma_test3.c
Removed compiler warnings
2010-01-06 23:27:53 +02:00
ma_test_all.res
ma_test_all.sh
ma_test_big.sh
ma_test_force_start.pl
rename maria to aria
2010-09-12 18:40:01 +02:00
ma_test_recovery
ma_unique.c
Merge in new handler and handlersocket code into 5.3 main
2011-02-22 11:15:47 +02:00
ma_update.c
Fixes for Aria storage engine:
2011-02-10 20:33:51 +02:00
ma_write.c
Merge with 5.2.
2011-12-11 11:34:44 +02:00
Makefile.am
Removed depricated --maria-options from mysqld.
2011-06-09 21:39:31 +03:00
maria_chk.c
Automerge 5.2->5.3
2011-07-31 22:59:55 +02:00
maria_def.h
Fixed lp:879939 "assertion in ha_maria::enable_indexes with derived_with_keys=on"
2011-10-26 20:25:18 +03:00
maria_dump_log.c
Merge MariaDB 5.1->5.2
2010-11-19 22:33:47 +01:00
maria_ftdump.c
rename maria to aria
2010-09-12 18:40:01 +02:00
maria_pack.c
Merge with MariaDB 5.1
2011-11-24 18:48:58 +02:00
maria_read_log.c
Aria bug fixes and improvements:
2011-06-30 00:37:12 +03:00
maria_rename.sh
plug.in
merge with 5.1
2011-10-07 00:18:30 +02:00
tablockman.c
Fix compile errors and warnings and test errors introduced by microseconds push.
2011-05-28 16:57:58 +02:00
tablockman.h
test_pack
trnman.c
Added variable ARIA_CHECKPOINT_LOG_ACTIVITY to allow one to specify how often we should do a checkpoint.
2011-09-01 21:13:09 +03:00
trnman.h
merged
2009-01-16 17:18:17 +01:00
trnman_public.h
merged
2009-01-16 17:18:17 +01:00