• unknown's avatar
    After merge fixes · 6686a3ee
    unknown authored
    Read blocks through page cache in check_block_record()
    Don't read first bitmap on ma_open()
    Don't require that a files block_size is equal to maria_block_size, if page cache is not setup yet.
    Changed ma_test1, ma_test2, maria_chk and maria_pack to always create a page cache.
    The above fixes so that ma_test_all now works again
    
    
    
    BitKeeper/etc/ignore:
      added storage/maria/unittest/ma_pagecache_consist_1k-t-big storage/maria/unittest/ma_pagecache_consist_1kHC-t-big storage/maria/unittest/ma_pagecache_consist_1kRD-t-big storage/maria/unittest/ma_pagecache_consist_1kWR-t-big storage/maria/unittest/ma_pagecache_consist_64k-t-big storage/maria/unittest/ma_pagecache_consist_64kHC-t-big storage/maria/unittest/ma_pagecache_consist_64kRD-t-big storage/maria/unittest/ma_pagecache_consist_64kWR-t-big storage/maria/unittest/ma_pagecache_single_64k-t-big
    include/maria.h:
      Added MARIA_MIN_PAGE_CACHE_SIZE
    include/pagecache.h:
      Filedescriptors should be of type File
    storage/maria/ma_bitmap.c:
      After merge fixes
      Create dummy bitmap on startup (can't read first bitmap becasue page cache may not be set up yet)
    storage/maria/ma_blockrec.c:
      After merge fixes
    storage/maria/ma_check.c:
      Use page cache to read rows-in-block rows.
      Don't initialize page cache; It's now done in maria_chk
    storage/maria/ma_dynrec.c:
      Trivial code reorganization
    storage/maria/ma_open.c:
      Don't give error for conflicting block size if page cache is not initalized.
      (Needed for maria_chk to be able to work on tables with different page sizes)
      After merge fixes
    storage/maria/ma_page.c:
      Fix compiler warning
      Remove net needed asserts (Guranteed by ma_create())
    storage/maria/ma_pagecache.c:
      Allow one to create a page cache with just one block
      (For trivail scan of table)
      Trivial code simplication
    storage/maria/ma_test1.c:
      Always create a page cache (Maria now requires a page cache to work)
    storage/maria/ma_test2.c:
      Always create a page cache (Maria now requires a page cache to work)
    storage/maria/maria_chk.c:
      Remove command line options --maria_block_size and --pagecache_block_size.
      Set the global maria_block_size from the data file. This allows maria_chk to work with tables of different block sizes.
      Simply DESCRIPT handling; Allows us to remove one indentation level in maria_chk().
      Always initialize page cache if we are doing check/repair.
      (Most of the patch is reindentation of the code)
    storage/maria/maria_def.h:
      After merge fix
    storage/maria/maria_pack.c:
      Set maria_block_size based on the files block_size.
      Initalize page cache (needed for getting rows-in-blocks to works)
    6686a3ee
.bzrignore 82.2 KB