mariadb/storage/maria
unknown 3651e3285d Merge of changes in MyISAM since December 16 -> April 1
Fixes bugs:
Bug#28837  MyISAM storage engine error (134) doing delete with self-join
Bug#31277  myisamchk --unpack corrupts table
Bug#4692   DISABLE/ENABLE KEYS waste a space
Bug#31305  myisam tables crash when they are near capacity


BitKeeper/etc/ignore:
  added unittest/tmp/*
mysql-test/r/maria.result:
  Moved missing tests from myisam.test to maria.test
mysql-test/t/maria.test:
  Moved missing tests from myisam.test to maria.test
storage/maria/ha_maria.cc:
  Merge of changes in MyISAM since December 16 -> April 1
  Fixes bug in self join (Bug#28837: MyISAM storage engine error (134) doing delete with self-join)
storage/maria/ha_maria.h:
  Merge of changes in MyISAM since December 16 -> April 1
storage/maria/ma_blockrec.c:
  Merge of changes in MyISAM since December 16 -> April 1
  Fixes bug in self join (Bug#28837: MyISAM storage engine error (134) doing delete with self-join)
  The problem is that we may be using a cached key page with old information. Versioning will fix this
storage/maria/ma_check.c:
  Merge of changes in MyISAM since December 16 -> April 1
  This fixes a problem with pack_reclength not beeing big enough (Bug #31277 myisamchk --unpack corrupts table)
  BUG#4692 - DISABLE/ENABLE KEYS waste a space
storage/maria/ma_delete.c:
  Indentation fixes
storage/maria/ma_dynrec.c:
  Merge of changes in MyISAM since December 16 -> April 1
  Fixes Bug#31305 myisam tables crash when they are near capacity.
  (This uses a simpler fix than in MyISAM by remembering the length of the current row)
storage/maria/ma_ft_boolean_search.c:
  Merge of all changes from myisam/ft_boolean_search.c (This file had not been kept up to date)
storage/maria/ma_open.c:
  Merge of changes in MyISAM since December 16 -> April 1
  Calculate default_rec_buff_size more exact to be sure it's always big enough
storage/maria/ma_packrec.c:
  Merge of changes in MyISAM since December 16 -> April 1
  Update default_rec_buff_size to be big enough to hold one packed row
  Related to Bug#31277 myisamchk --unpack corrupts table
storage/maria/ma_rnext_same.c:
  Indentation fixes
storage/maria/ma_rt_index.c:
  Merge of changes in MyISAM since December 16 -> April 1
storage/maria/ma_rt_mbr.c:
  Merge of changes in MyISAM since December 16 -> April 1
  (Added comment)
storage/maria/ma_search.c:
  Merge of changes in MyISAM since December 16 -> April 1
  (Added comment)
storage/maria/ma_sort.c:
  Merge of changes in MyISAM since December 16 -> April 1
storage/maria/ma_statrec.c:
  Indentation fixes
storage/maria/ma_test2.c:
  Indentation fixes
storage/maria/maria_chk.c:
  Indentation fixes
storage/maria/maria_pack.c:
  Merge of changes in MyISAM since December 16 -> April 1
2008-04-01 17:57:30 +03:00
..
unittest Very small changes. 2008-03-10 18:55:33 +01:00
CMakeLists.txt Build maria_dump_log under Windows. Enable maria_chk --zerofill-keep-lsn 2008-02-25 17:31:55 +01:00
file_formats.txt Fixed compiler warnings 2008-02-22 17:22:56 +02:00
ft_maria.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ha_maria.cc Merge of changes in MyISAM since December 16 -> April 1 2008-04-01 17:57:30 +03:00
ha_maria.h Merge of changes in MyISAM since December 16 -> April 1 2008-04-01 17:57:30 +03:00
lockman.c Merge bk-internal.mysql.com:/home/bk/mysql-maria 2008-02-21 02:51:51 +02:00
lockman.h solaris fixes 2007-12-18 23:22:55 +01:00
ma_bitmap.c Mac compiler warnings fixed. 2008-02-07 22:46:32 +02:00
ma_blockrec.c Merge of changes in MyISAM since December 16 -> April 1 2008-04-01 17:57:30 +03:00
ma_blockrec.h Fix for BUG#34114 "maria_chk reports false error when several tables on 2008-01-29 22:20:59 +01:00
ma_cache.c Fixed compiler warnings 2008-01-13 00:30:38 +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 of changes in MyISAM since December 16 -> April 1 2008-04-01 17:57:30 +03:00
ma_check_standalone.h WL#3072 Maria recovery. 2007-10-03 18:10:32 +02:00
ma_checkpoint.c Fixes for running maria-recovery*.test and maria-purge.test under 2008-02-06 18:02:05 +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 UNDO of rows now puts back all part of the row on their original pages and positions 2007-12-30 22:40:03 +02:00
ma_commit.c WL#3072 - Maria Recovery 2007-12-30 21:32:07 +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 for failures of ma_control_file-t, ma_test_loghandler_purge-t, 2008-02-11 14:48:03 +01:00
ma_control_file.h Fixes for redo/undo logging of key pages 2007-11-20 17:42:16 +02:00
ma_create.c Fixed excessive assertion reported in BUG#35031 2008-03-04 21:47:07 +01: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 Merge of changes in MyISAM since December 16 -> April 1 2008-04-01 17:57:30 +03:00
ma_delete_all.c Fix for BUG#34114 "maria_chk reports false error when several tables on 2008-01-29 22:20:59 +01:00
ma_delete_table.c Fixed compiler warnings by adding casts and changing variable types 2008-01-11 19:39:43 +02:00
ma_dynrec.c Merge of changes in MyISAM since December 16 -> April 1 2008-04-01 17:57:30 +03:00
ma_extra.c WL#3072 - Maria Recovery 2008-01-17 23:59:32 +01:00
ma_ft_boolean_search.c Merge of changes in MyISAM since December 16 -> April 1 2008-04-01 17:57:30 +03: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 Mac compiler warnings fixed. 2008-02-07 22:46:32 +02:00
ma_ft_parser.c Mac compiler warnings fixed. 2008-02-07 22:46:32 +02: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 Fixed compiler warnings 2008-01-13 00:30:38 +02:00
ma_init.c Moved variables to ma_static.c to avoid link error on MacOSX 2008-01-15 00:02:49 +02:00
ma_key.c Fixed compiler warnings 2008-01-13 00:30:38 +02:00
ma_key_recover.c Merge oleksandr-byelkins-powerbook-g4-15.local:/Users/bell/mysql/bk/mysql-maria 2008-02-08 00:24:22 +02:00
ma_key_recover.h Fixed bug in restoring auto-increment value in case of duplicate key with insert or update 2008-01-31 03:06:04 +02: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 Very small changes. 2008-03-10 18:55:33 +01:00
ma_loghandler.c Fixed bug of non-unlocked rw-lock in case of 2008-03-24 01:38:57 +02:00
ma_loghandler.h Fix for bug in log handler observed when running maria-big 2008-02-08 15:35:02 +01:00
ma_loghandler_lsn.h Added --with-maria-tmp-tables (default one) to allow on to configure if Maria should be used for internal temporary tables 2008-01-10 21:21:36 +02:00
ma_open.c Merge of changes in MyISAM since December 16 -> April 1 2008-04-01 17:57:30 +03:00
ma_packrec.c Merge of changes in MyISAM since December 16 -> April 1 2008-04-01 17:57:30 +03:00
ma_page.c Merge oleksandr-byelkins-powerbook-g4-15.local:/Users/bell/mysql/bk/mysql-maria 2008-02-08 00:24:22 +02:00
ma_pagecache.c Fixed statistic calculation. 2008-03-11 18:12:08 +02:00
ma_pagecache.h copyright and license info 2008-03-04 12:58:21 +01:00
ma_pagecaches.c copyright and license info 2008-03-04 12:58:21 +01:00
ma_pagecrc.c copyright and license info 2008-03-04 12:58:21 +01:00
ma_panic.c merge 2007-12-31 12:52:45 +01:00
ma_preload.c Fix for BUG#34089 "Maria crash on LOAD INDEX after FLUSH TABLES". 2008-03-04 12:47:02 +01: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 Merge bk-internal.mysql.com:/home/bk/mysql-maria 2008-02-21 02:51:51 +02:00
ma_recovery.h UNDO of rows now puts back all part of the row on their original pages and positions 2007-12-30 22:40:03 +02:00
ma_recovery_util.c Fix for BUG#34114 "maria_chk reports false error when several tables on 2008-01-29 22:20:59 +01:00
ma_recovery_util.h WL#3072 - Maria Recovery 2008-01-17 23:59:32 +01:00
ma_rename.c WL#3072 - Maria Recovery 2008-01-17 23:59:32 +01: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 Merge of changes in MyISAM since December 16 -> April 1 2008-04-01 17:57:30 +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 Fixed problems with ma_test2 and mi_test2 on high-byte-first system 2008-02-21 02:45:02 +02:00
ma_rsamepos.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_rt_index.c Merge of changes in MyISAM since December 16 -> April 1 2008-04-01 17:57:30 +03: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 Merge of changes in MyISAM since December 16 -> April 1 2008-04-01 17:57:30 +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 Fix for pushbuild problems: innocuous Valgrind error (uninitialized 2008-03-21 22:29:05 +01:00
ma_rt_test.c Mac compiler warnings fixed. 2008-02-07 22:46:32 +02:00
ma_scan.c Fixed problems with ma_test2 and mi_test2 on high-byte-first system 2008-02-21 02:45:02 +02:00
ma_search.c Merge of changes in MyISAM since December 16 -> April 1 2008-04-01 17:57:30 +03:00
ma_sort.c Merge of changes in MyISAM since December 16 -> April 1 2008-04-01 17:57:30 +03: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 Support of moving logs in other directory then data root. 2008-01-26 23:03:23 +02:00
ma_statrec.c Merge of changes in MyISAM since December 16 -> April 1 2008-04-01 17:57:30 +03:00
ma_test1.c Compiler warnings fixed. 2008-01-30 08:01:45 +02:00
ma_test2.c Merge of changes in MyISAM since December 16 -> April 1 2008-04-01 17:57:30 +03:00
ma_test3.c Windows fixes 2008-01-10 13:21:53 +01: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 New version of ma_test_all 2008-01-08 22:21:28 +02:00
ma_test_big.sh UNDO of rows now puts back all part of the row on their original pages and positions 2007-12-30 22:40:03 +02:00
ma_test_recovery New version of ma_test_recovery.pl 2008-02-20 18:42:12 +02:00
ma_unique.c Merged with mysql-5.1 main tree. 2007-07-02 20:45:15 +03:00
ma_update.c Fixed bug in restoring auto-increment value in case of duplicate key with insert or update 2008-01-31 03:06:04 +02:00
ma_write.c Merge from 5.1-build of the "my_bool for C" changeset. 2008-02-19 00:00:58 +01:00
Makefile.am copyright and license info 2008-03-04 12:58:21 +01:00
maria_chk.c Merge of changes in MyISAM since December 16 -> April 1 2008-04-01 17:57:30 +03:00
maria_def.h Fix for BUG#34089 "Maria crash on LOAD INDEX after FLUSH TABLES". 2008-03-04 12:47:02 +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 Merge of changes in MyISAM since December 16 -> April 1 2008-04-01 17:57:30 +03:00
maria_read_log.c Support of moving logs in other directory then data root. 2008-01-26 23:03:23 +02:00
maria_rename.sh Added storage/maria (based on MyISAM). WL#3245 2006-04-11 16:45:10 +03:00
plug.in Minor changes. New description in SHOW ENGINES for Maria. 2008-01-31 23:17:50 +01:00
tablockman.c Windows fixes 2008-01-10 13:21:53 +01:00
tablockman.h solaris fixes 2007-12-18 23:22:55 +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 2008-01-11 22:48:54 +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 2008-01-11 22:48:54 +01:00