1. 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
  2. 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
  3. 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
  4. 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
  5. 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
  6. 12 Jan, 2009 6 commits
  7. 09 Jan, 2009 6 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
    • marko's avatar
      branches/zip: Some non-functional changes related to Issue #155. · 18a59b38
      marko authored
      buf_page_struct: Note that space and offset are also protected by
      buf_pool_mutex.  They are only assigned to by
      buf_block_set_file_page().  Thus, it suffices for buf_flush_batch() to
      hold just buf_pool_mutex when checking these fields.
      
      buf_flush_try_page(): Rename "locked" to "is_s_latched", per Heikki's request.
      
      buf_flush_batch(): Move the common statement mutex_exit(block_mutex)
      from all if-else if-else branches before the if block.  Remove the
      redundant test (buf_pool->init_flush[flush_type] == FALSE) that was
      apparently copied from buf_flush_write_complete().
      
      buf_flush_write_block_low(): Note why it is safe not to hold buf_pool_mutex
      or block_mutex.  Enumerate the assumptions in debug assertions.
      18a59b38
    • marko's avatar
      branches/zip: buf_flush_insert_into_flush_list(), · 8d2eee9d
      marko authored
      buf_flush_insert_sorted_into_flush_list(): Remove unused code.
      Change the parameter to buf_block_t* block and assert that
      block->state == BUF_BLOCK_FILE_PAGE.  This is part of Issue #155.
      8d2eee9d
    • marko's avatar
      branches/zip: buf_flush_try_page(): Introduce the variable is_compressed · 40d2bc7d
      marko authored
      for caching the result of buf_page_get_state(bpage) == BUF_BLOCK_FILE_PAGE.
      40d2bc7d
    • marko's avatar
      branches/zip: buf_flush_try_page(): Move some common code from each · 7507c217
      marko authored
      switch case before the switch block.
      7507c217
  8. 08 Jan, 2009 1 commit
    • vasil's avatar
      branches/zip: · 771269f8
      vasil authored
      Add ChangeLog entries for r3795 r3796 r3797 r3798.
      771269f8
  9. 07 Jan, 2009 4 commits
    • marko's avatar
      branches/zip: row_merge_drop_temp_indexes(): Do not lock the rows of · cc40a32d
      marko authored
      SYS_INDEXES when looking for partially created indexes.  Use the
      transaction isolation level READ UNCOMMITTED to avoid interfering with
      locks held by incomplete transactions that will be rolled back in a
      subsequent step in the recovery.  (Issue #152)
      
      Approved by Heikki Tuuri
      cc40a32d
    • marko's avatar
      branches/zip: Do not call trx_allocate_for_mysql() directly, but use · 9c34e5f9
      marko authored
      helper functions that initialize some members of the transaction struct.
      (Bug #41680)
      
      innobase_trx_init(): New function: initialize some fields of a
      transaction struct from a MySQL THD object.
      
      innobase_trx_allocate(): New function: allocate and initialize a
      transaction struct.
      
      check_trx_exists(): Use the above two functions.
      
      ha_innobase::delete_table(), ha_innobase::rename_table(),
      ha_innobase::add_index(), ha_innobase::final_drop_index():
      Use innobase_trx_allocate().
      
      innobase_drop_database(): In the Windows plugin, initialize the trx_t
      specially, because the THD is not available.  Otherwise, use
      innobase_trx_allocate().
      
      rb://69 accepted by Heikki Tuuri
      9c34e5f9
    • marko's avatar
      334de42c
    • marko's avatar
      branches/zip: row_merge_tuple_cmp(): Do not report a duplicate key value · b62033c8
      marko authored
      if any of the fields are NULL.  While the tuples are equal in the
      sorting order, SQL NULL is defined to be logically inequal to
      anything else. (Bug #41904)
      
      rb://70 approved by Heikki Tuuri
      b62033c8
  10. 06 Jan, 2009 1 commit
    • vasil's avatar
      branches/zip: · 5a5c6897
      vasil authored
      Add patch to fix the failing main.variables mysql-test. It started failing
      after the variable innodb_use_sys_malloc was added because it matches
      '%alloc%' and the test is badly written and expects that no new variables
      like that will ever be added.
      5a5c6897
  11. 05 Jan, 2009 1 commit
    • marko's avatar
      branches/zip: Merge revisions 3598:3601 from branches/5.1: · 6b3837fe
      marko authored
        ------------------------------------------------------------------------
        r3601 | marko | 2008-12-22 16:05:19 +0200 (Mon, 22 Dec 2008) | 9 lines
      
        branches/5.1: Make
        SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED
        a true replacement of SET GLOBAL INNODB_LOCKS_UNSAFE_FOR_BINLOG=1.
        This fixes an error that was introduced in r370, causing
        semi-consistent read not to not unlock rows in READ COMMITTED mode.
        (Bug #41671, Issue #146)
      
        rb://67 approved by Heikki Tuuri
        ------------------------------------------------------------------------
      6b3837fe
  12. 02 Jan, 2009 5 commits
  13. 30 Dec, 2008 2 commits
    • marko's avatar
      branches/zip: When setting the PAGE_LEVEL of a compressed B-tree page · c19234cc
      marko authored
      from or to 0, compress the page at the same time.  This is necessary,
      because the column information stored on the compressed page will
      differ between leaf and non-leaf pages.  Leaf pages are identified by
      PAGE_LEVEL=0.  This bug was reported as Issue #150.
      
      Document the similarity between btr_page_create() and
      btr_page_empty().  Make the function signature of btr_page_empty()
      identical with btr_page_create().  (This will add the parameter "level".)
      
      btr_root_raise_and_insert(): Replace some code with a call to
      btr_page_empty().
      
      btr_attach_half_pages(): Assert that the page level has already been
      set on both block and new_block.  Do not set it again.
      
      btr_discard_only_page_on_level(): Document that this function is
      probably never called.  Make it work on any height tree.  (Tested on
      2-high tree by disabling btr_lift_page_up().)
      
      rb://68
      c19234cc
    • marko's avatar
      branches/zip: Remove the dependency on the MySQL HASH table implementation. · 72a63786
      marko authored
      Use the InnoDB hash table for keeping track of INNOBASE_SHARE objects.
      
      struct st_innobase_share: Make table_name const uchar*.  Add the member
      table_name_hash.
      
      innobase_open_tables: Change the type from HASH to hash_table_t*.
      
      innobase_get_key(): Remove.
      
      innobase_fold_name(): New function, for computing the fold value for the
      InnoDB hash table.
      
      get_share(), free_share(): Use the InnoDB hash functions.
      
      innobase_end(): Free innobase_open_tables before shutting down InnoDB.
      Shutting down InnoDB will invalidate all memory allocated via InnoDB.
      
      rb://65 approved by Heikki Tuuri.  This addresses Issue #104.
      72a63786
  14. 22 Dec, 2008 2 commits
    • marko's avatar
      branches/zip: page_cur_insert_rec_zip(): When allocating insert_buf from · b32e37d5
      marko authored
      the free list, zero out the node pointer field of the deleted record if
      the new record would not overwrite it.  This fixes a harmless content
      mismatch reported by page_zip_validate() that was reported as Issue #147.
      
      rb://66 approved by Heikki Tuuri
      b32e37d5
    • marko's avatar
      branches/zip: Merge revisions 3479:3598 from branches/5.1: · 0c80424f
      marko authored
        ------------------------------------------------------------------------
        r3588 | inaam | 2008-12-18 14:26:54 +0200 (Thu, 18 Dec 2008) | 8 lines
      
        branches/5.1
      
        It is a bug in unused code. If we don't calculate the hash value when
        calculating the mutex number then two pages which map to same hash
        value can get two different mutex numbers.
      
        Approved by: Marko
        ------------------------------------------------------------------------
        r3590 | marko | 2008-12-18 15:33:36 +0200 (Thu, 18 Dec 2008) | 11 lines
      
        branches/5.1: When converting a record to MySQL format, copy the default
        column values for columns that are SQL NULL.  This addresses failures in
        row-based replication (Bug #39648).
      
        row_prebuilt_t: Add default_rec, for the default values of the columns in
        MySQL format.
      
        row_sel_store_mysql_rec(): Use prebuilt->default_rec instead of
        padding columns.
      
        rb://64 approved by Heikki Tuuri
        ------------------------------------------------------------------------
        r3598 | marko | 2008-12-22 15:28:03 +0200 (Mon, 22 Dec 2008) | 6 lines
      
        branches/5.1: ibuf_delete_rec(): When the record cannot be found and
        the tablespace has been dropped, commit the mini-transaction, so that
        InnoDB will not hold the insert buffer tree latch in exclusive mode,
        causing a potential deadlock.  This bug was introduced in the fix of
        Bug #27276 in r2924.
        ------------------------------------------------------------------------
      0c80424f