1. 30 Jan, 2008 1 commit
    • unknown's avatar
      Compiler warnings fixed. · dc365245
      unknown authored
      
      storage/maria/ma_loghandler.c:
        Compiler warning fixed.
      storage/maria/ma_test1.c:
        Compiler warning fixed.
      storage/maria/ma_test2.c:
        Compiler warning fixed.
      storage/maria/maria_chk.c:
        Compiler warning fixed.
      storage/maria/unittest/ma_control_file-t.c:
        Compiler warning fixed.
      storage/maria/unittest/ma_test_loghandler-t.c:
        Compiler warning fixed.
      storage/maria/unittest/ma_test_loghandler_first_lsn-t.c:
        Compiler warning fixed.
      storage/maria/unittest/ma_test_loghandler_max_lsn-t.c:
        Compiler warning fixed.
      storage/maria/unittest/ma_test_loghandler_multigroup-t.c:
        Compiler warning fixed.
      storage/maria/unittest/ma_test_loghandler_multithread-t.c:
        Compiler warning fixed.
      storage/maria/unittest/ma_test_loghandler_noflush-t.c:
        Compiler warning fixed.
      storage/maria/unittest/ma_test_loghandler_nologs-t.c:
        Compiler warning fixed.
      storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
        Compiler warning fixed.
      storage/maria/unittest/ma_test_loghandler_purge-t.c:
        Compiler warning fixed.
      dc365245
  2. 29 Jan, 2008 6 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-maria · e89cc606
      unknown authored
      into  janus.mylan:/usr/home/serg/Abk/mysql-maria
      
      
      e89cc606
    • unknown's avatar
      ma_test_recovery is not big · b9bab099
      unknown authored
      
      storage/maria/unittest/ma_test_all-t:
        Size doesn't matter or ma_test_recovery is not big
      b9bab099
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-maria · 57b7bdab
      unknown authored
      into  janus.mylan:/usr/home/serg/Abk/mysql-maria
      
      
      57b7bdab
    • unknown's avatar
      changes for big unit tests · db58a137
      unknown authored
      
      Makefile.am:
        make test-unit-big
      storage/maria/unittest/Makefile.am:
        support big unit tests
      storage/maria/unittest/ma_pagecache_consist.c:
        support big unit tests and other changes
      storage/maria/unittest/ma_pagecache_single.c:
        support big unit tests
      storage/maria/unittest/ma_test_all-t:
        support big unit tests and sub skip()
      storage/maria/unittest/ma_test_loghandler-t.c:
        support big unit tests
      unittest/unit.pl:
        don't ignore existing $MYTAP_CONFIG
      db58a137
    • unknown's avatar
      storage/maria/unittest/ma_test_all-t · 71eb292f
      unknown authored
          1. reasonable defaults for maria_path
          2. reasonable TAP-compatible output in non-verbose mode
      unittest/Makefile.am
          remove maria_path hack
      BitKeeper/etc/ignore@1.269
          added maria_log.00000* ma_test_recovery.output test?.MA?
      
      
      BitKeeper/etc/ignore:
        added maria_log.00000* ma_test_recovery.output test?.MA?
      storage/maria/unittest/ma_test_all-t:
        1. reasonable defaults for maria_path
        2. reasonable TAP-compatible output in non-verbose mode
      unittest/Makefile.am:
        remove maria_path hack
      71eb292f
    • unknown's avatar
      Fixed unused branch of page write call. · e13538dc
      unknown authored
      e13538dc
  3. 26 Jan, 2008 2 commits
    • unknown's avatar
      Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria · 1824f47a
      unknown authored
      into  desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria-logdir
      
      
      1824f47a
    • unknown's avatar
      Support of moving logs in other directory then data root. · a1255fc2
      unknown authored
      Fixed typo in maria_read_log "help" output.
      Compilation warning on Mac OS fixed.
      
      
      mysql-test/include/maria_empty_logs.inc:
        Added support of moving maria log relatively
          to master data directory.
      mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc:
        Added support of moving maria log relatively
          to master data directory.
      mysql-test/include/maria_verify_recovery.inc:
        Added support of moving maria log relatively
          to master data directory.
      mysql-test/t/maria-recovery-master.opt:
        Check of recovery with logs in other place.
      mysql-test/t/maria-recovery.test:
        Check of recovery with logs in other place.
      storage/maria/ha_maria.cc:
        Support of moving logs in other directory then data root.
      storage/maria/ma_loghandler.c:
        Compilation warning on Mac OS fixed.
      storage/maria/ma_static.c:
        Support of moving logs in other directory then data root.
      storage/maria/ma_test1.c:
        Support of moving logs in other directory then data root.
      storage/maria/maria_def.h:
        Support of moving logs in other directory then data root.
      storage/maria/maria_read_log.c:
        Support of moving logs in other directory then data root.
        Fixed typo in maria_read_log "help" output.
      a1255fc2
  4. 25 Jan, 2008 1 commit
  5. 23 Jan, 2008 1 commit
    • unknown's avatar
      Fixed bug when using maria_chk --safe-recover with packed tables · b40a6348
      unknown authored
      Fixed bug when using maria_chk --safe-recover and getting duplicated keys
      Fixed bug when using maria_pack --join
      
      
      storage/maria/ma_check.c:
        Fixed bug when using --safe-recover with packed tables
        Fixed bug when using --safe-recover and getting duplicated keys
      storage/maria/maria_pack.c:
        Fixed bug when using --join
      storage/maria/unittest/ma_test_all-t:
        Added test to check maria_pack --join
      b40a6348
  6. 22 Jan, 2008 1 commit
    • unknown's avatar
      Fixes for the remaining 'not-yet-fixed' bugs found by Guilhem when running all... · 7a4bd76a
      unknown authored
      Fixes for the remaining 'not-yet-fixed' bugs found by Guilhem when running all tests with maria engine and one bug in maria_pack reported by Martin:
      - Fix that query cache works with Maria
      - Fixed wrong calculation if min_key_length which casued some tables to assert in insert if key contained NULL
      - Restore auto_increment value if insert statement fails
      - Fixed rare bug that caused crash in maria_pack if buffer was flushed at wrong point in time
      
      
      configure.in:
        Added maria extension to distribution
      mysql-test/r/maria.result:
        More test cases to cover bugs found by Guilhem
      mysql-test/t/maria.test:
        More test cases to cover bugs found by Guilhem
      storage/maria/ha_maria.cc:
        Fix that query cache works with Maria
      storage/maria/ma_blockrec.c:
        Removed duplicate functionallity (already done in ma_pagecrc.c)
      storage/maria/ma_create.c:
        Fixed wrong calculation if min_key_length which casued some tables to assert in insert if key contained NULL
      storage/maria/ma_key_recover.c:
        Restore auto_increment value if insert statement fails
      storage/maria/maria_def.h:
        Added variables to track auto_increment changes to be able to restore it in case of duplicate key
      storage/maria/maria_pack.c:
        Fixed rare bug that caused crash if buffer was flushed at wrong point in time
      storage/maria/unittest/ma_test_all-t:
        Added option --abort-on-error
        Ordered help message
      7a4bd76a
  7. 21 Jan, 2008 4 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-maria · 5ffc919b
      unknown authored
      into  mysql.com:/home/my/mysql-maria
      
      
      mysql-test/r/maria.result:
        Auto merged
      mysql-test/t/maria.test:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      storage/maria/ma_create.c:
        Auto merged
      storage/maria/ma_pagecrc.c:
        Auto merged
      5ffc919b
    • unknown's avatar
      Allow index on 'CHAR(0) NULL' columns · 5cca615c
      unknown authored
      Fixed error in Maria when using table with only CHAR(0) fields
      Fixed valgrind warning
      
      
      BitKeeper/etc/ignore:
        added storage/maria/maria_dump_log
      mysql-test/r/maria.result:
        Testing of table with char(0)
      mysql-test/t/maria.test:
        Testing of table with char(0)
      sql/sql_table.cc:
        Allow index on 'CHAR(0) NULL' columns
      storage/maria/ma_create.c:
        Allow creation of table with 0 record data (for example CHAR(0))
      storage/maria/ma_pagecrc.c:
        Fixed valgrind warning
      5cca615c
    • unknown's avatar
      fix for compiler warning · fd74a0da
      unknown authored
      
      sql/sql_table.cc:
        initialize variables used in 'err:' before going to err.
      fd74a0da
    • unknown's avatar
      An assertion added (transaction must be re-enabled before end of · d66157e3
      unknown authored
      top-level statement) and fixes for the bugs it finds.
      Fix for non-serious Valgrind warning.
      
      
      sql/sql_insert.cc:
        When CREATE TABLE IF NOT EXISTS finds the table already exists,
        'table' is the existing table. So if that table is temporary we don't
        re-enable transactions which is a bug.
      sql/sql_parse.cc:
        verify that at the end of each top-statement transactions have
        been re-enabled. Does not apply to substatements (consider
        CREATE TABLE t1 SELECT stored_func() : the substatements inside
        stored_func() run with transaction disabled).
        I am not putting the assertion into ha_external_lock(F_UNLCK) because
        performance schema tables get closed in the middle of a statement
        sometimes while transaction is disabled.
      sql/sql_table.cc:
        copy_data_between_tables() forgot to clean-up several things in error
        conditions (ha_enable_transaction(), free-ing 'copy', etc) as found
        by the assertion added to sql_parse.cc.
      storage/maria/ha_maria.cc:
        Comment
      storage/maria/ma_blockrec.c:
        fix for Valgrind warning: a temporary table was created, a blob
        page of its was flushed to disk and had random bytes in the checksum
        area ("write of uninitialized bytes in pwrite")
      storage/maria/ma_pagecrc.c:
        typo
      d66157e3
  8. 20 Jan, 2008 1 commit
    • unknown's avatar
      - fix for segfault in rpl_trigger/rpl_found_rows with default engine=maria · 0825c485
      unknown authored
      (fix is keeping the real TRN through a disable_logging/reenable cycle)
      - fix for pagecache assertion failure in ps/type_ranges with default
      engine=maria (fix is in sql_insert.cc)
      - when reenabling logging we must either flush all dirty pages,
      or at least verify (in debug build) that there are none. For example
      a bulk insert with single UNDO_BULK_INSERT must flush them, no matter
      if it uses repair or not (bugfix)
      - UNDO_BULK_INSERT_WITH_REPAIR is also used with repair, changes name
      
      
      mysql-test/r/maria.result:
        tests for bugs fixed
      mysql-test/t/maria.test:
        tests for bugs fixed
      sql/sql_insert.cc:
        Bugfix: even if select_create::prepare() failed to create the 'table' object
        we still have to re-enable logging.
      storage/maria/ha_maria.cc:
        Bugfix: when a transactional table does a bulk insert without
        repair, it still sometimes skips logging of REDOs thus needs a full
        flush and sync at the end. Not if repair is done, as repair does
        it internally already (see end of maria_repair*()).
      storage/maria/ha_maria.h:
        variable now can have 3 states not 2
      storage/maria/ma_bitmap.c:
        name change
      storage/maria/ma_blockrec.c:
        name change
      storage/maria/ma_blockrec.h:
        name change
      storage/maria/ma_check.c:
        * When maria_repair() re-enables logging it does not need to ask for
        a flush&sync as it did it by itself already a few lines before.
        * the log record of bulk insert can be used even without repair
        * disable logging in maria_zerofill(): without that, it puts LSN pages
        in the cache, so when it flushes them it flushes the log; the change
        makes auto-ha_maria::zerofill-if-moved faster (no log flush).
      storage/maria/ma_key_recover.c:
        name change
      storage/maria/ma_loghandler.c:
        name change
      storage/maria/ma_loghandler.h:
        name change
      storage/maria/ma_pagecache.c:
        A function, to check in debug builds that no dirty pages exist for a file.
      storage/maria/ma_pagecache.h:
        new function (nothing in non-debug)
      storage/maria/ma_recovery.c:
        _ma_tmp_disable_logging() sets info->trn to dummy_transaction_object
        when needed now. The changes done here about info->trn are to allow
        a table to retain its original, real TRN through a disable/reenable
        cycle (see replication scenario in _ma_reenable_logging_for_table()).
        When we reenable, we offer the caller to flush and sync the table;
        if the caller doesn't accept our offer, we verify that it's ok
        (no REDOs => no dirty pages are allowed to exist).
      storage/maria/maria_chk.c:
        comment
      storage/maria/maria_def.h:
        new names
      mysql-test/suite/rpl/r/rpl_stm_maria.result:
        result (it used to crash)
      mysql-test/suite/rpl/t/rpl_stm_maria.test:
        Test of replication-specific Maria bug fixed
      0825c485
  9. 19 Jan, 2008 1 commit
    • unknown's avatar
      - fix for bug when creating bitmaps · cd15ea74
      unknown authored
      - fix for bug seen when running test "type_datetime" with Maria
      (wrong data_file_length in maria_repair())
      - fix for bug seen when running test "repair" with Maria
      (myisam_sort_buffer_size was influencing Maria)
      
      
      sql/handler.cc:
        Sounds illogical to store myisam_sort_buffer_size into a structure
        used by all engines. There are only MyISAM and Maria which used 
        sort_buffer_size: they can get their value from their respective
        system variable (myisam|maria_sort_buffer_size). Using MyISAM's value
        for all engines was wrong (myisam_sort_buffer_size influenced Maria).
      sql/handler.h:
        not needed
      storage/maria/ha_maria.cc:
        check_opt->sort_buffer_size was myisam_sort_buffer_size; Maria
        must use maria_sort_buffer_size instead.
      storage/maria/ma_bitmap.c:
        don't use my_chsize() now that Monty re-explained the problem to me :)
      storage/maria/ma_check.c:
        making maria_repair() work like maria_repair_by_sort(): sort_param.filepos
        must be set at start then possibly corrected by create_new_data_handle();
        in the opposite order, filepos is finally set to 0, and if the table
        has no records, it stays 0 and this causes state.data_file_length
        to be 0 which is incorrect for a BLOCK_RECORD table having always
        at least one bitmap page.
      storage/maria/ma_pagecache.c:
        Comments
      storage/myisam/ha_myisam.cc:
        check_opt->sort_buffer_size is gone
      cd15ea74
  10. 18 Jan, 2008 1 commit
    • unknown's avatar
      compiler warnings · 306e09ba
      unknown authored
      
      storage/maria/ma_check.c:
        fix for important compiler warning
      storage/maria/ma_recovery.c:
        fix for compiler warning
      306e09ba
  11. 17 Jan, 2008 2 commits
    • unknown's avatar
      WL#3072 - Maria Recovery · 534417c2
      unknown authored
      Bulk insert: don't log REDO/UNDO for rows, log one UNDO which will
      truncate files; this is an optimization and a bugfix (table was left
      half-repaired by crash).
      Repair: mark table crashed-on-repair at start, bump skip_redo_lsn at start,
      this is easier for recovery (tells it to skip old REDOs or even UNDO
      phase) and user (tells it to repair) in case of crash, sync files
      in the end.
      Recovery skips missing or corrupted table and moves to next record
      (in REDO or UNDO phase) to be more robust; warns if happens in UNDO phase.
      Bugfix for UNDO_KEY_DELETE_WITH_ROOT (tested in ma_test_recovery)
      and maria_enable_indexes().
      Create missing bitmaps when needed (there can be more than one to create,
      in rare cases), log a record for this.
      
      
      include/myisamchk.h:
        new flag: bulk insert repair mustn't bump create_rename_lsn
      mysql-test/lib/mtr_report.pl:
        skip normal warning in maria-recovery.test
      mysql-test/r/maria-recovery.result:
        result: crash before bulk insert is committed, causes proper rollback,
        and crash right after OPTIMIZE replaces index file with new index file
        leads to table marked corrupted and recovery not failing.
      mysql-test/t/maria-recovery.test:
        - can't check the table or it would commit the transaction,
        but check is made after recovery.
        - test of crash before bulk-insert-with-repair is committed
        (to see if it is rolled back), and of crash after OPTIMIZE has replaced
        index file but not finished all operations (to see if recovery fails -
        it used to assert when trying to execute an old REDO on the new
        index).
      storage/maria/CMakeLists.txt:
        new file
      storage/maria/Makefile.am:
        new file
      storage/maria/ha_maria.cc:
        - If bulk insert on a transactional table using an index repair:
        table is initially empty, so don't log REDO/UNDO for data rows
        (optimization), just log an UNDO_BULK_INSERT_WITH_REPAIR
        which will, if executed, empty the data and index file. Re-enable
        logging in end_bulk_insert().
        - write log record for repair operation only after it's fully done,
        index sort including (maria_repair*() used to write the log record).
        - Adding back file->trn=NULL which was removed by mistake earlier.
      storage/maria/ha_maria.h:
        new member (see ha_maria.cc)
      storage/maria/ma_bitmap.c:
        Functions to create missing bitmaps:
        - one function which creates missing bitmaps in page cache, except
        the missing one with max offset which it does not put into page cache
        as it will be modified very soon.
        - one function which the one above calls, and creates bitmaps in page
        cache
        - one function to execute REDO_BITMAP_NEW_PAGE which uses the second
        one above.
      storage/maria/ma_blockrec.c:
        - when logging REDO_DELETE_ALL, not only 'records' and 'checksum'
        has to be reset under log's mutex.
        - execution of REDO_INSERT_ROW_BLOBS now checks the dirty pages' list
        - execution of UNDO_BULK_INSERT_WITH_REPAIR
      storage/maria/ma_blockrec.h:
        new functions
      storage/maria/ma_check.c:
        - table-flush-before-repair is moved to a separate function reused
        by maria_sort_index(); syncing is added
        - maria_repair() is allowed to re-enable logging only if it is the one
        which disabled it.
        - "_ma_flush_table_files_after_repair" was a bad name, it's not after
        repair now, and it should not sync as we do more changes to the files
        shortly after (sync is postponed to when writing the log record)
        - REDO_REPAIR record should be written only after all repair
        operations (in particular after sorting index in ha_mara::repair())
        - close to the end of repair by sort, flushing of pages must happen
        also in the non-quick case, to prepare for the sync at end.
        - in parallel repair, some page flushes are not needed as done
        by initialize_variables_for_repair().
      storage/maria/ma_create.c:
        Update skip_redo_lsn, create_rename_lsn optionally.
      storage/maria/ma_delete_all.c:
        Need to sync files at end of maria_delete_all_rows(), if transactional.
      storage/maria/ma_extra.c:
        During repair, we sometimes call _ma_flush_table_files() (via
        _ma_flush_table_files_before_swap()) while there is a WRITE_CACHE.
      storage/maria/ma_key_recover.c:
        - when we see CLR_END for UNDO_BULK_INSERT_WITH_REPAIR, re-enable
        indices.
        - fixing bug: _ma_apply_undo_key_delete() parsed UNDO_KEY_DELETE_WITH_ROOT
        wrongly, leading to recovery failure
      storage/maria/ma_key_recover.h:
        new prototype
      storage/maria/ma_locking.c:
        DBUG_VOID_RETURN missing
      storage/maria/ma_loghandler.c:
        UNDO for bulk insert with repair, and REDO for creating bitmaps.
        LOGREC_FIRST_FREE to not have to change the for() every time we
        add a new record type.
      storage/maria/ma_loghandler.h:
        new UNDO and REDO
      storage/maria/ma_open.c:
        Move share.kfile.file=kfile up a bit, so that _ma_update_state_lsns()
        can get its value, this fixes a bug where LSN_REPAIRED_BY_MARIA_CHK
        was not corrected on disk by maria_open().
        Store skip_redo_lsn in index' header.
        maria_enable_indexes() had a bug for BLOCK_RECORD, where an empty
        file has one page, not 0 bytes.
      storage/maria/ma_recovery.c:
        - Skip a corrupted, missing, or repaired-with-maria_chk, table in
        recovery: don't fail, just go to next REDO or UNDO; but if an UNDO
        is skipped in UNDO phase we issue warnings.
        - Skip REDO|UNDO in REDO phase if <skip_redo_lsn.
        - If UNDO phase fails, delete transactions to not make trnman
        assert.
        - Update skip_redo_lsn when playing REDO_CREATE_TABLE
        - Don't record UNDOs for old transactions which we don't know (long_trid==0)
        - Bugfix for UNDO_KEY_DELETE_WITH_ROOT (see ma_key_recover.c)
        - Execution of UNDO_BULK_INSERT_WITH_REPAIR
        - Don't try to find a page number in REDO_DELETE_ALL
        - Pieces moved to ma_recovery_util.c
      storage/maria/ma_rename.c:
        name change
      storage/maria/ma_static.c:
        I modified layout of the index' header (inserted skip_redo_lsn in its middle)
      storage/maria/ma_test2.c:
        allow breaking the test towards the end, tests execution of
        UNDO_KEY_DELETE_WITH_ROOT
      storage/maria/ma_test_recovery.expected:
        6 as testflag instead of 4
      storage/maria/ma_test_recovery:
        Increase the amount of rollback work to do when testing recovery
        with ma_test2; this reproduces the UNDO_KEY_DELETE_WITH_ROOT bug.
      storage/maria/maria_chk.c:
        skip_redo_lsn should be updated too, for consistency.
        Write a REDO_REPAIR after all operations (including sort-records)
        have been done.
        No reason to flush blocks after maria_chk_data_link() and
        maria_sort_records(), there is maria_close() in the end.
        write_log_record() is a function, to not clutter maria_chk().
      storage/maria/maria_def.h:
        New member skip_redo_lsn in the state, and comments
      storage/maria/maria_pack.c:
        skip_redo_lsn should be updated too, for consistency
      storage/maria/ma_recovery_util.c:
        _ma_redo_not_needed_for_page(), defined in ma_recovery.c, is needed
        by ma_blockrec.c; this causes link issues, resolved by putting
        _ma_redo_not_needed_for_page() into a new file (so that it is not
        in the same file as repair-related objects of ma_recovery.c).
      storage/maria/ma_recovery_util.h:
        new file
      534417c2
    • unknown's avatar
      ma_checkpoint.c, ma_recovery.c: · 8382126a
      unknown authored
        SCCS merged
      ma_check.c:
        Auto merged
      
      
      storage/maria/ma_check.c:
        Auto merged
      storage/maria/ma_checkpoint.c:
        SCCS merged
      storage/maria/ma_recovery.c:
        SCCS merged
      8382126a
  12. 14 Jan, 2008 1 commit
    • unknown's avatar
      Moved variables to ma_static.c to avoid link error on MacOSX · 5b18f810
      unknown authored
      Added suppress rule for dlclose() in valgrind.supp
      
      
      mysql-test/valgrind.supp:
        Removed duplication
        Added error in dlclose() noticed on pushbuild for x86_64
      storage/maria/ma_init.c:
        Moved variables to ma_static.c to avoid link error on MacOSX
      storage/maria/ma_loghandler.c:
        Moved variables to ma_static.c to avoid link error on MacOSX
      storage/maria/ma_static.c:
        Moved variables to ma_static.c to avoid link error on MacOSX
      5b18f810
  13. 12 Jan, 2008 13 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-maria · 50e27881
      unknown authored
      into  mysql.com:/home/my/mysql-maria
      
      
      mysys/my_getsystime.c:
        Auto merged
      50e27881
    • unknown's avatar
      Fixed compiler warnings · 89ff50d4
      unknown authored
      Fixed type that caused windows builds to fail
      
      
      include/my_alloc.h:
        Use size_t for memory areas instead of uint
      mysys/mf_iocache.c:
        Fixed compiler warnings by adding casts
      mysys/my_compress.c:
        Fixed compiler warnings by adding casts
      mysys/my_getsystime.c:
        Fixed typo
      mysys/my_static.h:
        Use size_t for memory areas
      mysys/safemalloc.c:
        Use size_t for memory areas
      storage/maria/ma_bitmap.c:
        Fixed compiler warnings by adding casts
      storage/maria/ma_blockrec.c:
        Fixed compiler warnings by adding casts
      storage/maria/ma_cache.c:
        Use size_t for memory areas
      storage/maria/ma_info.c:
        Use size_t for memory areas
      storage/maria/ma_key.c:
        Fixed compiler warnings by adding casts
      storage/maria/ma_locking.c:
        Fixed compiler warnings by adding casts
      storage/maria/ma_open.c:
        Fixed compiler warnings by adding casts
      storage/maria/ma_packrec.c:
        Fixed compiler warnings by fixing type for variable
      storage/maria/ma_statrec.c:
        Fixed compiler warnings by adding casts
      storage/maria/ma_write.c:
        Fixed compiler warnings by adding casts
      storage/maria/maria_def.h:
        Use size_t for memory areas
      storage/myisam/mi_search.c:
        Fixed compiler warnings by adding casts
      89ff50d4
    • unknown's avatar
      plug.in: · bb7d835b
      unknown authored
        two MYSQL_PLUGIN_ACTIONS() merged
      my_getsystime.c:
        typos fixed
      
      
      mysys/my_getsystime.c:
        typos fixed
      storage/maria/plug.in:
        two MYSQL_PLUGIN_ACTIONS() merged
      bb7d835b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-maria · 3f763b67
      unknown authored
      into  janus.mylan:/usr/home/serg/Abk/mysql-maria
      
      
      3f763b67
    • unknown's avatar
      The unused (yet) variable removed. · 496f50fa
      unknown authored
      496f50fa
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-maria · 106b955d
      unknown authored
      into  janus.mylan:/usr/home/serg/Abk/mysql-maria
      
      
      106b955d
    • unknown's avatar
      maria_dump_log - log interpreter added. · 83b6f696
      unknown authored
      
      storage/maria/Makefile.am:
        maria_dump_log build.
      storage/maria/ma_loghandler.c:
        Fixed page size in the log header to be independent of #defines.
        maria_dump_log - log interpreter added.
      83b6f696
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-maria · 7a231b26
      unknown authored
      into  janus.mylan:/usr/home/serg/Abk/mysql-maria
      
      
      7a231b26
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-maria · f0ce8241
      unknown authored
      into  janus.mylan:/usr/home/serg/Abk/mysql-maria
      
      
      f0ce8241
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-maria · 0cccfe30
      unknown authored
      into  mysql.com:/home/my/mysql-maria
      
      
      storage/maria/ma_loghandler.c:
        Auto merged
      0cccfe30
    • unknown's avatar
      Fixes to bugs and compiler warnings detected by pushbuild · 978f3e3c
      unknown authored
      Don't compare uuid's on maria_open() if table is not transactional
      Fixed that my_microtime() works on windows (patch added from 5.1)
      
      
      mysql-test/r/create.result:
        Portability fix
      mysql-test/t/create.test:
        Portability fix
      mysql-test/t/maria.test:
        Remove warnings, to make test portable to windows
      mysys/my_getsystime.c:
        Add missed merge from 5.1
        This fixes that timing works on windows and fixes that that failed becasuse slow_query_log didn't get any queries
      storage/maria/ma_check.c:
        Removed not needed setting of variable
      storage/maria/ma_loghandler.c:
        Fixed compiler warnings
      storage/maria/ma_open.c:
        Don't compare uuid's if table is not transactional
      KNOWN_BUGS.txt:
        New BitKeeper file ``KNOWN_BUGS.txt''
      978f3e3c
    • unknown's avatar
      Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria · ade00215
      unknown authored
      into  desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria-pin
      
      
      storage/maria/ma_loghandler.c:
        Auto merged
      storage/maria/ma_recovery.c:
        Auto merged
      ade00215
    • unknown's avatar
      Multigroup record write fixed. · c2b840be
      unknown authored
      Memory leak fixed.
      Some other small cahnges.
      
      
      mysql-test/include/wait_until_connected_again.inc:
        increased time for recovery (to be able use with --debug)
      mysql-test/r/maria-recovery.result:
        Result fixed.
      storage/maria/ma_loghandler.c:
        Multigroup record write fixed.
        Function for skipping to the next page while filling buffer with
          unlocked handler added.
        Removed possible memory leaks.
        More debug.
      storage/maria/ma_recovery.c:
        Memory leak fixed.
      c2b840be
  14. 11 Jan, 2008 5 commits
    • unknown's avatar
      WL#3072 Maria Recovery · 17f07388
      unknown authored
      All statements doing an implicit commit now also do one in Maria.
      This is useful because LOCK TABLES; REPAIR; crash; is not rollback-able,
      the implicit commit of REPAIR avoid that Recovery tries to rollback
      and fails.
      Fix for BUG#33827 "COMMIT AND CHAIN causes serious Valgrind error"
      (maybe not the definite one, depends on the assigned dev).
      
      
      mysql-test/t/maria-recovery.test:
        test of REPAIR's implicit commit. I cannot commit the result file
        because maria-recovery fails in vanilla tree (seen in pushbuild) but
        its new section looks like:
        repair table t1;
        Table   Op      Msg_type        Msg_text
        mysqltest.t1    repair  status  OK
        insert into t1 values(2);
        select * from t1;
        a
        1
        2
        3
        SET SESSION debug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash";
        * crashing mysqld intentionally
        set global maria_checkpoint_interval=1;
        ERROR HY000: Lost connection to MySQL server during query
        * recovery happens
        check table t1 extended;
        Table   Op      Msg_type        Msg_text
        mysqltest.t1    check   status  OK
        * testing that checksum after recovery is as expected
        Checksum-check
        failure
        use mysqltest;
        select * from t1;
        a
        1
        3
        Which is as it should be.
      sql/rpl_injector.cc:
        fix for BUG#33827
      sql/sql_parse.cc:
        - All DDLs and mysql_admin_table() (REPAIR etc) use end_actrive_trans()
        to do an implicit commit so we add there an implicit commit of the
        Maria transaction.
        - Fix for BUG#33827
      storage/maria/ha_maria.cc:
        - A method to do implicit commit in Maria
        - After an implicit commit, if it was under LOCK TABLES, the locked
        tables have a stale file->trn: update it.
      storage/maria/ha_maria.h:
        new static method
      storage/maria/ma_check.c:
        bugfix: this disabling of transactionality had the effect that if
        LOCK TABLES; REPAIR; INSERT then the INSERT ran non-transactional
        (so couldn't be undone in case of crash, if, by bad chance, its
        effect on pages went to disk).
      storage/maria/ma_checkpoint.c:
        indentation
      storage/maria/ma_recovery.c:
        dbug statements
      storage/maria/trnman.c:
        When doing an implicit commit we need to know the number of locked
        tables of the committed transaction and copy it to the new transaction
      storage/maria/trnman_public.h:
        prototype change
      17f07388
    • unknown's avatar
      use AC_HELP_STRING() and MYSQL_PLUGIN_ACTIONS() · 2f83a4ed
      unknown authored
      2f83a4ed
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-maria · 84b71ac9
      unknown authored
      into  janus.mylan:/usr/home/serg/Abk/mysql-maria
      
      
      84b71ac9
    • unknown's avatar
      handshake.cpp: · f1627aab
      unknown authored
        SCCS merged
      
      
      extra/yassl/src/handshake.cpp:
        SCCS merged
      f1627aab
    • unknown's avatar
      Fixed compiler warnings by adding casts and changing variable types · e689fbc4
      unknown authored
      Fixed bug that caused change_user.test to fail
      Fixed bug that caused mysql_client_test to fail
      
      
      include/myisam.h:
        Fixed prototypes
      mysql-test/r/create.result:
        Fix that test works even if Maria is not used for temporary tables
      mysql-test/t/create.test:
        Fix that test works even if Maria is not used for temporary tables
      sql/mysqld.cc:
        Fixed that default value of max_join_size is set correctly; It needs to match usage in set_var.cc
      sql/set_var.cc:
        Fixed test, now when max_join_size is initialized correctly
      sql/sql_select.cc:
        Fixed that one can compile without -DUSE_MARIA_FOR_TMP_TABLES
      storage/maria/ma_blockrec.c:
        Fixed compiler warnings by adding casts
      storage/maria/ma_checkpoint.c:
        Fixed compiler warnings by adding casts
      storage/maria/ma_create.c:
        Fixed compiler warnings by adding casts
      storage/maria/ma_delete_table.c:
        Fixed compiler warnings by adding casts
      storage/maria/ma_loghandler.c:
        Fixed compiler warnings by adding casts and changing types for variables
        Changed translog_new_page_header to use changing integer instead of calling time() as time() is a slow call and will give same results when calling many times withing one second
      storage/maria/ma_pagecrc.c:
        Fixed compiler warnings by adding casts
      storage/maria/ma_recovery.c:
        Fixed indentation
      storage/myisam/ha_myisam.cc:
        Fixed wrong types for variables
        Changed chk_data_link() and repair*() functions to take my_bool as argument
      storage/myisam/mi_check.c:
        Fixes to handle that param.test_flag is now ulonglong
      storage/myisam/myisamchk.c:
        Fixes to handle that param.test_flag is now ulonglong
      support-files/compiler_warnings.supp:
        Fixed line numbers
      e689fbc4