1. 30 Jan, 2011 3 commits
  2. 29 Jan, 2011 6 commits
  3. 24 Jan, 2011 1 commit
  4. 20 Jan, 2011 2 commits
  5. 12 Jan, 2011 1 commit
  6. 14 Jan, 2011 3 commits
  7. 13 Jan, 2011 1 commit
  8. 12 Jan, 2011 5 commits
  9. 11 Jan, 2011 7 commits
  10. 10 Jan, 2011 2 commits
    • Michael Widenius's avatar
      Automatic merge with 5.1 · 2eaa76b8
      Michael Widenius authored
      2eaa76b8
    • Michael Widenius's avatar
      - Fixed that Aria works with HANDLER commands · 505c663a
      Michael Widenius authored
      - Added test case for Aria
      - Tested HANDLER with HEAP (changes to HEAP code will be pushed in 5.3)
      - Moved all HANDLER test to suite/handler.
      
      
      mysql-test/Makefile.am:
        Added suite/handler
      mysql-test/mysql-test-run.pl:
        Added suite/handler
      mysql-test/r/lock_multi.result:
        Remove test that is already in handler test suite
      mysql-test/suite/handler/aria.result:
        Test for HANDLER with Aria storage engine
      mysql-test/suite/handler/aria.test:
        Test for HANDLER with Aria storage engine
      mysql-test/suite/handler/handler.inc:
        Extended the general handler test
        Moved interface testing to 'interface.test'
      mysql-test/suite/handler/init.inc:
        Common init for handler tests.
      mysql-test/suite/handler/innodb.result:
        New results
      mysql-test/suite/handler/innodb.test:
        Update to use new include files
      mysql-test/suite/handler/interface.result:
        Test of HANDLER interface (not storage engine dependent parts)
      mysql-test/suite/handler/interface.test:
        Test of HANDLER interface (not storage engine dependent parts)
      mysql-test/suite/handler/myisam.result:
        New results
      mysql-test/suite/handler/myisam.test:
        Update to use new include files
      mysql-test/t/lock_multi.test:
        Remove test that is already in handler test suite
      mysys/tree.c:
        Added missing handling of read previous (showed up in HEAP testing)
      sql/handler.cc:
        Don't marka 'HA_ERR_RECORD_CHANGED' as fatal (can be used with HANDLER READ, especially with MEMORY ENGINE)
      sql/handler.h:
        Added prototype for can_continue_handler_scan()
      sql/sql_handler.cc:
        Re-initialize search if we switch from key to table search.
        Check if handler can continue searching between calls (via can_continue_handler_scan())
        Don't write common not fatal errors to log
      storage/maria/ma_extra.c:
        Don't set index 0 as default. This forces call to ma_check_index() to set up index variables.
      storage/maria/ma_ft_boolean_search.c:
        Ensure that info->last_key.keyinfo is set
      storage/maria/ma_open.c:
        Don't set index 0 as default. This forces call to ma_check_index() to set up index variables.
      storage/maria/ma_rkey.c:
        Trivial optimization
      storage/maria/ma_rnext.c:
        Added missing code from mi_rnext.c to ensure that handler next/prev works.
      storage/maria/ma_rsame.c:
        Simple optimizations
      storage/maria/ma_search.c:
        Initialize info->last_key once and for all when we change keys.
      storage/maria/ma_unique.c:
        Ensure that info->last_key.keyinfo is up to date.
      505c663a
  11. 07 Jan, 2011 6 commits
    • Michael Widenius's avatar
      merge with 5.1 · 934c57c7
      Michael Widenius authored
      934c57c7
    • Michael Widenius's avatar
      Don't do DBUG_ASSERT for checksum errors when using REPAIR · c0fc6d42
      Michael Widenius authored
      mysql_convert_table_format ignored --engine option.
      Fix that zerofill() doesn't write out wrong data to client if run with auto repair.
      Ensure that pagecache is properly flushed, even in case of errors.
      Handle checksum errors in BLOCK_RECORD format.
      
      
      scripts/mysql_convert_table_format.sh:
        Fixed that --engine option works
      storage/maria/ha_maria.cc:
        Fix that zerofill() doesn't write out wrong data to client if run with auto repair.
      storage/maria/ma_check.c:
        Set in_check_table when scanning table to not get DBUG_ASSERT for checksum error.
        Ensure that pagecache is properly flushed, even in case of errors.
        Handle checksum errors in BLOCK_RECORD format.
      storage/maria/ma_sort.c:
        Set in_check_table when scanning table to not get DBUG_ASSERT for checksum error.
      c0fc6d42
    • Michael Widenius's avatar
      Fixed typos · b2abd1cb
      Michael Widenius authored
      Patch provided by Dolf Schimmel
      b2abd1cb
    • Michael Widenius's avatar
      Merge with base 5.2 · 53407ecf
      Michael Widenius authored
      53407ecf
    • Michael Widenius's avatar
      Aria fixes: · 26f98859
      Michael Widenius authored
      - Don't delete pages without flushing that has had a tail or head information in pagecache_delete()
        This fixes a case where REPAIR could find old deleted rows.
      
      
      storage/maria/ha_maria.cc:
        Remove calls to depricated function ha_statistic_increment
      storage/maria/ma_blockrec.c:
        Don't delete pages without flushing that has had a tail or head information in pagecache_delete()
      storage/maria/ma_pagecache.c:
        Added possibility to mark pages to not be deleted by pagecache_delete() without beeing flushed.
      storage/maria/ma_pagecache.h:
        Added new prototype
      26f98859
    • Michael Widenius's avatar
      Merge with 5.1 · fdaaf48c
      Michael Widenius authored
      fdaaf48c
  12. 06 Jan, 2011 2 commits
    • Michael Widenius's avatar
      Bug fixing in Aria: · 5b0afd8a
      Michael Widenius authored
      - Fixed some bugs in recovery of blobs
      - Don't ASSERT() on checksum errors when running check table
      - Added to maria_read_log option --tables-to-redo=list-of-tables to only recover some tables (good for debugging)
      
      
      storage/maria/ma_blockrec.c:
        Don't ASSERT() on checksum errors when running check table
        Fixed bug in recovery of blog page that was not in dirty pages list
      storage/maria/ma_check.c:
        Don't ASSERT() on checksum errors when running check table
      storage/maria/ma_recovery.c:
        Handling of --tables-to-redo
      storage/maria/ma_recovery.h:
        Handling of --tables-to-redo
      storage/maria/ma_recovery_util.c:
        Give better warning if table was not in dirty pages list
      storage/maria/maria_def.h:
        Added in_check_table
      storage/maria/maria_read_log.c:
        Added --tables-to-redo=list-of-tables to only recover some tables (good for debugging)
        Cleaned up message when wrong arguments
      5b0afd8a
    • unknown's avatar
  13. 05 Jan, 2011 1 commit