mariadb/storage/maria
unknown 98a2c5e3cf Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria
into  desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria-readonly


storage/maria/ha_maria.cc:
  Auto merged
storage/maria/ma_create.c:
  Auto merged
storage/maria/ma_open.c:
  Auto merged
storage/maria/ma_test1.c:
  Auto merged
storage/maria/ma_test2.c:
  Auto merged
storage/maria/unittest/ma_test_loghandler-t.c:
  Auto merged
storage/maria/unittest/ma_test_loghandler_first_lsn-t.c:
  Auto merged
storage/maria/unittest/ma_test_loghandler_max_lsn-t.c:
  Auto merged
storage/maria/unittest/ma_test_loghandler_multigroup-t.c:
  Auto merged
storage/maria/unittest/ma_test_loghandler_multithread-t.c:
  Auto merged
storage/maria/unittest/ma_test_loghandler_noflush-t.c:
  Auto merged
storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
  Auto merged
storage/maria/unittest/ma_test_loghandler_purge-t.c:
  Auto merged
storage/maria/ma_check.c:
  Merge.
storage/maria/ma_loghandler.c:
  Merge.
storage/maria/ma_loghandler.h:
  Merge.
storage/maria/maria_read_log.c:
  Merge.
storage/maria/unittest/Makefile.am:
  Merge.
2007-12-15 16:07:16 +02:00
..
unittest Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria 2007-12-15 16:07:16 +02:00
CMakeLists.txt After merge fixes. Applied changes made in myisam manually to maria. 2007-10-04 20:33:42 +03:00
ft_maria.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ha_maria.cc Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria 2007-12-15 16:07:16 +02:00
ha_maria.h fixed typo in the comment. 2007-10-15 22:02:18 +03:00
lockman.c First part of redo/undo for key pages 2007-11-14 19:08:06 +02: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 WL#3072 Maria Recovery. 2007-12-15 14:17:23 +01:00
ma_blockrec.c Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-maria 2007-12-15 14:23:43 +01:00
ma_blockrec.h WL#3072 Maria Recovery. 2007-12-15 14:17:23 +01:00
ma_cache.c Added error HA_ERR_FILE_TOO_SHORT to be used when files are shorter than expected (by my_read/my_pread) 2007-12-04 23:23:42 +02: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 desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria 2007-12-15 16:07:16 +02:00
ma_check_standalone.h WL#3072 Maria recovery. 2007-10-03 18:10:32 +02:00
ma_checkpoint.c fix for some gcc -ansi warnings. 2007-12-14 17:24:46 +01:00
ma_checkpoint.h WL#3071 Maria checkpoint, WL#3072 Maria recovery 2007-11-16 17:09:51 +01:00
ma_checksum.c Moved randomize and my_rnd under mysys 2007-10-09 21:09:50 +03:00
ma_close.c Added MARIA_SHARE *share to a lot of places to make code simpler 2007-12-10 02:32:00 +02:00
ma_commit.c WL#3072 - Maria recovery. 2007-12-14 16:14:12 +01:00
ma_commit.h - WL#3239 "log CREATE TABLE in Maria" 2007-06-22 14:49:37 +02:00
ma_control_file.c Fix bug with skipped syncing. 2007-11-30 21:28:39 +02:00
ma_control_file.h Fixes for redo/undo logging of key pages 2007-11-20 17:42:16 +02:00
ma_create.c Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria 2007-12-15 16:07:16 +02:00
ma_dbug.c Added MARIA_SHARE *share to a lot of places to make code simpler 2007-12-10 02:32:00 +02:00
ma_delete.c Added MARIA_SHARE *share to a lot of places to make code simpler 2007-12-10 02:32:00 +02:00
ma_delete_all.c Added MARIA_SHARE *share to a lot of places to make code simpler 2007-12-10 02:32:00 +02:00
ma_delete_table.c WL#3072 - Maria recovery. 2007-10-02 18:02:09 +02:00
ma_dynrec.c Fixed bug in allocation of dynamic record buffer in Maria 2007-12-10 14:21:45 +02:00
ma_extra.c WL#3072 Maria recovery: 2007-12-10 23:26:53 +01: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 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 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 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 Added MARIA_SHARE *share to a lot of places to make code simpler 2007-12-10 02:32:00 +02: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 Added MARIA_SHARE *share to a lot of places to make code simpler 2007-12-10 02:32:00 +02:00
ma_init.c Fixed core dump when running myisamchk (as this doesn't call translog_init) 2007-12-10 03:23:15 +02:00
ma_key.c WL#3072 - Maria Recovery: recovery of state.auto_increment. 2007-12-12 22:33:36 +01:00
ma_key_recover.c WL#3072 - Maria recovery. 2007-12-14 16:14:12 +01:00
ma_key_recover.h WL#3072 - Maria Recovery: recovery of state.auto_increment. 2007-12-12 22:33:36 +01:00
ma_keycache.c After merge fixes. Applied changes made in myisam manually to maria. 2007-10-04 20:33:42 +03:00
ma_locking.c Added MARIA_SHARE *share to a lot of places to make code simpler 2007-12-10 02:32:00 +02:00
ma_loghandler.c Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria 2007-12-15 16:07:16 +02:00
ma_loghandler.h Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria 2007-12-15 16:07:16 +02:00
ma_loghandler_lsn.h Trivial postreview changes. 2007-12-06 13:32:16 +02:00
ma_open.c Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria 2007-12-15 16:07:16 +02:00
ma_packrec.c Removed MARIA_BASE min_row_length (duplicate of min_block_length) 2007-12-12 23:57:28 +02:00
ma_page.c pushbuild fixes to please gcc and darwin/ppc64 2007-12-14 23:26:17 +01:00
ma_pagecache.c fix for some gcc -ansi warnings. 2007-12-14 17:24:46 +01:00
ma_pagecache.h Don't give warnings when reading blocks when we know the block may not exist (in maria_read_log) 2007-12-05 00:45:32 +02:00
ma_pagecaches.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_panic.c First part of redo/undo for key pages 2007-11-14 19:08:06 +02:00
ma_preload.c Added MARIA_SHARE *share to a lot of places to make code simpler 2007-12-10 02:32:00 +02:00
ma_range.c Added MARIA_SHARE *share to a lot of places to make code simpler 2007-12-10 02:32:00 +02:00
ma_recovery.c fix for some gcc -ansi warnings. 2007-12-14 17:24:46 +01:00
ma_recovery.h WL#3072 - Maria recovery 2007-11-14 12:51:16 +01:00
ma_rename.c WL#3072 - Maria recovery. 2007-10-02 18:02:09 +02:00
ma_rfirst.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_rkey.c Added MARIA_SHARE *share to a lot of places to make code simpler 2007-12-10 02:32:00 +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 Added MARIA_SHARE *share to a lot of places to make code simpler 2007-12-10 02:32:00 +02: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 Added MARIA_SHARE *share to a lot of places to make code simpler 2007-12-10 02:32:00 +02:00
ma_rt_index.h Added MARIA_SHARE *share to a lot of places to make code simpler 2007-12-10 02:32:00 +02:00
ma_rt_key.c Added MARIA_SHARE *share to a lot of places to make code simpler 2007-12-10 02:32:00 +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 Added MARIA_SHARE *share to a lot of places to make code simpler 2007-12-10 02:32:00 +02:00
ma_rt_mbr.h Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_rt_split.c Added MARIA_SHARE *share to a lot of places to make code simpler 2007-12-10 02:32:00 +02:00
ma_rt_test.c Moved randomize and my_rnd under mysys 2007-10-09 21:09:50 +03:00
ma_scan.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_search.c Added MARIA_SHARE *share to a lot of places to make code simpler 2007-12-10 02:32:00 +02:00
ma_sort.c Added MARIA_SHARE *share to a lot of places to make code simpler 2007-12-10 02:32:00 +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 After merge fixes. Applied changes made in myisam manually to maria. 2007-10-04 20:33:42 +03:00
ma_sp_test.c After merge fixes. Applied changes made in myisam manually to maria. 2007-10-04 20:33:42 +03:00
ma_static.c Added error HA_ERR_FILE_TOO_SHORT to be used when files are shorter than expected (by my_read/my_pread) 2007-12-04 23:23:42 +02:00
ma_statrec.c Added MARIA_SHARE *share to a lot of places to make code simpler 2007-12-10 02:32:00 +02:00
ma_test1.c Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria 2007-12-15 16:07:16 +02:00
ma_test2.c Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria 2007-12-15 16:07:16 +02:00
ma_test3.c Added error HA_ERR_FILE_TOO_SHORT to be used when files are shorter than expected (by my_read/my_pread) 2007-12-04 23:23:42 +02:00
ma_test_all.res Fixes for redo/undo logging of key pages 2007-11-20 17:42:16 +02:00
ma_test_all.sh WL#3072 - Maria Recovery: recovery of state.auto_increment. 2007-12-12 22:33:36 +01:00
ma_test_recovery WL#3072 Maria recovery: small fixes to ma_test_recovery 2007-12-11 19:38:40 +01:00
ma_test_recovery.expected WL#3072 Maria recovery: small fixes to ma_test_recovery 2007-12-11 19:38:40 +01:00
ma_unique.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_update.c WL#3072 - Maria Recovery: recovery of state.auto_increment. 2007-12-12 22:33:36 +01:00
ma_write.c WL#3072 - Maria Recovery: recovery of state.auto_increment. 2007-12-12 22:33:36 +01:00
Makefile.am Removed MARIA_BASE min_row_length (duplicate of min_block_length) 2007-12-12 23:57:28 +02:00
maria_chk.c WL#3072 - Maria recovery. 2007-12-14 16:14:12 +01:00
maria_def.h WL#3072 Maria Recovery. 2007-12-15 14:17:23 +01:00
maria_ftdump.c Added error HA_ERR_FILE_TOO_SHORT to be used when files are shorter than expected (by my_read/my_pread) 2007-12-04 23:23:42 +02:00
maria_pack.c Added error HA_ERR_FILE_TOO_SHORT to be used when files are shorter than expected (by my_read/my_pread) 2007-12-04 23:23:42 +02:00
maria_read_log.c Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria 2007-12-15 16:07:16 +02:00
maria_rename.sh Added storage/maria (based on MyISAM). WL#3245 2006-04-11 16:45:10 +03:00
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 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 WL#3072 - Maria recovery. 2007-12-14 16:14:12 +01: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-12-14 16:14:12 +01:00