1. 15 Dec, 2007 8 commits
    • unknown's avatar
      Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria · 18d408a9
      unknown authored
      into  desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria-callback
      
      
      storage/maria/Makefile.am:
        Auto merged
      storage/maria/ma_blockrec.c:
        Auto merged
      storage/maria/ma_check.c:
        Auto merged
      storage/maria/ma_create.c:
        Auto merged
      storage/maria/ma_loghandler.h:
        Auto merged
      storage/maria/ma_open.c:
        Auto merged
      storage/maria/ma_page.c:
        Auto merged
      storage/maria/ma_pagecache.c:
        Auto merged
      storage/maria/maria_chk.c:
        Auto merged
      storage/maria/maria_def.h:
        Auto merged
      storage/maria/unittest/ma_test_loghandler-t.c:
        Auto merged
      storage/maria/unittest/ma_test_loghandler_first_lsn-t.c:
        Auto merged
      storage/maria/unittest/ma_test_loghandler_max_lsn-t.c:
        Auto merged
      storage/maria/unittest/ma_test_loghandler_multigroup-t.c:
        Auto merged
      storage/maria/unittest/ma_test_loghandler_multithread-t.c:
        Auto merged
      storage/maria/unittest/ma_test_loghandler_noflush-t.c:
        Auto merged
      storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
        Auto merged
      storage/maria/unittest/ma_test_loghandler_purge-t.c:
        Auto merged
      storage/maria/ma_bitmap.c:
        Merge.
      storage/maria/ma_loghandler.c:
        Merge.
      storage/maria/unittest/Makefile.am:
        Merge.
      18d408a9
    • unknown's avatar
      Pagecache callbacks support added. · 7b19ba34
      unknown authored
      Page CRC check based on pagecache support added.
      Loghandler pagecache callbacks support added.
      Loghandler filecache rewritten.
      Support of deletting all logs added.
      
      
      storage/maria/Makefile.am:
        New file with functions for CRC calculation.
      storage/maria/ma_bitmap.c:
        Page CRC support.
      storage/maria/ma_blockrec.c:
        Removed code replaced by pagecache callbacks.
      storage/maria/ma_check.c:
        Page CRC support.
      storage/maria/ma_create.c:
        Page CRC support.
      storage/maria/ma_loghandler.c:
        Pagecache callbacks support.
        New file cache support.
        Removing log files support.
      storage/maria/ma_loghandler.h:
        CRC_LENGTH replaced with CRC_SIZE
      storage/maria/ma_open.c:
        Page CRC support.
      storage/maria/ma_page.c:
        Page CRC support.
      storage/maria/ma_pagecache.c:
        Pagecache callbacks support.
      storage/maria/ma_pagecache.h:
        Pagecache callbacks support.
      storage/maria/ma_panic.c:
        Page CRC support.
      storage/maria/maria_chk.c:
        Page CRC support.
      storage/maria/maria_def.h:
        Page CRC support.
      storage/maria/unittest/Makefile.am:
        New test of removing logs.
      storage/maria/unittest/ma_maria_log_cleanup.c:
        Memory leack fixed.
      storage/maria/unittest/ma_pagecache_consist.c:
        Pagecache callbacks support.
      storage/maria/unittest/ma_pagecache_single.c:
        Pagecache callbacks support.
      storage/maria/unittest/ma_test_loghandler-t.c:
        Fixed the test error processing.
      storage/maria/unittest/ma_test_loghandler_first_lsn-t.c:
        Fixed the test error processing.
      storage/maria/unittest/ma_test_loghandler_max_lsn-t.c:
        Fixed the test error processing.
      storage/maria/unittest/ma_test_loghandler_multigroup-t.c:
        Fixed the test error processing.
      storage/maria/unittest/ma_test_loghandler_multithread-t.c:
        Fixed the test error processing.
      storage/maria/unittest/ma_test_loghandler_noflush-t.c:
        Fixed the test error processing.
      storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
        Pagecache callbacks support.
      storage/maria/unittest/ma_test_loghandler_purge-t.c:
        Fixed the test error processing.
      storage/maria/unittest/test_file.c:
        Removed unneeded sync.
      7b19ba34
    • unknown's avatar
      Postmerge fix. · fabdf6df
      unknown authored
      
      storage/maria/ma_loghandler.c:
        Postmerge fix.
        New state of the log added to proicess correctly shutdown.
      storage/maria/ma_loghandler.h:
        New state of the log added to proicess correctly shutdown.
      fabdf6df
    • unknown's avatar
      Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria · 98a2c5e3
      unknown authored
      into  desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria-readonly
      
      
      storage/maria/ha_maria.cc:
        Auto merged
      storage/maria/ma_create.c:
        Auto merged
      storage/maria/ma_open.c:
        Auto merged
      storage/maria/ma_test1.c:
        Auto merged
      storage/maria/ma_test2.c:
        Auto merged
      storage/maria/unittest/ma_test_loghandler-t.c:
        Auto merged
      storage/maria/unittest/ma_test_loghandler_first_lsn-t.c:
        Auto merged
      storage/maria/unittest/ma_test_loghandler_max_lsn-t.c:
        Auto merged
      storage/maria/unittest/ma_test_loghandler_multigroup-t.c:
        Auto merged
      storage/maria/unittest/ma_test_loghandler_multithread-t.c:
        Auto merged
      storage/maria/unittest/ma_test_loghandler_noflush-t.c:
        Auto merged
      storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
        Auto merged
      storage/maria/unittest/ma_test_loghandler_purge-t.c:
        Auto merged
      storage/maria/ma_check.c:
        Merge.
      storage/maria/ma_loghandler.c:
        Merge.
      storage/maria/ma_loghandler.h:
        Merge.
      storage/maria/maria_read_log.c:
        Merge.
      storage/maria/unittest/Makefile.am:
        Merge.
      98a2c5e3
    • unknown's avatar
      Transaction log behaviour in case of write · d225521c
      unknown authored
        error fixed (switching to the read only mode).
      Added read only mode of transactions log handler.
      
      
      storage/maria/ha_maria.cc:
        Transaction log initialization parameters change.
      storage/maria/ma_check.c:
        New status variable of transactional log.
      storage/maria/ma_create.c:
        New status variable of transactional log.
      storage/maria/ma_loghandler.c:
        - New status variable added.
        - Checking the status variable in the loghandler
        interface functions added
        - All fails of loghandler functions revised.
        - UNRECOVERABLE_ERROR() removed.
        - Switching to read only mode added where it nead.
        - Checking of log state added before writes log content
          and changing status variables like sent_to_file, n_buffers_only, flushed.
        - Readonly loghandler initialization added.
        - Fixed problem with example table transactional log initialization.
      storage/maria/ma_loghandler.h:
        Readonly loghandler initialization added.
        Fixed problem with example table transactional log initialization.
        New status variable added.
      storage/maria/ma_open.c:
        New status variable of transactional log.
      storage/maria/ma_test1.c:
        Transaction log initialization parameters change.
      storage/maria/ma_test2.c:
        Transaction log initialization parameters change.
      storage/maria/maria_read_log.c:
        Transaction loghandler initialization in read only mode in
        case of only dysplay parameter.
      storage/maria/unittest/Makefile.am:
        Test of readonly mode added.
      storage/maria/unittest/ma_test_loghandler-t.c:
        Transaction log initialization parameters change.
        Fixed problem with example table transactional log initialization.
        Fixed incorrect fprintf call parameters.
      storage/maria/unittest/ma_test_loghandler_first_lsn-t.c:
        Transaction log initialization parameters change.
        Fixed problem with example table transactional log initialization.
      storage/maria/unittest/ma_test_loghandler_max_lsn-t.c:
        Transaction log initialization parameters change.
        Fixed problem with example table transactional log initialization.
      storage/maria/unittest/ma_test_loghandler_multigroup-t.c:
        Useing this test also as read only loghandler test.
        Transaction log initialization parameters change.
        Fixed problem with example table transactional log initialization.
      storage/maria/unittest/ma_test_loghandler_multithread-t.c:
        Transaction log initialization parameters change.
        Fixed problem with example table transactional log initialization.
      storage/maria/unittest/ma_test_loghandler_noflush-t.c:
        Transaction log initialization parameters change.
        Fixed problem with example table transactional log initialization.
      storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
        Transaction log initialization parameters change.
        Fixed problem with example table transactional log initialization.
      storage/maria/unittest/ma_test_loghandler_purge-t.c:
        Transaction log initialization parameters change.
        Fixed problem with example table transactional log initialization.
      d225521c
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-maria · 223c6e9d
      unknown authored
      into  gbichot4.local:/home/mysql_src/mysql-maria-monty
      
      
      storage/maria/ma_blockrec.c:
        Auto merged
      223c6e9d
    • unknown's avatar
      WL#3072 Maria Recovery. · 1cc48d16
      unknown authored
      Updates to the bitmap flush/pin logic to prepare for when we support
      multiple writers.
      
      
      storage/maria/ma_bitmap.c:
        Read lock is less bad than write lock.
        Changing bitmap->flushable to a counter, to prepare for when multiple
        writers are allowed on a table.
        Using bitmap->flush_all_requested instead of share->in_checkpoint; the
        latter can be true for the time of a whole checkpoint even though
        the checkpoint is not yet handling our table, or has already handled it,
        so to decrease the number of broadcasts we use a dedicated my_bool
        which is true only when checkpoint is handling this table's bitmap.
        _ma_bitmap_flushable(share,+1) waits for a concurrent _ma_bitmap_flush_all()
        to finish before incrementing non_flushable; without this, with multiple
        writers there may always be one thread making the bitmap unflushable
        and thus checkpoint would stall.
      storage/maria/ma_blockrec.c:
        update to new prototype: "flushable is FALSE|TRUE" becomes "add 1|-1 to
        non_flushable".
      storage/maria/ma_blockrec.h:
        new prototype
      storage/maria/maria_def.h:
        MARIA_FILE_BITMAP::flushable becomes a counter.
        New MARIA_FILE_BITMAP::flush_all_requested.
      1cc48d16
    • unknown's avatar
      include sys/stat.h · fe2636fa
      unknown authored
      remove duplicate symbol
      
      
      configure.in:
        include sys/stat.h
      include/my_global.h:
        include sys/stat.h
      sql/mysqld.cc:
        remove duplicate symbol
      fe2636fa
  2. 14 Dec, 2007 8 commits
    • unknown's avatar
      pushbuild fixes to please gcc and darwin/ppc64 · 2df4e999
      unknown authored
      
      include/my_atomic.h:
        transparent_union doesn't work in g++, doesn't work on darwin/ppc64
      storage/maria/ma_blockrec.c:
        compiler warning
      storage/maria/ma_loghandler.c:
        compiler warning
      storage/maria/ma_page.c:
        compiler warning
      2df4e999
    • unknown's avatar
      fix for pushbuild test failure · 105ce538
      unknown authored
      
      mysql-test/t/ps_maria.test:
        test Maria presence before setting Maria variables
      105ce538
    • unknown's avatar
      fix for some gcc -ansi warnings. · 914f219c
      unknown authored
      
      storage/maria/ma_checkpoint.c:
        gcc -ansi warnings
      storage/maria/ma_pagecache.c:
        comment
      storage/maria/ma_recovery.c:
        gcc -ansi warnings
      914f219c
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-maria · 8e8362cc
      unknown authored
      into  gbichot4.local:/home/mysql_src/mysql-maria-monty
      
      
      8e8362cc
    • unknown's avatar
      WL#3072 - Maria recovery. · d72c22de
      unknown authored
      * fix for bitmap vs checkpoint bug which could lead to corrupted
      tables in case of crashes at certain moments: a bitmap could be flushed
      to disk even though it was inconsistent with the log (it could be
      flushed before REDO-UNDO are written to the log). One bug remains, need
      code from others. Tests added. Fix is to pin unflushable bitmap pages,
      and let checkpoint wait for them to be flushable.
      * fix for long_trid!=0 assertion failure at Recovery.
      * less useless wakeups in the background flush|checkpoint thread.
      * store global_trid_generator in checkpoint record.
      
      
      mysql-test/r/maria-recovery.result:
        result update
      mysql-test/t/maria-recovery.test:
        make it easier to locate subtests
      storage/maria/ma_bitmap.c:
        When we send a bitmap to the pagecache, if this bitmap is not in a
        flushable state we keep it pinned and add it to a list, it will be
        unpinned when the bitmap is flushable again.
        A new function _ma_bitmap_flush_all() used by checkpoint.
        A new function _ma_bitmap_flushable() used by block format to signal
        when it starts modifying a bitmap and when it is done with it.
      storage/maria/ma_blockrec.c:
        When starting a row operation (insert/update/delete), mark that
        the bitmap is not flushable (because for example INSERT is going
        to over-allocate in the bitmap to prevent other threads from using
        our data pages). If a checkpoint comes at this moment it will wait
        for the bitmap to be flushable before flushing it.
        When the operation ends, bitmap becomes flushable again; that
        transition is done under the bitmap's mutex (needed for correct
        synchro with a concurrent checkpoint); but for INSERT/UPDATE this
        happens inside _ma_bitmap_release_unused() at a place where it already
        has the mutex, so the only penalty (mutex adding) is in DELETE and UNDO
        of INSERT. In case of errors after setting the bitmap unflushable,
        we must always set it back to flushable or checkpoint would block.
        Debug possibilities to force a sleep while the bitmap is over-allocated.
        In case of error in get_head_or_tail() in allocate_and_write_block_record(),
        we still need to unpin all pages.
        Bugfix: _ma_apply_redo_insert_row_blobs() produced wrong
        data_file_length.
      storage/maria/ma_blockrec.h:
        new bitmap calls.
      storage/maria/ma_checkpoint.c:
        filter_flush_indirect not needed anymore (flushing bitmap
        pages happens in _ma_bitmap_flush_all() now). So
        st_filter_param::is_data_file|pages_covered_by_bitmap not needed.
        Other filter_flush* don't need to flush bitmap anymore.
        Add debug possibility to flush all bitmap pages outside of a checkpoint,
        to simulate pagecache LRU eviction.
        When the background flush/checkpoint thread notices it has nothing
        to flush, it now sleeps directly until the next potential checkpoint
        moment instead of waking up every second.
        When in checkpoint we decide to not store a table in the checkpoint record
        (because it has logged no writes for example), we can also skip flushing
        this table.
      storage/maria/ma_commit.c:
        comment is out-of-date
      storage/maria/ma_key_recover.c:
        comment fix
      storage/maria/ma_loghandler.c:
        comment is out-of-date
      storage/maria/ma_open.c:
        comment is out-of-date
      storage/maria/ma_pagecache.c:
        comment for bug to fix. And we don't take checkpoints at end of REDO
        phase yet so can trust block->type.
      storage/maria/ma_recovery.c:
        Comments. Now-unneeded code for incomplete REDO-UNDO groups removed.
        When we forget about an old transaction we must really forget
        about it with bzero() (fixes the "long_trid!=0 assertion" recovery
        bug). When we delete a row with maria_delete() we turn on
        STATE_NOT_OPTIMIZED_ROWS so we do the same when we see a CLR_END
        for an UNDO_ROW_INSERT or when we execute an UNDO_ROW_INSERT (in both
        cases a row was deleted). Pick up max_long_trid from the checkpoint record.
      storage/maria/maria_chk.c:
        comment
      storage/maria/maria_def.h:
        MARIA_FILE_BITMAP gets new members: 'flushable', 'bitmap_cond' and
        'pinned_pages'.
      storage/maria/trnman.c:
        I used to think that recovery only needs to know the maximum TrID
        of the lists of active and committed transactions. But no, sometimes
        both lists can even be empty and their TrID should not be reused.
        So Checkpoint now saves global_trid_generator in the checkpoint record.
      storage/maria/trnman_public.h:
        macros to read/store a TrID
      mysql-test/r/maria-recovery-bitmap.result:
        result is ok. Without the code fix, we would get a corruption message
        about the bitmap page in CHECK TABLE EXTENDED.
      mysql-test/t/maria-recovery-bitmap-master.opt:
        usual when we crash mysqld in tests
      mysql-test/t/maria-recovery-bitmap.test:
        test of recovery problems specific of the bitmap pages.
      d72c22de
    • unknown's avatar
      more cmake fixes · 313bb483
      unknown authored
      313bb483
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-maria · 9c4998fc
      unknown authored
      into  janus.mylan:/usr/home/serg/Abk/mysql-maria
      
      
      9c4998fc
    • unknown's avatar
      windows fix: fix the #include directive · f970477b
      unknown authored
      f970477b
  3. 13 Dec, 2007 7 commits
    • unknown's avatar
      postreview changes. · 531a78f1
      unknown authored
      
      storage/maria/ma_loghandler.c:
        Using pthread_cond instead of WQUEUE.
      531a78f1
    • unknown's avatar
      Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria · 6b89901c
      unknown authored
      into  desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria-testfail
      
      
      mysql-test/t/maria-recovery.test:
        Auto merged
      storage/maria/ma_loghandler.c:
        Auto merged
      6b89901c
    • unknown's avatar
      Fixed maximum file size change. Now it flush buffer after · 77e08a74
      unknown authored
        switching to new one which prevent deadlock.
      
      
      mysql-test/r/maria-purge.result:
        Fixed test which use setting maria_checkpoint_interval to force
          checkpoint now.
      mysql-test/t/maria-purge.test:
        Fixed test which use setting maria_checkpoint_interval to force
          checkpoint now.
      77e08a74
    • unknown's avatar
      fixes for windows builds · 01ea6c1e
      unknown authored
      01ea6c1e
    • unknown's avatar
      restore plug.in - referenced by Makefile.am · 92fe98d7
      unknown authored
      92fe98d7
    • unknown's avatar
      fixes for make distclean, solaris, macosx, windows · bcf526b7
      unknown authored
      
      BitKeeper/deleted/.del-plug.in:
        Delete: storage/myisam/plug.in
      configure.in:
        MyISAM should be the first plugin in the list for now
        check for thr_yield, just in case
      include/my_pthread.h:
        pthread_yield for windows, solaris, macosx
      storage/Makefile.am:
        fix for make distclean (myisam was listed twice in SUBDIRS)
      bcf526b7
    • unknown's avatar
      Postreview changes. · ebafe3e4
      unknown authored
      
      mysql-test/r/maria-big.result:
        Change to make maria-purge more stable: increasing file size
          to let all records fit in one log.
      mysql-test/r/maria-connect.result:
        Change to make maria-purge more stable: increasing file size
          to let all records fit in one log.
      mysql-test/r/maria-purge.result:
        Change to make maria-purge more stable.
      mysql-test/r/maria.result:
        Change to make maria-purge more stable: increasing file size
          to let all records fit in one log.
      mysql-test/r/ps_maria.result:
        Change to make maria-purge more stable: increasing file size
          to let all records fit in one log.
      mysql-test/t/maria-big.test:
        Change to make maria-purge more stable: increasing file size
          to let all records fit in one log.
      mysql-test/t/maria-connect.test:
        Change to make maria-purge more stable: increasing file size
          to let all records fit in one log.
      mysql-test/t/maria-purge.test:
        Change to make maria-purge more stable.
      mysql-test/t/maria-recovery.test:
        Change to make maria-purge more stable: increasing file size
          to let all records fit in one log.
      mysql-test/t/maria.test:
        Change to make maria-purge more stable: increasing file size
          to let all records fit in one log.
      mysql-test/t/ps_maria.test:
        Change to make maria-purge more stable: increasing file size
          to let all records fit in one log.
      ebafe3e4
  4. 12 Dec, 2007 3 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-maria · 298541f7
      unknown authored
      into  mysql.com:/home/my/mysql-maria
      
      
      storage/maria/ma_blockrec.c:
        Auto merged
      storage/maria/ma_check.c:
        Auto merged
      storage/maria/ma_loghandler.c:
        Auto merged
      storage/maria/maria_def.h:
        Auto merged
      298541f7
    • unknown's avatar
      Removed MARIA_BASE min_row_length (duplicate of min_block_length) · 8224c76f
      unknown authored
      Cleanup of recent code changes in dbug and my_thr_init
      Added name for each safe_mutex (for better DBUG and error reporting)
      Fixed that sort_info.max_records is calculated correctly. This fixed a bug in maria_chk
      Removed duplicate printing of mutex address in dbug log
      
      
      dbug/dbug.c:
        Cleanup of recent code changes
      include/my_pthread.h:
        Added name for each safe_mutex (for better DBUG and error reporting)
      mysys/my_thr_init.c:
        Cleanup of recent code changes
      mysys/thr_mutex.c:
        Added name for each safe_mutex (for better DBUG and error reporting)
      mysys/wqueue.c:
        Removed some mutex printing (as it's done now when we take mutex)
      storage/maria/Makefile.am:
        Fixed that 'make tags' works with xemacs
      storage/maria/ma_blockrec.c:
        base.min_row_length -> base.min_block_length
        (As they where basicly the same variable)
      storage/maria/ma_check.c:
        Moved more common stuff to initialize_variables_for_repair
        Fixed that sort_info.max_records is calculated correctly. This fixed a bug in maria_chk
      storage/maria/ma_create.c:
        More comments
        Fixed that min_pack_length is calculated more correctly
        Removed duplicate variable base.min_row_length
      storage/maria/ma_loghandler.c:
        Removed duplicate printing of mutex address
      storage/maria/ma_open.c:
        Removed base.min_row_length
      storage/maria/ma_packrec.c:
        Removed not anymore needed code
        (One should not change any .base variables as this will affect repair with unpack)
      storage/maria/maria_def.h:
        Removed base.min_row_length
      8224c76f
    • unknown's avatar
      WL#3072 - Maria Recovery: recovery of state.auto_increment. · f7df9add
      unknown authored
      When we log UNDO_KEY_INSERT for an auto_inc key, we update
      state.auto_increment (not anymore at the end of maria_write() except
      if this is a non-transactional table). When Recovery sees UNDO_KEY_INSERT
      in the REDO phase, it reads the auto_inc value from it and updates
      state.auto_increment.
      
      
      mysql-test/r/maria-recovery.result:
        Without the code fix, there would be in CHECK TABLE:
        "Auto-increment value: 0 is smaller than max used value: 3"
        and no AUTO_INCREMENT= clause in SHOW CREATE TABLE.
      mysql-test/t/maria-recovery.test:
        Test of recovery of state.auto_increment: from an old table,
        does the replaying of the log set state.auto_increment to
        what it should be.
      storage/maria/ma_check.c:
        new way of calling ma_retrieve_auto_increment(): pass key
      storage/maria/ma_key.c:
        ma_retrieve_auto_increment() now operates directly with a pointer
        to the key and not on the record.
      storage/maria/ma_key_recover.c:
        dedicated write_hook_for_undo_key_insert(): sets state.auto_increment
        under log's mutex.
      storage/maria/ma_key_recover.h:
        Dedicated hook for UNDO_KEY_INSERT, to set state.auto_increment.
        Such hook needs a new member st_msg_write_hook_for_undo_key::auto_increment,
        which contains the auto_increment value inserted.
      storage/maria/ma_loghandler.c:
        UNDO_KEY_INSERT gets a dedicated write_hook, to set auto_increment.
      storage/maria/ma_recovery.c:
        When in the REDO phase we see UNDO_KEY_INSERT: if the state is older
        than this record, and the key is the auto_increment one, read
        the key's value from the log record and update state.auto_increment.
      storage/maria/ma_test_all.sh:
        use $maria_path to be able to run from /dev/shm (faster)
      storage/maria/ma_update.c:
        bool is more of C++, using my_bool.
        If table is transactional, state.auto_increment is already updated
        in write_hook_for_undo_key_insert().
      storage/maria/ma_write.c:
        If table is transactional, state.auto_increment is not updated at
        the end of maria_write() but rather in write_hook_for_undo_key_insert()
        (under log's mutex, so that a concurrent checkpoint does not read
        state.auto_increment while it is changing - corrupted).
        _ma_ck_write_btree_with_log() extracts the auto_increment value
        from the key, puts it into msg.auto_increment, and this is passed
        to write_hook_for_undo_key_insert().
      storage/maria/maria_def.h:
        change of prototype of ma_retrieve_auto_increment()
      storage/maria/maria_read_log.c:
        use default log file size. Use separate page caches for table
        and logs (needed if maria_block_size!=TRANSLOG_PAGE_SIZE).
      f7df9add
  5. 11 Dec, 2007 8 commits
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-maria · f84ce57c
      unknown authored
      into  gbichot4.local:/home/mysql_src/mysql-maria-monty
      
      
      f84ce57c
    • unknown's avatar
      WL#3072 Maria recovery: small fixes to ma_test_recovery · 5051a8e0
      unknown authored
      (output was not repeatable accross machines).
      
      
      storage/maria/ma_check.c:
        comment
      storage/maria/ma_test_recovery.expected:
        output update
      storage/maria/ma_test_recovery:
        * data_file_length/key_file_length differ between machines because
        ma_test2 uses srand(). Removing them from output.
        * there is no reason to copy/restore logs, test should work without
        * applying log to recreate tables should not change log, testing this.
      5051a8e0
    • unknown's avatar
      Logfile size put in allowed boumnds. · edfa1629
      unknown authored
      edfa1629
    • unknown's avatar
      Postmerge changes. · 894081ce
      unknown authored
      
      storage/maria/ma_loghandler.c:
        Fixed compiler warning.
        translog_mutex_unlock -> pthread_mutex_unlock: postmerge change.
      storage/maria/unittest/ma_test_loghandler_max_lsn-t.c:
        Fixed forgoten log size out of bounds.
      894081ce
    • unknown's avatar
      Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria · b5b0d94d
      unknown authored
      into  desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria-logpurge
      
      
      storage/maria/ma_checkpoint.c:
        Auto merged
      storage/maria/ma_loghandler.c:
        Auto merged
      storage/maria/ma_loghandler.h:
        Auto merged
      storage/maria/ma_recovery.c:
        Auto merged
      b5b0d94d
    • unknown's avatar
      Post review fix (serg). · fed1d21b
      unknown authored
      Added more checks.
      
      
      storage/maria/ha_maria.cc:
        Let control size to my_get_opts().
      storage/maria/ma_loghandler.c:
        Let control size to my_get_opts().
        Removed unused function.
        Assert to check log file size.
        Additional compilation warnings.
      storage/maria/ma_loghandler.h:
        New log size bounds.
        Removed unused function.
      storage/maria/unittest/ma_test_loghandler-t.c:
        Fixed test to confirm new log size bounds.
      fed1d21b
    • unknown's avatar
      Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria · 81201758
      unknown authored
      into  desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria-testfail
      
      
      storage/maria/ma_loghandler.c:
        Auto merged
      81201758
    • unknown's avatar
      Page number calculation fixed. · 6a6674a6
      unknown authored
      6a6674a6
  6. 10 Dec, 2007 6 commits
    • unknown's avatar
      WL#3072 Maria recovery: · 13f45b16
      unknown authored
      fix for bug: if a crash happened right after writing a REDO like this:
      REDO - UNDO - REDO*, then recovery would ignore the last REDO* (ok),
      rollback: REDO - UNDO - REDO* - REDO - CLR, and a next recovery would
      thus execute REDO* instead of skipping it again. Recovery now logs
      LOGREC_INCOMPLETE_GROUP when it meets REDO* for the first time,
      to draw a boundary and ensure it is always skipped. Tested by hand.
      Note: ma_test_all fails "maria_chk: error: Key 1 - Found too many records"
      not due to this patch (failed before).
      
      
      BitKeeper/triggers/post-commit:
        no truncation of the commit mail, or how to review patches?
      mysql-test/include/maria_verify_recovery.inc:
        let caller choose the statement used to crash (sometimes we
        want the crash to happen at special places)
      mysql-test/t/maria-recovery.test:
        user of maria_verify_recovery.inc now specifies statement which the
        script should use for crashing.
      storage/maria/ma_bitmap.c:
        it's easier to search for all places using functions from the bitmap
        module (like in ma_blockrec.c) if those exported functions all start
        with "_ma_bitmap": renaming some of them.
        Assertion that when we read a bitmap page, overwriting bitmap->map,
        we are not losing information (i.e. bitmap->changed is false).
      storage/maria/ma_blockrec.c:
        update to new names. Adding code (disabled, protected by a #ifdef)
        that I use to test certain crash scenarios (more to come).
      storage/maria/ma_blockrec.h:
        update to new names
      storage/maria/ma_checkpoint.c:
        update to new names
      storage/maria/ma_extra.c:
        update to new names
      storage/maria/ma_loghandler.c:
        new LOGREC_INCOMPLETE_GROUP
      storage/maria/ma_loghandler.h:
        new LOGREC_INCOMPLETE_GROUP
      storage/maria/ma_recovery.c:
        When at the end of the REDO phase we have identified some transactions
        with incomplete REDO groups (REDOs without an UNDO or CLR_END),
        for each of them we log LOGREC_INCOMPLETE_GROUP. This way, the
        upcoming UNDO phase can write more records for such transaction,
        a future recovery won't pair the incomplete group with the
        CLR_END (as there is LOGREC_INCOMPLETE_GROUP to draw a boundary).
      13f45b16
    • unknown's avatar
      ma_recovery.c: · 12a81c39
      unknown authored
        SCCS merged
      .del-ma_key_redo.c:
        Auto merged
      
      
      BitKeeper/deleted/.del-ma_key_redo.c:
        Auto merged
      storage/maria/ma_recovery.c:
        SCCS merged
      12a81c39
    • unknown's avatar
      Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-maria · 11d72916
      unknown authored
      into  desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria
      
      
      11d72916
    • unknown's avatar
      Fixed bug in first log file detecting function. · 29d18bf0
      unknown authored
      
      storage/maria/ma_loghandler.c:
        min_file should be for sure unexistant file for right search.
      29d18bf0
    • unknown's avatar
      Fixed bug in allocation of dynamic record buffer in Maria · e8b0bb47
      unknown authored
      Unified printing of mutex addresses to make them easier to compare
      
      
      mysys/thr_mutex.c:
        Unified printing of mutex addresses to make them easier to compare
      storage/maria/ma_dynrec.c:
        Fixed indentation
      storage/maria/ma_open.c:
        Fixed bug in allocation of dynamic record buffer
      e8b0bb47
    • unknown's avatar
      Fixed some compiler errors · abe1031e
      unknown authored
      
      mysys/my_thr_init.c:
        Added missing DBUG_OFF
      storage/maria/ma_loghandler.c:
        Fixed wrong macro
      abe1031e