• unknown's avatar
    Merge some changes from sql directory in 5.1 tree · 13d53bf6
    unknown authored
    Changed format for REDO_INSERT_ROWS_BLOBS
    Fixed several bugs in handling of big blobs
    Added redo_free_head_or_tail() & redo_insert_row_blobs()
    Added uuid to control file
    maria_checks now verifies that not used part of bitmap is 0
    REDO_PURGE_BLOCKS -> REDO_FREE_BLOCKS
    Added REDO_FREE_HEAD_OR_TAIL
    Fixes problem when trying to read block outside of file during REDO
    
    
    include/my_global.h:
      STACK_DIRECTION is already set by configure
    mysql-test/r/maria.result:
      Updated results
    mysql-test/t/maria.test:
      Test shrinking of VARCHAR
    mysys/my_realloc.c:
      Fixed indentation
    mysys/safemalloc.c:
      Fixed indentation
    sql/filesort.cc:
      Removed some casts
    sql/mysqld.cc:
      Added missing setting of myisam_stats_method_str
    sql/uniques.cc:
      Removed some casts
    storage/maria/ma_bitmap.c:
      Added printing of bitmap (for debugging)
      Renamed _ma_print_bitmap() -> _ma_print_bitmap_changes()
      Added _ma_set_full_page_bits()
      Fixed bug in ma_bitmap_find_new_place() (affecting updates) when using big files
    storage/maria/ma_blockrec.c:
      Changed format for REDO_INSERT_ROWS_BLOBS
      Fixed several bugs in handling of big blobs
      Added code to fix some cases where redo when using blobs didn't produce idenital .MAD files as normal usage
      REDO_FREE_ROW_BLOCKS doesn't anymore change pages; We only mark things free in bitmap
      Remove TAIL and filler extents from REDO_FREE_BLOCKS log entry. (Fixed some asserts)
      REDO_PURGE_BLOCKS -> REDO_FREE_BLOCKS
      Delete tails in update. (Fixed bug when doing update that shrinks blob/varchar length)
      Fixed bug when doing insert in block outside of file size.
      Added redo_free_head_or_tail() & redo_insert_row_blobs()
      Added pagecache_unlock_by_link() when read fails.
      Much more comments, DBUG and ASSERT entries
    storage/maria/ma_blockrec.h:
      Prototypes of new functions
      Define of SUB_RANGE_SIZE & BLOCK_FILLER_SIZE
    storage/maria/ma_check.c:
      Verify that not used part of bitmap is 0
    storage/maria/ma_control_file.c:
      Added uuid to control file
    storage/maria/ma_loghandler.c:
      REDO_PURGE_BLOCKS -> REDO_FREE_BLOCKS
      Added REDO_FREE_HEAD_OR_TAIL
    storage/maria/ma_loghandler.h:
      REDO_PURGE_BLOCKS -> REDO_FREE_BLOCKS
      Added REDO_FREE_HEAD_OR_TAIL
    storage/maria/ma_pagecache.c:
      If we write full block, remove error flag for block.
      (Fixes problem when trying to read block outside of file)
    storage/maria/ma_recovery.c:
      REDO_PURGE_BLOCKS -> REDO_FREE_BLOCKS
      Added REDO_FREE_HEAD_OR_TAIL
    storage/maria/ma_test1.c:
      Allow option after 'b' to be compatible with ma_test2
      (This is just to simplify test scripts like ma_test_recovery)
    storage/maria/ma_test2.c:
      Default size of blob is now 1000 instead of 1
    storage/maria/ma_test_all.sh:
      Added test for bigger blobs
    storage/maria/ma_test_recovery.expected:
      Updated results
    storage/maria/ma_test_recovery:
      Added test for bigger blobs
    13d53bf6
mysqld.cc 297 KB