1. 05 Nov, 2008 5 commits
    • marko's avatar
      branches/innodb+: ibuf_insert_low(): Ignore the free bits in the · 5d473326
      marko authored
      insert buffer bitmap when buffering deletes or delete-marks.
      
      TODO: ibuf_get_volume_buffered() should return only the volume of
      the buffered inserts, not deletes or delete-marks.
      5d473326
    • marko's avatar
      branches/innodb+: ibuf_delete(): Display the space id and page number · a7411707
      marko authored
      when ignoring a buffered delete that would empty a page. (Issue #82)
      a7411707
    • marko's avatar
      branches/innodb+: ibuf0ibuf.c: Revert the patches to Issue #82 · a18ca211
      marko authored
      (r2962, r2865, r2864) and do not refuse to buffer deletes.  The
      problem with refusing to buffer deletes was that no deletes were
      buffered.
      
      Instead, when merging delete requests, disregard a delete request
      if it would make the page empty.  InnoDB tolerates redundant secondary
      index records, but not empty pages.
      
      ibuf_delete(): When merging a delete request, print and ignore the record
      if the page would become empty.
      a18ca211
    • marko's avatar
      branches/innodb+: buf_get_volume_buffered(): When estimating the number of · 36c9bbc7
      marko authored
      records on a page, count each unique buffered record at most once.
      
      ibuf_get_volume_buffered_hash(): New function, for inserting a hashed record
      into a bit array.
      
      ibuf_get_volume_buffered_count(): New function, refactored from
      ibuf_get_volume_buffered(), for counting the unique records buffered for
      the page.
      
      ibuf_get_volume_buffered(): Define hash_bitmap, a bit array for identifying
      duplicate records.  Hash collisions do not hurt correctness, only performance.
      If the number of records on the page is estimated as 0, deletes will not be
      buffered.
      
      This patch is just for the record, as is rb://44.  In the tests run so far,
      the function ibuf_get_volume_buffered() always seems to estimate the number
      of records as 0, disabling all buffered deletes.
      36c9bbc7
    • marko's avatar
      branches/innodb+: ibuf0ibuf.c: Add a compile-time check for IBUF_REC_INFO_SIZE. · 8d498542
      marko authored
      ibuf_get_volume_buffered(): Correct the grammar of the function comment.
      8d498542
  2. 24 Oct, 2008 1 commit
    • marko's avatar
      branches/innodb+: Merge revisions 2862:2867 from branches/zip: · 957f14fd
      marko authored
        ------------------------------------------------------------------------
        r2866 | marko | 2008-10-23 23:25:43 +0300 (Thu, 23 Oct 2008) | 4 lines
      
        branches/zip: ibuf_delete_rec(): When the cursor to the insert buffer record
        cannot be restored, do not complain if the tablespace does not exist.
        This fixes Issue #88.
        ------------------------------------------------------------------------
        r2867 | marko | 2008-10-24 10:24:17 +0300 (Fri, 24 Oct 2008) | 2 lines
      
        branches/zip: ChangeLog: Document r2763, r2794, r2683, r2799, r2809, r2866.
        ------------------------------------------------------------------------
      957f14fd
  3. 23 Oct, 2008 3 commits
    • marko's avatar
      branches/innodb+: ibuf_get_volume_buffered(): Do not count insert operations · e1fc8d04
      marko authored
      when estimating n_recs.  This should finally fix Issue #82.
      e1fc8d04
    • marko's avatar
      branches/innodb+: Refuse to buffer deletes if that could lead to B-tree · a3d14f23
      marko authored
      pages becoming empty.  Remove work-arounds for empty pages.  This fixes
      Issue #82.
      
      ibuf_get_volume_buffered(): Add the output parameter n_recs, for returning
      the minimum number of records on the page.
      
      ibuf_insert_low(): Refuse to buffer IBUF_OP_DELETE if the page could
      become empty.
      
      btr_page_get_father_node_ptr(): Remove the work-around for the page
      being empty.
      
      page_zip_dir_delete(): Revert to the version from branches/zip.
      Always invoke page_zip_clear_rec().
      a3d14f23
    • marko's avatar
      branches/innodb+: Merge revisions 2835:2862 from branches/zip: · f557ff3e
      marko authored
        ------------------------------------------------------------------------
        r2838 | vasil | 2008-10-21 12:49:27 +0300 (Tue, 21 Oct 2008) | 61 lines
      
        branches/zip:
      
        Merge 2744:2837 from branches/5.1 (skipping r2782 and r2826):
      
          ------------------------------------------------------------------------
          r2832 | vasil | 2008-10-21 10:08:30 +0300 (Tue, 21 Oct 2008) | 10 lines
          Changed paths:
             M /branches/5.1/handler/ha_innodb.cc
      
          branches/5.1:
      
          In ha_innobase::info():
      
          Replace sql_print_warning() which prints to mysqld error log with
          push_warning_printf() which sends the error message to the client.
      
          Suggested by: Marko, Sunny, Michael
          Objected by:  Inaam
      
          ------------------------------------------------------------------------
          r2837 | vasil | 2008-10-21 12:07:44 +0300 (Tue, 21 Oct 2008) | 32 lines
          Changed paths:
             M /branches/5.1/mysql-test/innodb-semi-consistent.result
             M /branches/5.1/mysql-test/innodb-semi-consistent.test
             M /branches/5.1/mysql-test/innodb.result
             M /branches/5.1/mysql-test/innodb.test
      
          branches/5.1:
      
          Merge a change from MySQL (this fixes the failing innodb and
          innodb-semi-consistent tests):
      
            revno: 2757
            committer: Georgi Kodinov <kgeorge@mysql.com>
            branch nick: B39812-5.1-5.1.29-rc
            timestamp: Fri 2008-10-03 15:24:19 +0300
            message:
              Bug #39812: Make statement replication default for 5.1 (to match 5.0)
      
              Make STMT replication default for 5.1.
              Add a default of MIXED into the config files
              Fix the tests that needed MIXED replication mode.
            modified:
              mysql-test/include/mix1.inc
              mysql-test/r/innodb-semi-consistent.result
              mysql-test/r/innodb.result
              mysql-test/r/innodb_mysql.result
              mysql-test/r/tx_isolation_func.result
              mysql-test/t/innodb-semi-consistent.test
              mysql-test/t/innodb.test
              mysql-test/t/tx_isolation_func.test
              sql/mysqld.cc
              support-files/my-huge.cnf.sh
              support-files/my-innodb-heavy-4G.cnf.sh
              support-files/my-large.cnf.sh
              support-files/my-medium.cnf.sh
              support-files/my-small.cnf.sh
      
      
          ------------------------------------------------------------------------
      
        ------------------------------------------------------------------------
        r2847 | marko | 2008-10-22 10:07:37 +0300 (Wed, 22 Oct 2008) | 6 lines
      
        branches/zip: page_zip_rec_needs_ext(): Fix a bug that was introduced
        in the fix of Mantis issue #73.  With key_block_size=16, we will also
        have to check the available space on the uncompressed page.
        Otherwise, the clustered index record can be almost 16 kilobytes in
        size, and the undo log record will not fit.
        ------------------------------------------------------------------------
        r2850 | marko | 2008-10-22 13:52:12 +0300 (Wed, 22 Oct 2008) | 2 lines
      
        branches/zip: ibuf_insert_to_index_page(): Discard the local variable block.
        page_cur is always positioned on block, the function parameter.
        ------------------------------------------------------------------------
        r2853 | sunny | 2008-10-23 01:52:09 +0300 (Thu, 23 Oct 2008) | 2 lines
        branches/zip: Add missing UNIV_INTERN.
        ------------------------------------------------------------------------
        r2855 | sunny | 2008-10-23 09:29:46 +0300 (Thu, 23 Oct 2008) | 36 lines
      
        branches/zip:
      
        Merge revisions 2837:2852 from branches/5.1:
      
          ------------------------------------------------------------------------
          r2849 | sunny | 2008-10-22 12:01:18 +0300 (Wed, 22 Oct 2008) | 8 lines
          Changed paths:
             M /branches/5.1/handler/ha_innodb.cc
             M /branches/5.1/include/row0mysql.h
             M /branches/5.1/row/row0mysql.c
      
          branches/5.1: Return the actual error code encountered when allocating
          a new autoinc value. The change in behavior (bug) was introduced in 5.1.22
          when we introduced the new AUTOINC locking model.
      
          rb://31
      
          Bug#40224 New AUTOINC changes mask reporting of deadlock/timeout errors
      
          ------------------------------------------------------------------------
          r2852 | sunny | 2008-10-23 01:42:24 +0300 (Thu, 23 Oct 2008) | 9 lines
          Changed paths:
             M /branches/5.1/handler/ha_innodb.cc
             M /branches/5.1/handler/ha_innodb.h
      
          branches/5.1: Backport r2724 from branches/zip
      
          Check column value against the col max value before updating the table's
          global autoinc counter value. This is part of simplifying the AUTOINC
          sub-system. We extract the type info from MySQL data structures at runtime.
      
          This fixes Bug#37788 InnoDB Plugin: AUTO_INCREMENT wrong for compressed tables
      
          ------------------------------------------------------------------------
      
        ------------------------------------------------------------------------
        r2856 | sunny | 2008-10-23 10:07:05 +0300 (Thu, 23 Oct 2008) | 1 line
      
        Reverting test file changes from r2855
        ------------------------------------------------------------------------
        r2857 | sunny | 2008-10-23 10:24:33 +0300 (Thu, 23 Oct 2008) | 30 lines
      
        branches/zip:
      
        Merge revisions 2852:2854 from branches/5.1:
      
          ------------------------------------------------------------------------
          r2854 | sunny | 2008-10-23 08:30:32 +0300 (Thu, 23 Oct 2008) | 13 lines
          Changed paths:
             M /branches/5.1/dict/dict0dict.c
             M /branches/5.1/dict/dict0mem.c
             M /branches/5.1/handler/ha_innodb.cc
             M /branches/5.1/handler/ha_innodb.h
             M /branches/5.1/include/dict0dict.h
             M /branches/5.1/include/dict0mem.h
             M /branches/5.1/row/row0mysql.c
      
          branches/5.1: Backport changes from branches/zip r2725
      
          Simplify the autoinc initialization code. This removes the
          non-determinism related to reading the table's autoinc value for the first
          time. This change has also reduced the sizeof dict_table_t by sizeof(ibool)
          bytes because we don't need the dict_table_t::autoinc_inited field anymore.
      
          Bug#39830 Table autoinc value not updated on first insert.
          Bug#35498 Cannot get table test/table1 auto-inccounter value in ::info
          Bug#36411 Failed to read auto-increment value from storage engine" in 5.1.24 auto-inc
          rb://16
      
      
          ------------------------------------------------------------------------
      
        ------------------------------------------------------------------------
        r2858 | vasil | 2008-10-23 11:33:43 +0300 (Thu, 23 Oct 2008) | 4 lines
      
        branches/zip:
      
        Update the ChangeLog
        ------------------------------------------------------------------------
        r2861 | marko | 2008-10-23 12:27:15 +0300 (Thu, 23 Oct 2008) | 24 lines
      
        branches/zip: Clean up the file format stamping.
      
        trx_sys_file_format_max_upgrade(): Rename from
        trx_sys_file_format_max_update().  Improve the documentation.  Add a
        const qualifier to the parameter "name".  Replace the parameter
        "flags" with "format_id", because this function should deal with file
        format identifiers, not with table flags.
      
        trx_sys_file_format_max_write(), trx_sys_file_format_max_set(): Add a
        const qualifier to the parameter "name".
      
        ha_innodb.cc: Correct the spelling in some comments: "side effect".
        Remove redundant prototypes for some static callback functions.
      
        innodb_file_format_name_update(), innodb_file_format_check_update():
        Correct the function signature.  Use appropriate pointer type conversions.
      
        MYSQL_SYSVAR_STR(file_format), MYSQL_SYSVAR_STR(file_format_check):
        Remove the type conversions from the callback function pointers.  When
        the function signatures match, no type conversion is needed.  The type
        conversions would only prevent compilation warnings for any mismatch.
      
        Approved by Sunny in rb://25.
        ------------------------------------------------------------------------
        r2862 | marko | 2008-10-23 12:37:42 +0300 (Thu, 23 Oct 2008) | 8 lines
      
        branches/zip: Non-functional changes:
      
        ibuf_get_volume_buffered(): Declare with static linkage.
        This function is private to ibuf0ibuf.c.
      
        btr_cur_pessimistic_delete(): Use the cached result of
        btr_cur_get_index(cursor).
        ------------------------------------------------------------------------
      f557ff3e
  4. 22 Oct, 2008 1 commit
  5. 21 Oct, 2008 1 commit
    • marko's avatar
      branches/innodb+: Merge revisions 2799:2835 from branches/zip: · c25e0221
      marko authored
        ------------------------------------------------------------------------
        r2809 | marko | 2008-10-16 09:41:13 +0300 (Thu, 16 Oct 2008) | 18 lines
      
        branches/zip: Skip the undo log size check on REDUNDANT and COMPACT tables.
      
        In ROW_FORMAT=DYNAMIC and ROW_FORMAT=COMPRESSED, column prefix indexes
        require that prefixes of externally stored columns be written to the
        undo log. This may make the undo log record bigger than the record on
        the B-tree page.  The maximum size of an undo log record is the page
        size.  That must be checked for, in dict_index_add_to_cache().
      
        dict_index_add_to_cache(): Skip the undo log size check for REDUNDANT
        and COMPACT tables. These tables store prefixes of externally stored
        columns locally within the clustered index record.  There are no special
        considerations for the undo log record size.
      
        innodb-index.test: Ensure that the check exists for ROW_FORMAT=DYNAMIC,
        but not for ROW_FORMAT=COMPACT.
      
        This fixes issue #99.  rb://28 approved by Sunny.
        ------------------------------------------------------------------------
        r2810 | vasil | 2008-10-16 19:57:58 +0300 (Thu, 16 Oct 2008) | 12 lines
      
        branches/zip:
      
        Fix Mantis issue#61:
      
        In row_undo_ins_parse_undo_rec(): if we find that a table has no indexes
        (dict_table_get_first_index() returns NULL) do not try to call
        trx_undo_rec_get_row_ref() with a NULL pointer because that would lead to
        a crash. Instead, print a warning and set node->table to NULL just like
        it is done if the .ibd file is missing.
      
        Approved by:    Heikki (via IM)
        ------------------------------------------------------------------------
        r2824 | marko | 2008-10-20 09:58:01 +0300 (Mon, 20 Oct 2008) | 2 lines
      
        branches/zip: rec_convert_dtuple_to_rec_comp(): Relax a too tight assertion.
        Spotted by Sunny.
        ------------------------------------------------------------------------
        r2825 | vasil | 2008-10-20 13:41:04 +0300 (Mon, 20 Oct 2008) | 6 lines
      
        branches/zip:
      
        Print the table name via ut_print_name() and add two spaces before InnoDB.
      
        Suggested by:   Marko
        ------------------------------------------------------------------------
        r2833 | marko | 2008-10-21 10:16:45 +0300 (Tue, 21 Oct 2008) | 2 lines
      
        branches/zip: ibuf_insert_low(): Avoid unnecessarily
        acquiring and releasing ibuf_mutex.
        ------------------------------------------------------------------------
        r2834 | marko | 2008-10-21 10:18:57 +0300 (Tue, 21 Oct 2008) | 1 line
      
        branches/zip: ibuf_delete_rec(): Add debug assertions suggested by Heikki.
        ------------------------------------------------------------------------
        r2835 | marko | 2008-10-21 11:04:06 +0300 (Tue, 21 Oct 2008) | 1 line
      
        branches/zip: ibuf_insert_low(): Simplify a comparison.
        ------------------------------------------------------------------------
      c25e0221
  6. 15 Oct, 2008 2 commits
    • marko's avatar
      branches/innodb+: Merge revisions 2774:2799 from branches/zip: · cfa731c8
      marko authored
        ------------------------------------------------------------------------
        r2781 | marko | 2008-10-13 13:40:57 +0300 (Mon, 13 Oct 2008) | 1 line
      
        branches/zip: page_cur_delete_rec(): Call page_zip_validate_low().
        ------------------------------------------------------------------------
        r2783 | vasil | 2008-10-13 18:34:34 +0300 (Mon, 13 Oct 2008) | 9 lines
      
        branches/zip:
      
        Remove mysql-test/patches/bug37312.diff because MySQL "fixed"
        Bug#37312 by removing the test.
      
        http://bugs.mysql.com/37312
        http://lists.mysql.com/commits/54462
        ------------------------------------------------------------------------
        r2784 | marko | 2008-10-13 21:35:30 +0300 (Mon, 13 Oct 2008) | 1 line
      
        branches/zip: Add missing NULL check to the assertion added in r2781.
        ------------------------------------------------------------------------
        r2785 | marko | 2008-10-13 22:29:12 +0300 (Mon, 13 Oct 2008) | 2 lines
      
        branches/zip: page_cur_delete_rec(): Remove the bogus page_zip_validate_low()
        assertion that was added in r2781 and explain why it was bogus.
        ------------------------------------------------------------------------
        r2786 | calvin | 2008-10-14 19:14:47 +0300 (Tue, 14 Oct 2008) | 7 lines
      
        branches/zip: fix Mantis issue #96 Problem compiling ha_innodb.cc
        on 64-bit Windows
      
        Change the definition of srv_replication_delay from ulint to ulong.
        ulint is 64-bit on Win64.
      
        Approved by:	Heikki (on IM)
        ------------------------------------------------------------------------
        r2787 | calvin | 2008-10-14 19:19:41 +0300 (Tue, 14 Oct 2008) | 7 lines
      
        branches/zip: fix compiler warning
      
        Change the definition of add_on from ulint to ullint, to eliminate
        the warning in .\btr\btr0cur.c:
        conversion from 'ullint' to 'ulint', possible loss of data
      
        Approved by:	Heikki (on IM)
        ------------------------------------------------------------------------
        r2793 | marko | 2008-10-15 10:00:06 +0300 (Wed, 15 Oct 2008) | 2 lines
      
        branches/zip: row_create_table_for_mysql(), row_create_index_for_mysql():
        Note that the dictionary object will be freed.
        ------------------------------------------------------------------------
        r2794 | marko | 2008-10-15 10:32:40 +0300 (Wed, 15 Oct 2008) | 9 lines
      
        branches/zip: When invoking page_zip_copy_recs(), update the lock table
        and the adaptive hash index.  This should fix Issue #95 and Issue #87.
      
        page_zip_copy_recs(): Copy PAGE_MAX_TRX_ID as well, to have similar behavior
        to page_copy_rec_list_start() and page_copy_rec_list_end().
      
        btr_root_raise_and_insert(), btr_page_split_and_insert(), btr_lift_page_up():
        Update the lock table and the adaptive hash index.
        ------------------------------------------------------------------------
        r2797 | marko | 2008-10-15 13:21:54 +0300 (Wed, 15 Oct 2008) | 3 lines
      
        branches/zip: Introduce UNIV_ZIP_COPY for invoking page_zip_copy_recs()
        more often in B-tree operations.
        ------------------------------------------------------------------------
        r2799 | marko | 2008-10-15 14:27:42 +0300 (Wed, 15 Oct 2008) | 25 lines
      
        branches/zip: When the server crashes while freeing an externally stored
        column of a compressed table, the BTR_EXTERN_LEN field in the BLOB pointer
        will be written as 0.  Tolerate this in the functions that deal with
        externally stored columns.  This fixes Issue #80 and was posted at rb://26.
      
        Note that the clustered index record is always deleted or purged last,
        after any secondary index records referring to it have been deleted.
      
        btr_free_externally_stored_field(): On an uncompressed table, zero out
        the BTR_EXTERN_LEN, so that half-deleted BLOBs can be detected after
        crash recovery.
      
        btr_copy_externally_stored_field_prefix(): Return 0 if the BLOB has been
        half-deleted.
      
        row_upd_ext_fetch(): Assert that the externally stored column exists.
      
        row_ext_cache_fill(): Allow btr_copy_externally_stored_field_prefix()
        to return 0.
      
        row_sel_sec_rec_is_for_blob(): Return FALSE if the BLOB has been half-deleted.
        This is correct, because the clustered index record would have been deleted
        or purged last, after any secondary index records referring to it had been
        deleted.
        ------------------------------------------------------------------------
      cfa731c8
    • marko's avatar
      branches/innodb+: btr_cur_search_to_nth_level(): Add a TODO comment that · 0332dc7b
      marko authored
      when encountering an empty leaf page, we should advance to the right
      siblings until a non-empty page is found.  Move the initialization of
      cursor->ibuf_cnt to a better place.
      0332dc7b
  7. 11 Oct, 2008 1 commit
  8. 02 Oct, 2008 1 commit
  9. 01 Oct, 2008 1 commit
  10. 30 Sep, 2008 5 commits
    • marko's avatar
      branches/innodb+: row_search_index_entry(): Clean up the call interface · 8e8f02e5
      marko authored
      and add assertions to callers.  Remove the added ibool* parameter and
      return enum row_search_result instead of ibool, to reflect the four
      different outcomes: record found, not found, buffered, and status unknown
      (record not in the buffer pool).
      
      rb://6
      8e8f02e5
    • marko's avatar
      branches/innodb+: ibuf_rec_get_size(): Correct some bugs. rb://17 · db1cb106
      marko authored
      This function was created when the delete buffering code was merged from
      branches/fts in r2324.
      
      ibuf_rec_get_size(): Rename the parameter new_format to pre_4_1.  Use
      the correct offsets and accessors for both values of pre_4_1.
      
      ibuf_rec_get_info(): Note that the record must be in 4.1 or later format.
      db1cb106
    • marko's avatar
      branches/innodb+: page_zip_dir_delete(): Do not clear the last record on · 1141a8e0
      marko authored
      a secondary index leaf page, because that could break delete buffering.
      
      btr_page_get_father_node_ptr(): Remove a TODO comment regarding this.
      1141a8e0
    • marko's avatar
      branches/innodb+: Minor cleanup. · 2cf9ce26
      marko authored
      ibuf_set_entry_counter(): Turn a ut_ad() assertion into ut_a().
      
      ibuf_set_del_mark(), ibuf_delete(): Add const qualifiers to read-only
      parameters.
      2cf9ce26
    • marko's avatar
      branches/innodb+: Non-functional changes: · 29c7db71
      marko authored
      ibuf_get_entry_counter_low(): Rename from ibuf_set_entry_counter_low().
      This function only reads the counter.  Add const qualifier to the
      rec parameter.
      
      ibuf_set_entry_counter(): Document the entry parameter as in/out.
      29c7db71
  11. 29 Sep, 2008 1 commit
  12. 26 Sep, 2008 1 commit
    • marko's avatar
      branches/innodb+: Minor cleanup. · 160ea61e
      marko authored
      ibuf_rec_get_info(): Eliminate the local variable "mod".  Use switch-case
      instead of if-else if-else.
      
      ibuf_rec_get_op_type(), ibuf_add_ops(), ibuf_print_ops():
      Add const qualifiers to read-only parameters.
      
      ibuf_rec_get_volume(): Remove empty line at end of block.
      160ea61e
  13. 25 Sep, 2008 2 commits
  14. 24 Sep, 2008 5 commits
  15. 23 Sep, 2008 2 commits
  16. 22 Sep, 2008 8 commits