1. 30 Jan, 2009 2 commits
    • marko's avatar
      branches/zip: Make innodb_adaptive_hash_index settable. · 06375f3c
      marko authored
      btr_search_disabled: Rename to btr_search_enabled and change the type
      to char, so that it can be directly linked to the MySQL parameters.
      Note that the variable is protected by btr_search_latch and
      btr_search_enabled_mutex, a new mutex introduced in this patch.
      
      btr_search_enabled_mutex: A new mutex, to protect btr_search_enabled
      together with btr_search_latch.
      
      buf_pool_drop_hash_index(): New function, to be called from
      btr_search_disable().
      
      btr_search_disable(), btr_search_enable(): Fix bugs.  These functions
      were previously unused.
      
      btr_search_guess_on_hash(), btr_search_build_page_hash_index():
      Check btr_search_enabled once more, while holding btr_search_latch.
      
      btr_cur_search_to_nth_level(): Note that the reads of btr_search_enabled
      may be dirty and explain why it should not be a problem.
      
      innobase_adaptive_hash_index: Remove. The variable btr_search_enabled will be used directly instead.
      
      innodb_adaptive_hash_index_update(): New function, an update callback for
      innodb_adaptive_hash_index.  This will call either btr_search_disable()
      or btr_search_enable() when the value is assigned.  The functions will
      be called even if the value does not appear to be changed, e.g., when
      setting from TRUE to TRUE or FALSE to FALSE.
      
      rb://85 approved by Heikki Tuuri.  This addresses Issue #163.
      06375f3c
    • marko's avatar
      branches/zip: ibuf_use_t: Add the constant IBUF_USE_COUNT, to eliminate · 004b19e5
      marko authored
      a gcc warning about an assertion that trivially holds.
      The warning was introduced in r4061, in the merge of
      branches/innodb+ -r4053.
      
      ibuf_insert(): Let an assertion fail if ibuf_use is unknown.
      004b19e5
  2. 29 Jan, 2009 3 commits
    • marko's avatar
      branches/zip: Port the applicable parts of r4053 from branches/innodb+: · c3dc038c
      marko authored
      Implement the global variable innodb_change_buffering, with the
      following values:
      
      none - buffer nothing
      inserts - buffer inserts (the default)
      
      Approved by Ken Jacobs.
      c3dc038c
    • marko's avatar
    • calvin's avatar
      branches/zip: Merge revisions 4032:4035 from branches/5.1 · a175805f
      calvin authored
      All InnoDB related tests passed on Windows, except
      known failure in partition_innodb_semi_consistent.
      
      The inadvertent change to btr0sea.c in this commit is reverted in r4060.
      
        ------------------------------------------------------------------------
        r4035 | vasil | 2009-01-26 09:26:25 -0600 (Mon, 26 Jan 2009) | 23 lines
      
        branches/5.1:
      
        Merge a change from MySQL:
      
          ------------------------------------------------------------
          revno: 2646.161.4
          committer: Tatiana A. Nurnberg <azundris@mysql.com>
          branch nick: 51-31177v2
          timestamp: Mon 2009-01-12 06:32:49 +0100
          message:
            Bug#31177: Server variables can't be set to their current values
      
            Bounds-checks and blocksize corrections were applied to user-input,
            but constants in the server were trusted implicitly. If these values
            did not actually meet the requirements, the user could not set change
            a variable, then set it back to the (wonky) factory default or maximum
            by explicitly specifying it (SET <var>=<value> vs SET <var>=DEFAULT).
      
            Now checks also apply to the server's presets. Wonky values and maxima
            get corrected at startup. Consequently all non-offsetted values the user
            sees are valid, and users can set the variable to that exact value if
            they so desire.
      a175805f
  3. 28 Jan, 2009 3 commits
  4. 27 Jan, 2009 5 commits
  5. 26 Jan, 2009 2 commits
    • marko's avatar
      branches/zip: In r988, the function buf_block_align() was enclosed · 60cf6c98
      marko authored
      within UNIV_DEBUG. The two remaining callers in non-debug builds,
      btr_search_guess_on_hash() and btr_search_validate(), were rewritten
      to call buf_page_hash_get().
      
      To implement support for a resizeable buffer pool, the function
      buf_block_align() had been rewritten to perform a page hash lookup in
      the buffer pool. The caller was also made responsible for holding the
      buffer pool mutex.
      
      Because the page hash lookup is expensive and it has to be done while
      holding the buffer pool mutex, implement buf_block_align() by pointer
      arithmetics again, and make btr_search_guess_on_hash() call it. Note
      that this will have to be adjusted if the interface to the resizeable
      buffer pool is actually implemented.
      
      rb://83 approved by Heikki Tuuri, to address Issue #161.
      
      As a deviation from the approved patch, this patch also makes
      btr_search_validate() (invoked by CHECK TABLE) check that
      buf_pool->page_hash is consistent with buf_block_align().
      60cf6c98
    • marko's avatar
      branches/zip: buf_page_get_gen(): Fix a "possibly uninitialized" warning · 4e96a6c8
      marko authored
      that was introduced in r4030.
      4e96a6c8
  6. 23 Jan, 2009 5 commits
  7. 20 Jan, 2009 2 commits
    • vasil's avatar
      branches/zip: · dba12ca2
      vasil authored
      Add ChangeLog entries for the bugfixes in r4004 and r4005.
      dba12ca2
    • marko's avatar
      branches/zip: Merge revisions 3930:4005 from branches/5.1: · f7e8f116
      marko authored
        ------------------------------------------------------------------------
        r4004 | marko | 2009-01-20 16:19:00 +0200 (Tue, 20 Jan 2009) | 12 lines
      
        branches/5.1: Merge r4003 from branches/5.0:
      
        rec_set_nth_field(): When the field already is SQL null,
        do nothing when it is being changed to SQL null. (Bug #41571)
      
        Normally, MySQL does not pass "do-nothing" updates to the storage engine.
        When it does and a column of an InnoDB table that is in ROW_FORMAT=COMPACT
        is being updated from NULL to NULL, the InnoDB buffer pool will be corrupted
        without this fix.
      
        rb://81 approved by Heikki Tuuri
        ------------------------------------------------------------------------
        r4005 | marko | 2009-01-20 16:22:36 +0200 (Tue, 20 Jan 2009) | 8 lines
      
        branches/5.1: lock_is_table_exclusive(): Acquire kernel_mutex before
        accessing table->locks and release kernel_mutex before returning from
        the function.  This fixes a portential race condition in the
        "commit every 10,000 rows" in ALTER TABLE, CREATE INDEX, DROP INDEX,
        and OPTIMIZE TABLE. (Bug #42152)
      
        rb://80 approved by Heikki Tuuri
        ------------------------------------------------------------------------
      f7e8f116
  8. 16 Jan, 2009 1 commit
    • marko's avatar
      branches/zip: Add assertions that the kernel_mutex is being held · bdf341a2
      marko authored
      while accessing table->locks or un_member.tab_lock.locks.
      This is related to Issue #158.  According to static analysis,
      the added debug assertions should always hold.
      
      lock_table_has_to_wait_in_queue(), lock_queue_iterator_reset(),
      lock_queue_iterator_get_prev(), add_trx_relevant_locks_to_cache(),
      fetch_data_into_cache(): Add ut_ad(mutex_own(&kernel_mutex)).
      bdf341a2
  9. 15 Jan, 2009 3 commits
    • vasil's avatar
      branches/zip: · b267d1cc
      vasil authored
      Add ChangeLog entries for the bug fixes in r3911 and r3930.
      b267d1cc
    • marko's avatar
      branches/zip: buf0lru.c: Improve debug assertions. · 7f64f82e
      marko authored
      buf_LRU_block_free_non_file_page(): ut_ad(block) before dereferencing block.
      
      buf_LRU_block_remove_hashed_page(): Forbid buf_pool_mutex_exit() while
      calling buf_buddy_free().  Callers of buf_LRU_block_remove_hashed_page()
      assume that the buffer pool mutex will not be released and reacquired.
      7f64f82e
    • marko's avatar
      branches/zip: buf_LRU_invalidate_tablespace(), buf_LRU_free_block(): · b59d325e
      marko authored
      Add comments and assertions that buf_LRU_block_remove_hashed_page()
      will release block_mutex when it returns BUF_BLOCK_ZIP_FREE.
      b59d325e
  10. 14 Jan, 2009 1 commit
    • marko's avatar
      branches/zip: Merge revisions 3601:3930 from branches/5.1: · 5dd0a711
      marko authored
        ------------------------------------------------------------------------
        r3911 | sunny | 2009-01-13 14:15:24 +0200 (Tue, 13 Jan 2009) | 13 lines
      
        branches/5.1: Fix Bug#38187 Error 153 when creating savepoints
        InnoDB previously treated savepoints as a stack e.g.,
          SAVEPOINT a;
          SAVEPOINT b;
          SAVEPOINT c;
          SAVEPOINT b; <- This would delete b and c.
      
        This fix changes the behavior to:
          SAVEPOINT a;
          SAVEPOINT b;
          SAVEPOINT c;
          SAVEPOINT b; <- Does not delete savepoint c
        ------------------------------------------------------------------------
        r3930 | marko | 2009-01-14 15:51:30 +0200 (Wed, 14 Jan 2009) | 4 lines
      
        branches/5.1: dict_load_table(): If dict_load_indexes() fails,
        invoke dict_table_remove_from_cache() instead of dict_mem_table_free(),
        so that the data dictionary will not point to freed data.
        (Bug #42075, Issue #153, rb://76 approved by Heikki Tuuri)
        ------------------------------------------------------------------------
      5dd0a711
  11. 13 Jan, 2009 5 commits
    • marko's avatar
      branches/zip: In hash table lookups, assert that the traversed items · d46597eb
      marko authored
      satisfy some conditions when UNIV_DEBUG is defined.
      
      HASH_SEARCH(): New parameter: ASSERTION. All users will pass an appropriate
      ut_ad() or nothing.
      
      dict_table_add_to_columns(): Assert that the table being added to the data
      dictionary cache is not already being pointed to by the name_hash and
      id_hash tables.
      
      HASH_SEARCH_ALL(): New macro, for use in dict_table_add_to_columns().
      
      dict_mem_table_free(): Set ut_d(table->cached = FALSE), so that we can
      check ut_ad(table->cached) when traversing the hash tables, as in
      HASH_SEARCH(name_hash, dict_sys->table_hash, ...) and
      HASH_SEARCH(id_hash, dict_sys->table_id_hash, ...).
      
      dict_table_get_low(), dict_table_get_on_id_low(): Assert
      ut_ad(!table || table->cached).
      
      fil_space_get_by_id(): Check ut_ad(space->magic_n == FIL_SPACE_MAGIC_N)
      in HASH_SEARCH(hash, fil_system->spaces, ...).
      
      fil_space_get_by_name(): Check ut_ad(space->magic_n == FIL_SPACE_MAGIC_N)
      in HASH_SEARCH(name_hash, fil_system->name_hash, ...).
      
      buf_buddy_block_free(): Check that the blocks are in valid state in
      HASH_SEARCH(hash, buf_pool->zip_hash, ...).
      
      buf_page_hash_get(): Check that the blocks are in valid state in
      HASH_SEARCH(hash, buf_pool->page_hash, ...).
      
      get_share(), free_share(): Check ut_ad(share->use_count > 0) in
      HASH_SEARCH(table_name_hash, innobase_open_tables, ...).
      
      This was posted as rb://75 for tracking down errors similar to Issue #153.
      d46597eb
    • marko's avatar
    • marko's avatar
      branches/zip: row_merge_create_temporary_table(): On error, · b7ed87a3
      marko authored
      row_create_table_for_mysql() already frees new_table.
      Do not attempt to free it again.
      b7ed87a3
    • marko's avatar
      8df91698
    • marko's avatar
      branches/zip: buf_flush_try_neighbors(): Fix a bug · 31faad97
      marko authored
      that was introduced in r3879 (rb://73).
      31faad97
  12. 12 Jan, 2009 6 commits
  13. 09 Jan, 2009 2 commits
    • marko's avatar
      branches/zip: Non-functional change: Tighten debug assertions and · 66ff0361
      marko authored
      remove dead code.
      
      buf_flush_ready_for_flush(), buf_flush_try_page(): Assert that
      flush_type is one of BUF_FLUSH_LRU or BUF_FLUSH_LIST.  The flush_type
      comes from buf_flush_batch(), which already asserts this.  The
      assertion holds for all calls in the source code.
      
      buf_flush_try_page(): Remove the dead case BUF_FLUSH_SINGLE_PAGE
      of switch (flush_type).
      66ff0361
    • marko's avatar
      branches/zip: Add comments related to Issue #155. · d66ffab4
      marko authored
      buf_flush_try_page(): Note why it is safe to access bpage without
      holding buf_pool_mutex or block_mutex.
      d66ffab4