mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/storage/maria
History
unknown 90b63bf754 WL#3072 Maria recovery 
manual merge of ma_recovery.c (too big conflict to resolve in fmtool);
the merged Monty's code allows correct replaying of REDO_PURGE_BLOCKS
and was originally in
monty@mysql.com/narttu.mysql.fi|ChangeSet|20070829060310|44058


storage/maria/ma_recovery.c:
  * manually merging Monty's and Sanja's changes of the two last weeks
  to my massively modified version of this file. The merged Monty's
  code allows correct replaying of REDO_PURGE_BLOCKS and was originally
  in monty@mysql.com/narttu.mysql.fi|ChangeSet|20070829060310|44058 .
  * Setting the state to "STATE_CHANGED|etc" in Recovery is more
  logically done when we update the state in memory (for example
  records++).
2007-08-29 22:02:30 +02:00
..
unittest Fixed compiler warnings 2007-08-22 10:56:10 +03:00
CMakeLists.txt
ft_maria.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ha_maria.cc Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-maria 2007-08-29 17:53:54 +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
lockman.h
ma_bitmap.c WL#3072 Maria recovery 2007-08-29 16:43:01 +02:00
ma_blockrec.c Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-maria 2007-08-29 17:53:54 +02:00
ma_blockrec.h merge 2007-07-26 12:15:47 +02: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 WL#3072 Maria recovery 2007-08-29 16:43:01 +02:00
ma_checkpoint.c First LSN calls added for transaction log. 2007-08-13 22:54:29 +03:00
ma_checkpoint.h
ma_checksum.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_close.c Fix for 2007-08-08 18:59:57 +02:00
ma_commit.c cleanups 2007-08-29 17:28:44 +02:00
ma_commit.h
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-08-29 16:43:01 +02:00
ma_dbug.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_delete.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_delete_all.c WL#3072 Maria recovery: 2007-08-01 15:52:57 +02:00
ma_delete_table.c WL#3072 - Maria recovery 2007-07-26 11:56:21 +02:00
ma_dynrec.c merging MyISAM changes into Maria (not done in 5.1->maria merge of 2007-07-27 12:06:39 +02:00
ma_extra.c Fix for three bugs: 2007-08-07 16:06:42 +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
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
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
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
ma_least_recently_dirtied.c
ma_least_recently_dirtied.h
ma_locking.c Merge bk-internal.mysql.com:/home/bk/mysql-maria 2007-07-05 10:35:56 +02:00
ma_loghandler.c Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-maria 2007-08-29 17:53:54 +02:00
ma_loghandler.h Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-maria 2007-08-29 17:53:54 +02:00
ma_loghandler_lsn.h Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-maria 2007-08-29 17:53:54 +02:00
ma_open.c WL#3072 Maria recovery 2007-08-29 16:43:01 +02:00
ma_packrec.c post-merge fixes, and fixes for some of the 16 compiler warnings 2007-07-26 17:51:49 +02: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 Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria-noflush 2007-08-13 15:19:31 +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
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 WL#3072 Maria recovery 2007-08-29 22:02:30 +02:00
ma_recovery.h WL#3072 Maria recovery 2007-08-29 16:43:01 +02:00
ma_rename.c WL#3072 - Maria recovery 2007-07-26 11:56:21 +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
ma_static.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_statrec.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_test1.c Added maria_commit() and maria_begin() to be used with external tests 2007-08-29 09:03:10 +03:00
ma_test2.c Added maria_commit() and maria_begin() to be used with external tests 2007-08-29 09:03:10 +03: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 WL#3072 - Maria recovery 2007-07-26 11:56:21 +02:00
ma_test_recovery Added maria_commit() and maria_begin() to be used with external tests 2007-08-29 09:03:10 +03: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 Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
Makefile.am WL#3072 - Maria recovery 2007-07-26 11:56:21 +02:00
maria_chk.c Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-maria 2007-08-29 17:53:54 +02:00
maria_def.h cleanups 2007-08-29 17:28:44 +02:00
maria_ftdump.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
maria_pack.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
maria_read_log.c Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-maria 2007-08-29 17:53:54 +02:00
maria_rename.sh
plug.in
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-08-29 16:43:01 +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-08-29 16:43:01 +02:00