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


include/maria.h:
  Auto merged
storage/maria/ha_maria.cc:
  Auto merged
storage/maria/ma_bitmap.c:
  Auto merged
storage/maria/ma_check.c:
  Auto merged
storage/maria/ma_dynrec.c:
  Auto merged
storage/maria/ma_info.c:
  Auto merged
storage/maria/ma_open.c:
  Auto merged
storage/maria/ma_packrec.c:
  Auto merged
storage/maria/ma_page.c:
  Auto merged
storage/maria/ma_test1.c:
  Auto merged
storage/maria/ma_test2.c:
  Auto merged
storage/maria/ma_write.c:
  Auto merged
storage/maria/maria_chk.c:
  Auto merged
storage/maria/maria_pack.c:
  Auto merged
storage/maria/ma_blockrec.c:
  Manual merge
storage/maria/ma_close.c:
  Manual merge
storage/maria/maria_def.h:
  Manual merge
2007-04-19 16:22:58 +03:00
..
unittest Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria.bak 2007-04-16 13:19:43 +03:00
CMakeLists.txt fixed typo 2006-11-15 12:58:37 +02:00
ft_maria.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ha_maria.cc Merge bk-internal.mysql.com:/home/bk/mysql-maria 2007-04-19 16:22:58 +03:00
ha_maria.h Fixes after review of guilhem of block record patch 2007-04-19 13:18:56 +03:00
lockman.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
lockman.h GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_bitmap.c Merge bk-internal.mysql.com:/home/bk/mysql-maria 2007-04-19 16:22:58 +03:00
ma_blockrec.c Merge bk-internal.mysql.com:/home/bk/mysql-maria 2007-04-19 16:22:58 +03:00
ma_blockrec.h Fixes after review of guilhem of block record patch 2007-04-19 13:18:56 +03:00
ma_cache.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_changed.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_check.c Merge bk-internal.mysql.com:/home/bk/mysql-maria 2007-04-19 16:22:58 +03:00
ma_checkpoint.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_checkpoint.h GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_checksum.c Fixes after review of guilhem of block record patch 2007-04-19 13:18:56 +03:00
ma_close.c Merge bk-internal.mysql.com:/home/bk/mysql-maria 2007-04-19 16:22:58 +03:00
ma_control_file.c Maria: a stronger checksum in the control file, to test integrity. 2007-03-02 12:15:19 +01:00
ma_control_file.h GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_create.c Fixes after review of guilhem of block record patch 2007-04-19 13:18:56 +03:00
ma_dbug.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_delete.c Fixes after review of guilhem of block record patch 2007-04-19 13:18:56 +03:00
ma_delete_all.c Postmerge fixes. 2007-04-18 12:55:09 +03:00
ma_delete_table.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_dynrec.c Merge bk-internal.mysql.com:/home/bk/mysql-maria 2007-04-19 16:22:58 +03:00
ma_extra.c Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria.bak 2007-04-16 13:19:43 +03:00
ma_ft_boolean_search.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01: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 GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_ft_nlq_search.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_ft_parser.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_ft_stem.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
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 GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_ft_update.c Fixes after review of guilhem of block record patch 2007-04-19 13:18:56 +03:00
ma_ftdefs.h GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_fulltext.h GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_info.c Merge bk-internal.mysql.com:/home/bk/mysql-maria 2007-04-19 16:22:58 +03:00
ma_init.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_key.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01: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 GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_least_recently_dirtied.h GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_locking.c Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria.bak 2007-04-16 13:19:43 +03:00
ma_loghandler.c Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria.bak 2007-04-16 13:19:43 +03:00
ma_loghandler.h Pagecache integration for review. 2007-04-04 23:37:09 +03:00
ma_loghandler_lsn.h comments fixed 2007-02-27 10:59:01 +02:00
ma_open.c Merge bk-internal.mysql.com:/home/bk/mysql-maria 2007-04-19 16:22:58 +03:00
ma_packrec.c Merge bk-internal.mysql.com:/home/bk/mysql-maria 2007-04-19 16:22:58 +03:00
ma_page.c Merge bk-internal.mysql.com:/home/bk/mysql-maria 2007-04-19 16:22:58 +03:00
ma_pagecache.c Postmerge fixes. 2007-04-18 12:55:09 +03:00
ma_pagecaches.c Postmerge fixes. 2007-04-18 12:55:09 +03:00
ma_panic.c Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria.bak 2007-04-16 13:19:43 +03:00
ma_preload.c Postmerge fixes. 2007-04-18 12:55:09 +03:00
ma_range.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_recovery.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_recovery.h GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_rename.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_rfirst.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_rkey.c Fixes after review of guilhem of block record patch 2007-04-19 13:18:56 +03:00
ma_rlast.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_rnext.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_rnext_same.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_rprev.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_rrnd.c Fixes after review of guilhem of block record patch 2007-04-19 13:18:56 +03:00
ma_rsame.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_rsamepos.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_rt_index.c Fixes after review of guilhem of block record patch 2007-04-19 13:18:56 +03:00
ma_rt_index.h GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_rt_key.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_rt_key.h GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_rt_mbr.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_rt_mbr.h GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_rt_split.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_rt_test.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_scan.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_search.c Fixes after review of guilhem of block record patch 2007-04-19 13:18:56 +03:00
ma_sort.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_sp_defs.h GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_sp_key.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01: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 Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria.bak 2007-04-16 13:19:43 +03:00
ma_statrec.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_test1.c Merge bk-internal.mysql.com:/home/bk/mysql-maria 2007-04-19 16:22:58 +03:00
ma_test2.c Merge bk-internal.mysql.com:/home/bk/mysql-maria 2007-04-19 16:22:58 +03:00
ma_test3.c Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria.bak 2007-04-16 13:19:43 +03:00
ma_test_all.res After merge fixes 2007-01-26 13:32:02 +02:00
ma_test_all.sh Implementation of rows-in-block 2007-01-18 21:38:14 +02:00
ma_unique.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
ma_update.c Fixes after review of guilhem of block record patch 2007-04-19 13:18:56 +03:00
ma_write.c Merge bk-internal.mysql.com:/home/bk/mysql-maria 2007-04-19 16:22:58 +03:00
Makefile.am Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria.bak 2007-04-16 13:19:43 +03:00
maria_chk.c Merge bk-internal.mysql.com:/home/bk/mysql-maria 2007-04-19 16:22:58 +03:00
maria_def.h Merge bk-internal.mysql.com:/home/bk/mysql-maria 2007-04-19 16:22:58 +03:00
maria_ftdump.c Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria.bak 2007-04-16 13:19:43 +03:00
maria_pack.c Merge bk-internal.mysql.com:/home/bk/mysql-maria 2007-04-19 16:22:58 +03:00
maria_rename.sh Added storage/maria (based on MyISAM). WL#3245 2006-04-11 16:45:10 +03:00
plug.in Maria - merging recent changes done to MyISAM into Maria. 2006-12-19 19:15:53 +01:00
tablockman.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
tablockman.h GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
test_pack Added storage/maria (based on MyISAM). WL#3245 2006-04-11 16:45:10 +03:00
trnman.c GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00
trnman.h GPL license update (same change as was done for all files in 5.1). 2007-03-02 11:20:23 +01:00