mariadb/storage/maria
unknown cb2b22f0e0 Merge bk-internal.mysql.com:/home/bk/mysql-maria
into  mysql.com:/home/my/mysql-maria


storage/maria/ma_check.c:
  Auto merged
storage/maria/ma_locking.c:
  Auto merged
storage/maria/ma_loghandler.c:
  Auto merged
storage/maria/ma_open.c:
  Auto merged
storage/maria/ma_recovery.c:
  Auto merged
storage/maria/maria_def.h:
  Auto merged
storage/maria/maria_read_log.c:
  Auto merged
storage/maria/ma_blockrec.c:
  Manual merge
storage/maria/ma_test1.c:
  Manual merge (using Guilhems code)
2007-09-09 19:22:20 +03:00
..
unittest WL#3072 - Maria Recovery 2007-09-07 15:52:25 +02:00
CMakeLists.txt
ft_maria.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ha_maria.cc WL#3072 - Maria Recovery 2007-09-07 15:52:25 +02:00
ha_maria.h merging MyISAM changes into Maria (not done in 5.1->maria merge of 2007-07-27 12:06:39 +02:00
lockman.c This patch is a collection of patches from from Sanja, Sergei and Monty. 2007-05-29 20:13:56 +03:00
lockman.h
ma_bitmap.c - speed optimization: 2007-09-06 16:53:26 +02:00
ma_blockrec.c Merge bk-internal.mysql.com:/home/bk/mysql-maria 2007-09-09 19:22:20 +03:00
ma_blockrec.h Added undo of deleted row 2007-09-05 02:57:53 +03:00
ma_cache.c merging MyISAM changes into Maria (not done in 5.1->maria merge of 2007-07-27 12:06:39 +02:00
ma_changed.c
ma_check.c Merge bk-internal.mysql.com:/home/bk/mysql-maria 2007-09-09 19:22:20 +03:00
ma_checkpoint.c First LSN calls added for transaction log. 2007-08-13 22:54:29 +03:00
ma_checkpoint.h WL#3072 Maria Recovery 2007-06-26 16:49:23 +02:00
ma_checksum.c Added applying of undo for updates 2007-09-09 19:15:10 +03:00
ma_close.c - WL#3072 Maria Recovery: 2007-09-07 15:02:30 +02:00
ma_commit.c cleanups 2007-08-29 17:28:44 +02:00
ma_commit.h - WL#3239 "log CREATE TABLE in Maria" 2007-06-22 14:49:37 +02:00
ma_control_file.c WL#3072 Maria recovery 2007-08-29 16:43:01 +02:00
ma_control_file.h WL#3072 Maria recovery 2007-08-29 16:43:01 +02:00
ma_create.c - WL#3072 Maria Recovery: 2007-09-07 15:02:30 +02:00
ma_dbug.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_delete.c - WL#3072 Maria Recovery: 2007-09-07 15:02:30 +02:00
ma_delete_all.c - WL#3072 Maria Recovery: 2007-09-07 15:02:30 +02:00
ma_delete_table.c WL#3072 - Maria recovery 2007-07-26 11:56:21 +02:00
ma_dynrec.c Added applying of undo for updates 2007-09-09 19:15:10 +03:00
ma_extra.c - WL#3072 Maria Recovery: 2007-09-07 15:02:30 +02:00
ma_ft_boolean_search.c merging MyISAM changes into Maria (not done in 5.1->maria merge of 2007-07-27 12:06:39 +02:00
ma_ft_eval.c Fixes after review of guilhem of block record patch 2007-04-19 13:18:56 +03:00
ma_ft_eval.h
ma_ft_nlq_search.c merging MyISAM changes into Maria (not done in 5.1->maria merge of 2007-07-27 12:06:39 +02:00
ma_ft_parser.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_ft_stem.c
ma_ft_test1.c Fixes after review of guilhem of block record patch 2007-04-19 13:18:56 +03:00
ma_ft_test1.h
ma_ft_update.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_ftdefs.h Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_fulltext.h Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_info.c merging MyISAM changes into Maria (not done in 5.1->maria merge of 2007-07-27 12:06:39 +02:00
ma_init.c Merge bk-internal.mysql.com:/home/bk/mysql-maria 2007-07-01 16:48:57 +03:00
ma_key.c merging MyISAM changes into Maria (not done in 5.1->maria merge of 2007-07-27 12:06:39 +02:00
ma_keycache.c Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria.bak 2007-04-16 13:19:43 +03:00
ma_least_recently_dirtied.c
ma_least_recently_dirtied.h
ma_locking.c Merge bk-internal.mysql.com:/home/bk/mysql-maria 2007-09-09 19:22:20 +03:00
ma_loghandler.c Merge bk-internal.mysql.com:/home/bk/mysql-maria 2007-09-09 19:22:20 +03:00
ma_loghandler.h Check of transaction log descriptor table consistance added. 2007-09-04 22:52:32 +03:00
ma_loghandler_lsn.h - WL#3072 Maria Recovery: 2007-09-07 15:02:30 +02:00
ma_open.c Merge bk-internal.mysql.com:/home/bk/mysql-maria 2007-09-09 19:22:20 +03:00
ma_packrec.c Added applying of undo for updates 2007-09-09 19:15:10 +03:00
ma_page.c Ability to read unflushed data added (only problem with CRC left and have to be fixed). 2007-08-13 15:17:49 +03:00
ma_pagecache.c Added undo of deleted row 2007-09-05 02:57:53 +03:00
ma_pagecache.h Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria-noflush 2007-08-13 15:19:31 +03:00
ma_pagecaches.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_panic.c - WL#3239 "log CREATE TABLE in Maria" 2007-06-22 14:49:37 +02:00
ma_preload.c merging MyISAM changes into Maria (not done in 5.1->maria merge of 2007-07-27 12:06:39 +02:00
ma_range.c fixes of bad merge (probably). Less duplication in ma_test_recovery. 2007-08-06 16:13:42 +02:00
ma_recovery.c Merge bk-internal.mysql.com:/home/bk/mysql-maria 2007-09-09 19:22:20 +03:00
ma_recovery.h WL#3072 Maria recovery 2007-08-29 16:43:01 +02:00
ma_rename.c - WL#3072 Maria Recovery: 2007-09-07 15:02:30 +02:00
ma_rfirst.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_rkey.c merging MyISAM changes into Maria (not done in 5.1->maria merge of 2007-07-27 12:06:39 +02:00
ma_rlast.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_rnext.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_rnext_same.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_rprev.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_rrnd.c Fixes for bugs found by maria.test and event*tests: 2007-08-21 20:54:11 +03:00
ma_rsame.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_rsamepos.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_rt_index.c merging MyISAM changes into Maria (not done in 5.1->maria merge of 2007-07-27 12:06:39 +02:00
ma_rt_index.h Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_rt_key.c merging MyISAM changes into Maria (not done in 5.1->maria merge of 2007-07-27 12:06:39 +02:00
ma_rt_key.h Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_rt_mbr.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_rt_mbr.h Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_rt_split.c merging MyISAM changes into Maria (not done in 5.1->maria merge of 2007-07-27 12:06:39 +02:00
ma_rt_test.c
ma_scan.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_search.c merging MyISAM changes into Maria (not done in 5.1->maria merge of 2007-07-27 12:06:39 +02:00
ma_sort.c merging MyISAM changes into Maria (not done in 5.1->maria merge of 2007-07-27 12:06:39 +02:00
ma_sp_defs.h Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_sp_key.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_sp_test.c Fixes after review of guilhem of block record patch 2007-04-19 13:18:56 +03:00
ma_static.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_statrec.c Added applying of undo for updates 2007-09-09 19:15:10 +03:00
ma_test1.c Merge bk-internal.mysql.com:/home/bk/mysql-maria 2007-09-09 19:22:20 +03:00
ma_test2.c WL#3072 - Maria Recovery 2007-09-07 15:52:25 +02:00
ma_test3.c porting Serg's fix for BUG#30094 to Maria. Now ma_test_all passes. 2007-07-27 16:11:40 +02:00
ma_test_all.res
ma_test_all.sh Generalized the way update and redo extends the size of a directory record. 2007-08-31 10:19:54 +03:00
ma_test_recovery - WL#3072 Maria Recovery: 2007-09-07 15:02:30 +02:00
ma_test_recovery.expected - WL#3072 Maria Recovery: 2007-09-07 15:02:30 +02:00
ma_unique.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_update.c Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-maria 2007-07-04 12:20:53 +03:00
ma_write.c - WL#3072 Maria Recovery: 2007-09-07 15:02:30 +02:00
Makefile.am WL#3072 - Maria recovery 2007-07-26 11:56:21 +02:00
maria_chk.c - WL#3072 Maria Recovery: 2007-09-07 15:02:30 +02:00
maria_def.h Merge bk-internal.mysql.com:/home/bk/mysql-maria 2007-09-09 19:22:20 +03:00
maria_ftdump.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
maria_pack.c - WL#3072 Maria Recovery: 2007-09-07 15:02:30 +02:00
maria_read_log.c Added applying of undo for updates 2007-09-09 19:15:10 +03:00
maria_rename.sh
plug.in enable --with-maria-storage-engine 2007-09-07 19:45:33 +02:00
tablockman.c WL#3072 Maria recovery: 2007-08-01 15:52:57 +02:00
tablockman.h
test_pack
trnman.c WL#3072 - Maria Recovery 2007-09-07 15:52:25 +02:00
trnman.h Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
trnman_public.h WL#3072 - Maria Recovery 2007-09-07 15:52:25 +02:00