1. 01 Apr, 2010 40 commits
    • Sergey Vojtovich's avatar
      Applying InnoDB snashot, fixes BUG#51587. · ce479115
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6767 | calvin | 2010-03-01 18:16:10 +0200 (Mon, 01 Mar 2010) | 3 lines
      branches/zip: fix bug#51587
      Non-functional change.
      ce479115
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · b1143e83
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6754 | marko | 2010-02-24 10:56:43 +0200 (Wed, 24 Feb 2010) | 17 lines
      branches/zip: Allocate the merge sort buffers from a heap, not stack.
      
      The merge sort can use up to 48KiB of buffers when merging blocks.
      That can cause a stack overflow, especially on 64-bit systems when not
      building with inlined functions.  This was reported as Issue #462.
      
      row_merge_dup_report(): Allocate buf and offsets from a heap.
      
      row_merge_heap_create(): Allocate space for buf[3] too. Fix bogus
      sizeof arithmetics that happened to work, because
      sizeof(ulint)==sizeof(void*).
      
      row_merge_blocks(), row_merge_blocks_copy(): Allocate buf[3] from heap.
      
      row_merge_insert_index_tuples(): Allocate buf from graph_heap.
      
      rb://258 approved and tested by Sunny Bains
      b1143e83
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 69ed5e75
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6750 | marko | 2010-02-22 08:57:23 +0200 (Mon, 22 Feb 2010) | 2 lines
      branches/zip: row_fetch_store_uint4(): Remove unused function.
      This was added to trunk in r435.
      69ed5e75
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 5ae55636
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6749 | vasil | 2010-02-20 18:45:41 +0200 (Sat, 20 Feb 2010) | 5 lines
      Non-functional change: update copyright year to 2010 of the files
      that have been modified after 2010-01-01 according to svn.
      
      for f in $(svn log -v -r{2010-01-01}:HEAD |grep "^   M " |cut -b 16- |sort -u) ; do sed -i "" -E 's/(Copyright \(c\) [0-9]{4},) [0-9]{4}, (.*Innobase Oy.+All Rights Reserved)/\1 2010, \2/' $f ; done
      5ae55636
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · beab7950
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6740 | sunny | 2010-02-18 13:44:31 +0200 (Thu, 18 Feb 2010) | 6 lines
      branches/zip: Don't print the entire lock bit set if the block was not
      found in the buffer pool. Only print the bits that are set and that
      information is in the lock and not in the block.
      
      See rb://256 approved by Marko.
      beab7950
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 34a97abb
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6728 | marko | 2010-02-17 18:54:04 +0200 (Wed, 17 Feb 2010) | 3 lines
      branches/zip: Remove UNIV_BASIC_LOG_DEBUG.
      This fixes the FILE_FLUSH_LSN printouts mentioned in Issue #341.
      Suggested by Heikki.
      34a97abb
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 222717d5
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6727 | marko | 2010-02-17 18:50:20 +0200 (Wed, 17 Feb 2010) | 2 lines
      branches/zip: fsp_init_file_page_low(): Declare the page uninitialized
      for Valgrind.
      222717d5
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 945f492a
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6726 | marko | 2010-02-17 18:49:21 +0200 (Wed, 17 Feb 2010) | 3 lines
      branches/zip: FIL_PAGE_FILE_FLUSH_LSN: Note that the field is only valid
      for the first page of each ibdata* file, not *.ibd files.
      Suggested by Heikki, in connection with the LSN warning noted in Issue #341.
      945f492a
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot, fixes BUG#50691. · 6280fc8c
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6724 | marko | 2010-02-17 15:52:05 +0200 (Wed, 17 Feb 2010) | 11 lines
      branches/zip: Merge revisions 6613:6669 from branches/5.1:
        ------------------------------------------------------------------------
        r6669 | jyang | 2010-02-11 12:24:19 +0200 (Thu, 11 Feb 2010) | 7 lines
      
        branches/5.1: Fix bug #50691, AIX implementation of readdir_r
        causes InnoDB errors. readdir_r() returns an non-NULL value
        in the case of reaching the end of a directory. It should
        not be treated as an error return.
      
        rb://238 approved by Marko
        ------------------------------------------------------------------------
      6280fc8c
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 0d31a057
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6723 | marko | 2010-02-17 11:48:34 +0200 (Wed, 17 Feb 2010) | 3 lines
      branches/zip: lock_table_other_has_incompatible():
      Return an incompatible lock or NULL instead of TRUE or FALSE.
      Approved by Sunny over IM.
      0d31a057
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 53bf4715
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6718 | marko | 2010-02-16 15:06:16 +0200 (Tue, 16 Feb 2010) | 1 line
      branches/zip: Fix a comment.
      53bf4715
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 857a5521
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6717 | marko | 2010-02-16 14:53:20 +0200 (Tue, 16 Feb 2010) | 2 lines
      branches/zip: log_reserve_and_write_fast(): Correct a race condition
      in UNIV_LOG_LSN_DEBUG.  This could have caused Issue #440.
      857a5521
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 0899d6a1
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6715 | sunny | 2010-02-16 10:14:21 +0200 (Tue, 16 Feb 2010) | 1 line
      branches/zip: Fix comment. Non functional change.
      0899d6a1
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 105e8c54
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6714 | sunny | 2010-02-16 10:12:25 +0200 (Tue, 16 Feb 2010) | 2 lines
      branches/zip: Update the comments and fix the whitespace issues.
      See rb://255 Approved by: Marko
      105e8c54
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 751bdc94
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6713 | sunny | 2010-02-16 10:12:17 +0200 (Tue, 16 Feb 2010) | 7 lines
      branches/zip: Change the bit fields back to ulint. Bit fields were causing
      problems with concurrency on SMP systems because of word packing issues.
      The number of trx_t's in a system is not sufficient enough to require that
      we try and save a few bytes in the data structure.
      
      See rb://255 for details.
      751bdc94
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 422166f0
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6712 | marko | 2010-02-16 10:05:36 +0200 (Tue, 16 Feb 2010) | 2 lines
      branches/zip: trx_lists_init_at_db_start(): Assert that the kernel_mutex
      is held by the caller.
      422166f0
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 2e28ac5e
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6707 | inaam | 2010-02-12 19:22:35 +0200 (Fri, 12 Feb 2010) | 4 lines
      branches/zip
      
      ChangeLog entry for r6674.
      2e28ac5e
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 76f648bf
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6675 | marko | 2010-02-11 22:41:11 +0200 (Thu, 11 Feb 2010) | 1 line
      branches/zip: Remove bogus debug assertions introduced in r6660.
      76f648bf
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot, fixes BUG#49535. · 02a6d859
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6674 | inaam | 2010-02-11 17:54:44 +0200 (Thu, 11 Feb 2010) | 16 lines
      branches/zip bug# 49535
      
      This is a backport of r4924.
      mem_heap_get_size() scans all allocated blocks to calculate the total
      size of the heap. This patch introduces a new, total_size, field in
      mem_block_info_struct. This field is valid only for base block 
      (i.e.: the first block allocated for the heap) and is set to
      ULINT_UNDEFINED in other blocks.
      This considerably improves the performance of redo scan during recovery.
      
      rb://108 issue#216
      
      Approved by: Heikki
      02a6d859
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 16bc5784
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6673 | marko | 2010-02-11 13:09:48 +0200 (Thu, 11 Feb 2010) | 9 lines
      branches/zip: Relax a debug assertion about a missing BLOB. (Issue #452)
      When rolling back an incomplete transaction in purge, tolerate missing
      BLOBs also in update undo, when undoing an INSERT by updating a delete-marked
      record, and the delete-marked record is no longer needed.
      Previously, we only tolerated missing BLOBs in insert undo.
      This merely fixes a debug assertion; the code performed correctly
      without UNIV_DEBUG.
      
      rb://249 approved by Sunny Bains.
      16bc5784
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · e87d0afd
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6672 | marko | 2010-02-11 13:01:18 +0200 (Thu, 11 Feb 2010) | 1 line
      branches/zip: Introduce thr_is_recv().
      e87d0afd
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 0d9c53d3
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6660 | marko | 2010-02-11 11:21:11 +0200 (Thu, 11 Feb 2010) | 7 lines
      branches/zip: Clarify the rollback of INSERT by UPDATE of delete-marked rec.
      
      row_undo_mod_remove_clust_low(): Augment the function comment.
      
      row_undo_mod_remove_clust_low(), row_undo_mod_del_mark_or_remove_sec_low(),
      row_undo_mod_del_mark_or_remove_sec(), row_undo_mod_upd_del_sec():
      Add ut_ad(node->rec_type == TRX_UNDO_UPD_DEL_REC);
      0d9c53d3
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 5374af4d
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6639 | marko | 2010-02-10 13:11:04 +0200 (Wed, 10 Feb 2010) | 1 line
      branches/zip: trx_rseg_create(): Unused function, remove.
      5374af4d
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 739a68df
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6635 | marko | 2010-02-10 11:07:05 +0200 (Wed, 10 Feb 2010) | 4 lines
      branches/zip: Clean up after r6559.  Now that
      btr_pcur_open_with_no_init() is a macro, do not mix preprocessor
      directives in the macro invocation, because it is implementation-defined
      whether that is going to work.
      739a68df
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 88a978a8
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6633 | marko | 2010-02-10 10:40:55 +0200 (Wed, 10 Feb 2010) | 31 lines
      branches/zip: Merge revisions 6538:6613 from branches/5.1:
      
        ------------------------------------------------------------------------
        r6545 | jyang | 2010-02-03 03:57:32 +0200 (Wed, 03 Feb 2010) | 8 lines
        Changed paths:
           M /branches/5.1/lock/lock0lock.c
      
        branches/5.1: Fix bug #49001, "SHOW INNODB STATUS deadlock info
        incorrect when deadlock detection aborts". Print the correct
        lock owner when recursive function lock_deadlock_recursive()
        exceeds its maximum depth LOCK_MAX_DEPTH_IN_DEADLOCK_CHECK.
      
        rb://217, approved by Marko.
        ------------------------------------------------------------------------
        r6613 | inaam | 2010-02-09 20:23:09 +0200 (Tue, 09 Feb 2010) | 11 lines
        Changed paths:
           M /branches/5.1/buf/buf0buf.c
           M /branches/5.1/buf/buf0rea.c
           M /branches/5.1/include/buf0rea.h
      
        branches/5.1: Fix Bug #38901
        InnoDB logs error repeatedly when trying to load page into buffer pool
      
        In buf_page_get_gen() if we are unable to read a page (because of
        corruption or some other reason) we keep on retrying. This fills up
        error log with millions of entries in no time and we'd eventually run
        out of disk space. This patch limits the number of attempts that we
        make (currently set to 100) and after that we abort with a message.
      
        rb://241 Approved by: Heikki
        ------------------------------------------------------------------------
      88a978a8
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · b7072f1f
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6631 | marko | 2010-02-10 09:19:52 +0200 (Wed, 10 Feb 2010) | 1 line
      branches/zip: Document r6614 in ChangeLog.
      b7072f1f
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · bed55357
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6614 | inaam | 2010-02-09 20:26:23 +0200 (Tue, 09 Feb 2010) | 7 lines
      branches/plugin rb://242
      
      Let the master thread sleep if the amount of work to be done is
      calibrated as taking less than a second.
      
      Approved by: Heikki
      bed55357
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · de56eaa5
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6612 | marko | 2010-02-09 14:32:39 +0200 (Tue, 09 Feb 2010) | 3 lines
      branches/zip: recv_recovery_rollback_active():
      Drop the temporary tables and indexes after enabling sync order checks.
      This should not make any difference. This could have been done in r6611.
      de56eaa5
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · c885fa9a
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6611 | marko | 2010-02-09 14:28:25 +0200 (Tue, 09 Feb 2010) | 11 lines
      branches/zip: Roll back dictionary transaction(s) before scanning *.ibd files
      
      innobase_start_or_create_for_mysql(): Roll back data dictionary
      transactions before scanning the *.ibd files. Then, data dictionary
      records can be loaded to the cache before opening the *.ibd files.
      
      recv_recovery_rollback_active(): Refactored from
      recv_recovery_from_checkpoint_finish().
      
      rb://235, committing without review, because this is needed for
      TablespaceDictionary.
      c885fa9a
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 9823b54c
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6610 | marko | 2010-02-09 13:53:59 +0200 (Tue, 09 Feb 2010) | 17 lines
      branches/zip: When dropping temporary indexes and tables at startup,
      first load them to the data dictionary cache and use the normal
      routines for dropping tables or indexes.  This should reduce the
      risk of bugs and also make the code compatible with the upcoming
      TablespaceDictionary implementation.
      
      DICT_SYS_INDEXES_NAME_FIELD: The clustered index position of SYS_INDEXES.NAME.
      
      row_merge_drop_temp_indexes(): Scan SYS_INDEXES for tables containing
      temporary indexes, and load the tables as needed. Invoke
      row_merge_drop_index() to drop the indexes.
      
      row_mysql_drop_temp_tables(): Scan SYS_TABLES for temporary tables,
      load them with dict_load_table() and drop them with
      row_drop_table_for_mysql().
      
      rb://251, not yet reviewed
      9823b54c
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 56ea20d0
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6609 | marko | 2010-02-09 13:45:40 +0200 (Tue, 09 Feb 2010) | 1 line
      branches/zip: dict_field_print_low(): Add const qualifier.
      56ea20d0
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · e8731f1f
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6608 | marko | 2010-02-09 11:02:37 +0200 (Tue, 09 Feb 2010) | 1 line
      branches/zip: ha_innobase::add_index(): Check for !innodb_table.
      e8731f1f
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 7fbc7d4f
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6595 | marko | 2010-02-08 13:53:02 +0200 (Mon, 08 Feb 2010) | 1 line
      branches/zip: btr_pcur_commit(): Unused function, remove.
      7fbc7d4f
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · ea5b9e6a
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6594 | marko | 2010-02-08 12:55:04 +0200 (Mon, 08 Feb 2010) | 2 lines
      branches/zip: rec_get_nth_field_offs_old():
      Replace if (!cond) ut_error; tests with ut_a(cond).
      ea5b9e6a
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · f236d4b4
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6591 | marko | 2010-02-08 10:06:39 +0200 (Mon, 08 Feb 2010) | 3 lines
      branches/zip: row_merge_drop_index(): Remove redundant condition
      on SYS_INDEXES.TABLE_ID.  INDEX_ID must be instance-widely unique,
      because SYS_FIELDS is not indexed by TABLE_ID.
      f236d4b4
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · db04df3e
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6560 | sunny | 2010-02-04 16:11:23 +0200 (Thu, 04 Feb 2010) | 7 lines
      branches/zip: Remove the additional check introduced in r6534 which tries
      to check if the joining transaction has any other transactions waiting on
      its locks. This optimization results in excessive deadlocks when running
      Sysbench with a large number of threads. The function seems to return
      FALSE positives.
      
      rb://250
      db04df3e
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · da9a0a3e
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6559 | marko | 2010-02-04 13:21:18 +0200 (Thu, 04 Feb 2010) | 14 lines
      branches/zip: Pass the file name and line number of the caller of the
      b-tree cursor functions to the buffer pool requests, in order to make
      the latch diagnostics more accurate.
      
      buf_page_optimistic_get_func(): Renamed to buf_page_optimistic_get().
      
      btr_page_get_father_node_ptr(), btr_insert_on_non_leaf_level(),
      btr_pcur_open(), btr_pcur_open_with_no_init(), btr_pcur_open_on_user_rec(),
      btr_pcur_open_at_rnd_pos(), btr_pcur_restore_position(),
      btr_cur_open_at_index_side(), btr_cur_open_at_rnd_pos():
      Rename the function to _func and add the parameters file, line.
      Define wrapper macros with __FILE__, __LINE__.
      
      btr_cur_search_to_nth_level(): Add the parameters file, line.
      da9a0a3e
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot, fixes BUG#35077. · 76a2e5a5
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6548 | marko | 2010-02-03 15:01:39 +0200 (Wed, 03 Feb 2010) | 11 lines
      branches/zip: buf_LRU_invalidate_tablespace(): Ensure that prev_bpage
      is not relocated when freeing a compressed block.  This avoids the
      costly rescan of the LRU list.  (Bug #35077, Issue #449)
      
      At most one buffer-fix will be active at a time, affecting two blocks:
      the buf_page_t and the compressed page frame. This should not block
      the memory defragmentation in buf0buddy.c too much.  In fact, it may
      avoid unnecessary copying if also prev_bpage belongs to the tablespace
      that is being invalidated.
      
      rb://240
      76a2e5a5
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 4c43e9da
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6547 | marko | 2010-02-03 14:43:38 +0200 (Wed, 03 Feb 2010) | 14 lines
      branches/zip: Clean up CHECK TABLE error handling. (Issue #220)
      
      ha_innobase::change_active_index(): Clean up code formatting.
      
      ha_innobase::check(): Incorporate the code from
      row_check_table_for_mysql().  Report errors to the client connection
      instead of writing them to the error log.
      
      row_check_table_for_mysql(): Remove.
      
      row_check_index_for_mysql(): Renamed from row_scan_and_check_index().
      Let the caller initialize prebuilt, and assume that the index is usable.
      
      rb://178 approved by Sunny Bains
      4c43e9da
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 4c62306b
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6546 | jyang | 2010-02-03 11:05:24 +0200 (Wed, 03 Feb 2010) | 9 lines
      branches/zip: Relax assertion on the number of index defined
      in InnoDB must be comparable with that of MySQL to tolerate
      possible dictionary inconsistency. Fix Mantis issue #455,
      "UNIV_DEBUG+ assert ha_innodb.cc:3152 ib_num_index >= 
      mysql_num_index".
      
      rb://248 Approved by Marko.
      4c62306b