1. 01 Apr, 2010 40 commits
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 41c82f88
      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.
      41c82f88
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 752aaebe
      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.
      752aaebe
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · cb10d756
      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
      cb10d756
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · a9b1a67b
      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.
      a9b1a67b
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 41bd9dfe
      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.
      41bd9dfe
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · def53688
      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.
      def53688
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 41531fc8
      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).
      41531fc8
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 7f1dd013
      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.
      7f1dd013
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 662a8f4a
      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
      662a8f4a
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · c3a7bf0d
      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.
      c3a7bf0d
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot, fixes BUG#35077. · 409e8843
      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
      409e8843
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 101d6a09
      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
      101d6a09
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · bce33719
      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.
      bce33719
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 4f02b2b5
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6540 | marko | 2010-02-01 11:35:13 +0200 (Mon, 01 Feb 2010) | 1 line
      branches/zip: ChangeLog: Document the merge of 6471:6538 from branches/5.1.
      4f02b2b5
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 22864b86
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6539 | marko | 2010-02-01 11:31:12 +0200 (Mon, 01 Feb 2010) | 75 lines
      branches/zip: Merge revisions 6471:6538 from branches/5.1:
      
        ------------------------------------------------------------------------
        r6488 | sunny | 2010-01-21 02:55:08 +0200 (Thu, 21 Jan 2010) | 2 lines
        Changed paths:
           M /branches/5.1/mysql-test/innodb-autoinc.result
           M /branches/5.1/mysql-test/innodb-autoinc.test
      
        branches/5.1: Factor out test for bug#44030 from innodb-autoinc.test
        into a separate test/result files.
        ------------------------------------------------------------------------
        r6489 | sunny | 2010-01-21 02:57:50 +0200 (Thu, 21 Jan 2010) | 2 lines
        Changed paths:
           A /branches/5.1/mysql-test/innodb-autoinc-44030.result
           A /branches/5.1/mysql-test/innodb-autoinc-44030.test
      
        branches/5.1: Factor out test for bug#44030 from innodb-autoinc.test
        into a separate test/result files.
        ------------------------------------------------------------------------
        r6492 | sunny | 2010-01-21 09:38:35 +0200 (Thu, 21 Jan 2010) | 1 line
        Changed paths:
           M /branches/5.1/mysql-test/innodb-autoinc-44030.test
      
        branches/5.1: Add reference to bug#47621 in the comment.
        ------------------------------------------------------------------------
        r6535 | sunny | 2010-01-30 00:08:40 +0200 (Sat, 30 Jan 2010) | 11 lines
        Changed paths:
           M /branches/5.1/handler/ha_innodb.cc
      
        branches/5.1: Undo the change from r6424. We need to return DB_SUCCESS even
        if we were unable to initialize the tabe autoinc value. This is required for
        the open to succeed. The only condition we currently treat as a hard error
        is if the autoinc field instance passed in by MySQL is NULL.
      
        Previously if the table autoinc value was 0 and the next value was requested
        we had an assertion that would fail. Change that assertion and treat a value
        of 0 to mean that the autoinc system is unavailable. Generation of next
        value will now return failure.
      
        rb://237
        ------------------------------------------------------------------------
        r6536 | sunny | 2010-01-30 00:13:42 +0200 (Sat, 30 Jan 2010) | 6 lines
        Changed paths:
           M /branches/5.1/handler/ha_innodb.cc
           M /branches/5.1/mysql-test/innodb-autoinc.result
           M /branches/5.1/mysql-test/innodb-autoinc.test
      
        branches/5.1: Check *first_value everytime against the column max
        value and  set *first_value to next autoinc if it's > col max value.
        ie.  not rely on what is passed in from MySQL.
      
        [49497] Error 1467 (ER_AUTOINC_READ_FAILED) on inserting a negative value
        rb://236
        ------------------------------------------------------------------------
        r6537 | sunny | 2010-01-30 00:35:00 +0200 (Sat, 30 Jan 2010) | 2 lines
        Changed paths:
           M /branches/5.1/handler/ha_innodb.cc
           M /branches/5.1/mysql-test/innodb-autoinc.result
           M /branches/5.1/mysql-test/innodb-autoinc.test
      
        branches/5.1: Undo r6536.
        ------------------------------------------------------------------------
        r6538 | sunny | 2010-01-30 00:43:06 +0200 (Sat, 30 Jan 2010) | 6 lines
        Changed paths:
           M /branches/5.1/handler/ha_innodb.cc
           M /branches/5.1/mysql-test/innodb-autoinc.result
           M /branches/5.1/mysql-test/innodb-autoinc.test
      
        branches/5.1: Check *first_value every time against the column max
        value and  set *first_value to next autoinc if it's > col max value.
        ie.  not rely on what is passed in from MySQL.
      
        [49497] Error 1467 (ER_AUTOINC_READ_FAILED) on inserting a negative value
        rb://236
        ------------------------------------------------------------------------
      22864b86
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot, fixes BUG#49047. · b419c752
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6534 | sunny | 2010-01-29 23:42:49 +0200 (Fri, 29 Jan 2010) | 15 lines
      branches/zip: Two changes to fix the problem:
      
      1. First scan the joining transaction's locks and check if no other
      transaction is waiting for a lock held by the joining transaction.
      If no other transaction is waiting then  no deadlock an occur and
      we avoid doing an exhaustive search.
      
      2. Change the direction of the lock traversal from backward to forward.
      Previously we traversed backward from the lock that has to wait, the function
      to that fetched the previous node was very inefficient resulting in O(n^2)
      access to the rec lock list.
      
      Fix Bug #49047 InnoDB deadlock detection is CPU intensive with many locks on a single row.
      
      rb://218
      b419c752
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · ed2765d9
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6533 | calvin | 2010-01-29 23:31:59 +0200 (Fri, 29 Jan 2010) | 4 lines
      branches/zip: remove duplicated copyright and license info.
      ed2765d9
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · e4bae32d
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6527 | vasil | 2010-01-29 14:39:48 +0200 (Fri, 29 Jan 2010) | 6 lines
      branches/zip:
      
      Extend the comment about row_mysql_handle_errors().
      
      Suggested by:	Heikki
      e4bae32d
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot, fixes BUG#47622. · 09353b59
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6526 | jyang | 2010-01-28 18:12:40 +0200 (Thu, 28 Jan 2010) | 8 lines
      branches/zip: Add index translation table to map mysql index
      number to InnoDB index structure directly. Fix Bug #47622:
      "the new index is added before the existing ones in MySQL,
      but after one in SE".
      
      rb://215, approved by Marko
      09353b59
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot, fixes BUG#35077. · 43a62af1
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6525 | marko | 2010-01-28 16:23:15 +0200 (Thu, 28 Jan 2010) | 11 lines
      branches/zip: buf_LRU_invalidate_tablespace(): Do not unnecessarily
      acquire the block_mutex for every block in the LRU list. Only acquire
      it when holding buf_pool_mutex is not sufficient. This should speed up
      the function and considerably reduce traffic on the memory bus and
      caches.
      
      I noticed this deficiency when working on Issue #157.
      This deficiency popped up again in Issue #449 (Bug #35077),
      which this fix does not fully address.
      
      rb://78 revision 1 approved by Heikki Tuuri.
      43a62af1
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot, fixes BUG#41609. · 6a4c518f
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6521 | marko | 2010-01-27 10:49:01 +0200 (Wed, 27 Jan 2010) | 17 lines
      branches/zip: Drop temporary tables at startup.
      This addresses the third aspect of Bug #41609.
      
      row_mysql_drop_temp_tables(): New function, to drop all temporary
      tables. These can be distinguished by the least significant bit of
      MIX_LEN. However, we will skip ROW_FORMAT=REDUNDANT tables, because in
      the records for those tables, that bit may be garbage.
      
      recv_recovery_from_checkpoint_finish(): Invoke
      row_mysql_drop_temp_tables().  Normally, if the .frm files for the
      temporary tables exist at startup, MySQL will ask InnoDB to drop the
      temporary tables.  However, if the files are deleted, for instance, by
      the boot scripts of the operating system, the tables would remain in
      the InnoDB data dictionary unless someone digs them up by
      innodb_table_monitor and creates .frm files for dropping the tables.
      
      rb://221 approved by Sunny Bains.
      6a4c518f
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 2eeef6b0
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6498 | marko | 2010-01-21 11:22:52 +0200 (Thu, 21 Jan 2010) | 15 lines
      branches/zip: buf_page_get_gen(): Obey recv_no_ibuf_operations
      and do not call ibuf_merge_or_delete_for_page() in crash recovery,
      before the redo log has been applied.
      This could cure some hard-to-repeat, hard-to-explain bugs
      related to secondary indexes.
      
      A possible recipe to repeat the bug:
      
      1. update a secondary index leaf page on a compressed table
      2. evict the page from the buffer pool while it is still dirty
      3. ibuf_insert() something for the page
      4. crash
      5. crash recovery; ibuf merge would be done too early,
      before applying redo log to the sec index page or the ibuf pages
      2eeef6b0
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 33bac924
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6472 | calvin | 2010-01-16 01:53:47 +0200 (Sat, 16 Jan 2010) | 12 lines
      branches/zip: Merge revisions 6425:6471 from branches/5.1
      to pick up the first part fix of bug49396.
      
          ------------------------------------------------------------------------
          r6471 | calvin | 2010-01-15 17:43:27 -0600 (Fri, 15 Jan 2010) | 4 lines
      
          branches/5.1: fix bug#49396: main.innodb test fails in embedded mode
      
          Change replace_result by using $MYSQLD_DATADIR. Tested in both embedded
          mode and normal server mode.
          ------------------------------------------------------------------------
      
      r6473 | calvin | 2010-01-16 01:58:16 +0200 (Sat, 16 Jan 2010) | 6 lines
      branches/zip: fix bug#49396: innodb.innodb-index test fails in
      embedded mode
      
      This is 2nd part of the fix for bug#49396. The 1st part is
      innodb.test. Tested in both embedded mode and normal server mode.
      33bac924
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 5cd0fae4
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6467 | inaam | 2010-01-14 20:46:00 +0200 (Thu, 14 Jan 2010) | 10 lines
      branches/zip rb://226
      
      log_sys->written_to_all_lsn does not accurately represent the LSN
      upto which write and flush has taken place. Under a race condition
      it can fall behind log_sys->flushed_to_disk_lsn which is accurate.
      Besides written_to_all_lsn is redundant as currently InnoDB supports
      only one log group.
      
      Approved by: Heikki
      5cd0fae4
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 535b4ccb
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6463 | marko | 2010-01-14 15:43:37 +0200 (Thu, 14 Jan 2010) | 5 lines
      branches/zip: page_copy_rec_list_end(), page_copy_rec_list_start():
      Update PAGE_MAX_TRX_ID before attempting to compress the page.  This
      fixes Issue #382 (a debug assertion failure in page_zip_reorganize())
      and reduces the generated redo log.  There was no bug or crash in
      non-debug builds.
      535b4ccb
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 16925618
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6449 | marko | 2010-01-13 22:38:53 +0200 (Wed, 13 Jan 2010) | 18 lines
      branches/zip: lock_rec_validate_page(): Only validate the record
      queues when the thread is not holding a space->latch.
      
      When UNIV_DEBUG is defined while UNIV_SYNC_DEBUG is not,
      latching order violations will still occur and deadlocks will be possible.
      
      sync_thread_levels_nonempty_gen(): Renamed from
      sync_thread_levels_empty_gen().  Return the violating latch or NULL
      instead of FALSE or TRUE, except that there will be a ut_error before
      the non-NULL return.
      
      sync_thread_levels_empty_gen(): A macro that negates the return value of
      sync_thread_levels_nonempty_gen().
      
      sync_thread_levels_contains(): New function, based on
      sync_thread_levels_nonempty_gen().
      
      This should fix Issue #441.
      16925618
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 55cc8f1f
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6447 | marko | 2010-01-13 17:43:44 +0200 (Wed, 13 Jan 2010) | 5 lines
      branches/zip: row_sel_get_clust_rec_for_mysql(): On the READ UNCOMMITTED
      isolation level, do not attempt to access a clustered index record
      that has been marked for deletion.  This fixes Issue #433.
      
      Approved by Heikki over the IM.
      55cc8f1f
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 4888c5e0
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6446 | marko | 2010-01-13 17:20:10 +0200 (Wed, 13 Jan 2010) | 3 lines
      branches/zip: Treat mem_hash_mutex specially in mutex_free(),
      and explicitly free mem_hash_mutex in mem_close().
      This fixes the breakage of UNIV_MEM_DEBUG that was filed as Issue #434.
      4888c5e0
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 0d3662f5
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6445 | marko | 2010-01-13 17:15:29 +0200 (Wed, 13 Jan 2010) | 3 lines
      branches/zip: buf_pool_drop_hash_index(): Check block->page.state
      before checking block->is_hashed, because the latter may be uninitialized
      right after server startup.
      0d3662f5
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 2b39ae46
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6433 | marko | 2010-01-13 13:19:00 +0200 (Wed, 13 Jan 2010) | 2 lines
      branches/zip: dict_sys_tables_get_flags(), dict_create_sys_*_tuple():
      Add some const qualifiers and comments.
      2b39ae46
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · e64b2cdd
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6426 | marko | 2010-01-12 15:36:14 +0200 (Tue, 12 Jan 2010) | 2 lines
      branches/zip: row_sel_sec_rec_is_for_clust_rec(): Document the return value
      more accurately.
      e64b2cdd
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 68afad07
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6425 | marko | 2010-01-12 13:47:11 +0200 (Tue, 12 Jan 2010) | 45 lines
      branches/zip: Merge revisions 6350:6424 from branches/5.1:
      
        ------------------------------------------------------------------------
        r6421 | jyang | 2010-01-12 07:59:16 +0200 (Tue, 12 Jan 2010) | 8 lines
        Changed paths:
           M /branches/5.1/row/row0mysql.c
      
        branches/5.1: Fix bug #49238: Creating/Dropping a temporary table
        while at 1023 transactions will cause assert. Handle possible
        DB_TOO_MANY_CONCURRENT_TRXS when deleting metadata in
        row_drop_table_for_mysql().
      
        rb://220, approved by Marko
        ------------------------------------------------------------------------
        r6422 | marko | 2010-01-12 11:34:27 +0200 (Tue, 12 Jan 2010) | 3 lines
        Changed paths:
           M /branches/5.1/handler/ha_innodb.cc
           M /branches/5.1/handler/ha_innodb.h
      
        branches/5.1: Non-functional change:
        Make innobase_get_int_col_max_value() a static function.
        It does not access any fields of class ha_innobase.
        ------------------------------------------------------------------------
        r6424 | marko | 2010-01-12 12:22:19 +0200 (Tue, 12 Jan 2010) | 16 lines
        Changed paths:
           M /branches/5.1/handler/ha_innodb.cc
           M /branches/5.1/handler/ha_innodb.h
      
        branches/5.1: In innobase_initialize_autoinc(), do not attempt to read
        the maximum auto-increment value from the table if
        innodb_force_recovery is set to at least 4, so that writes are
        disabled. (Bug #46193)
      
        innobase_get_int_col_max_value(): Move the function definition before
        ha_innobase::innobase_initialize_autoinc(), because that function now
        calls this function.
      
        ha_innobase::innobase_initialize_autoinc(): Change the return type to
        void.  Do not attempt to read the maximum auto-increment value from
        the table if innodb_force_recovery is set to at least 4.  Issue
        ER_AUTOINC_READ_FAILED to the client when the auto-increment value
        cannot be read.
      
        rb://144 by Sunny, revised by Marko
        ------------------------------------------------------------------------
      68afad07
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · ba5d13fd
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6367 | marko | 2009-12-28 15:39:19 +0200 (Mon, 28 Dec 2009) | 2 lines
      branches/zip: dict_index_add_to_cache(): Always free the index object,
      also when returning DB_CORRUPTION.
      ba5d13fd
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · c58543b3
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6348 | marko | 2009-12-22 11:04:34 +0200 (Tue, 22 Dec 2009) | 37 lines
      branches/zip: Merge a change from MySQL:
      r6351 | marko | 2009-12-22 11:11:18 +0200 (Tue, 22 Dec 2009) | 1 line
      branches/zip: Remove an obsolete declaration of LOCK_thread_count.
      r6352 | marko | 2009-12-22 12:33:01 +0200 (Tue, 22 Dec 2009) | 104 lines
      branches/zip: Merge revisions 6206:6350 from branches/5.1,
      except r6347, r6349, r6350 which were committed separately
      to both branches, and r6310, which was backported from zip to 5.1.
      
        ------------------------------------------------------------------------
        r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 3 lines
        Changed paths:
           M /branches/5.1/handler/ha_innodb.cc
      
        branches/5.1: Non-functional change, fix formatting.
        ------------------------------------------------------------------------
        r6230 | sunny | 2009-11-24 23:52:43 +0200 (Tue, 24 Nov 2009) | 3 lines
        Changed paths:
           M /branches/5.1/mysql-test/innodb-autoinc.result
      
        branches/5.1: Fix autoinc failing test results.
        (this should be skipped when merging 5.1 into zip)
        ------------------------------------------------------------------------
        r6231 | sunny | 2009-11-25 10:26:27 +0200 (Wed, 25 Nov 2009) | 7 lines
        Changed paths:
           M /branches/5.1/mysql-test/innodb-autoinc.result
           M /branches/5.1/mysql-test/innodb-autoinc.test
           M /branches/5.1/row/row0sel.c
      
        branches/5.1: Fix BUG#49032 - auto_increment field does not initialize to last value in InnoDB Storage Engine.
      
        We use the appropriate function to read the column value for non-integer
        autoinc column types, namely float and double.
      
        rb://208. Approved by Marko.
        ------------------------------------------------------------------------
        r6232 | sunny | 2009-11-25 10:27:39 +0200 (Wed, 25 Nov 2009) | 2 lines
        Changed paths:
           M /branches/5.1/row/row0sel.c
      
        branches/5.1: This is an interim fix, fix white space errors.
        ------------------------------------------------------------------------
        r6233 | sunny | 2009-11-25 10:28:35 +0200 (Wed, 25 Nov 2009) | 2 lines
        Changed paths:
           M /branches/5.1/include/mach0data.h
           M /branches/5.1/include/mach0data.ic
           M /branches/5.1/mysql-test/innodb-autoinc.result
           M /branches/5.1/mysql-test/innodb-autoinc.test
           M /branches/5.1/row/row0sel.c
      
        branches/5.1: This is an interim fix, fix tests and make read float/double arg const.
        ------------------------------------------------------------------------
        r6234 | sunny | 2009-11-25 10:29:03 +0200 (Wed, 25 Nov 2009) | 2 lines
        Changed paths:
           M /branches/5.1/row/row0sel.c
      
        branches/5.1: This is an interim fix, fix whitepsace issues.
        ------------------------------------------------------------------------
        r6235 | sunny | 2009-11-26 01:14:42 +0200 (Thu, 26 Nov 2009) | 9 lines
        Changed paths:
           M /branches/5.1/handler/ha_innodb.cc
           M /branches/5.1/mysql-test/innodb-autoinc.result
           M /branches/5.1/mysql-test/innodb-autoinc.test
      
        branches/5.1: Fix Bug#47720 - REPLACE INTO Autoincrement column with negative values.
      
        This bug is similiar to the negative autoinc filter patch from earlier,
        with the additional handling of filtering out the negative column values
        set explicitly by the user.
      
        rb://184
        Approved by Heikki.
        ------------------------------------------------------------------------
        r6242 | vasil | 2009-11-27 22:07:12 +0200 (Fri, 27 Nov 2009) | 4 lines
        Changed paths:
           M /branches/5.1/export.sh
      
        branches/5.1:
      
        Minor changes to support plugin snapshots.
        ------------------------------------------------------------------------
        r6306 | calvin | 2009-12-14 15:12:46 +0200 (Mon, 14 Dec 2009) | 5 lines
        Changed paths:
           M /branches/5.1/mysql-test/innodb-autoinc.result
           M /branches/5.1/mysql-test/innodb-autoinc.test
      
        branches/5.1: fix bug#49267: innodb-autoinc.test fails on windows
        because of different case mode
      
        There is no change to the InnoDB code, only to fix test case by
        changing "T1" to "t1".
        ------------------------------------------------------------------------
        r6324 | jyang | 2009-12-17 06:54:24 +0200 (Thu, 17 Dec 2009) | 8 lines
        Changed paths:
           M /branches/5.1/handler/ha_innodb.cc
           M /branches/5.1/include/lock0lock.h
           M /branches/5.1/include/srv0srv.h
           M /branches/5.1/lock/lock0lock.c
           M /branches/5.1/log/log0log.c
           M /branches/5.1/srv/srv0srv.c
           M /branches/5.1/srv/srv0start.c
      
        branches/5.1: Fix bug #47814 - Diagnostics are frequently not
        printed after a long lock wait in InnoDB. Separate out the
        lock wait timeout check thread from monitor information
        printing thread.
      
        rb://200 Approved by Marko.
        ------------------------------------------------------------------------
      r6364 | marko | 2009-12-26 21:06:31 +0200 (Sat, 26 Dec 2009) | 4 lines
      branches/zip: ibuf_bitmap_get_map_page():
      Define a wrapper macro that passes __FILE__, __LINE__ of the caller
      to buf_page_get_gen().
      This will ease the diagnosis of the likes of Issue #135.
      c58543b3
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · acd6a81b
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6346 | marko | 2009-12-21 12:03:25 +0200 (Mon, 21 Dec 2009) | 2 lines
      branches/zip: recv_recovery_from_checkpoint_finish():
      Revert a change that was accidentally committed in r6345.
      acd6a81b
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 0b33b0c2
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6345 | marko | 2009-12-21 10:46:14 +0200 (Mon, 21 Dec 2009) | 7 lines
      branches/zip: recv_scan_log_recs(): Non-functional change: Replace a
      debug assertion ut_ad(len > 0) with ut_ad(len >= OS_FILE_LOG_BLOCK_SIZE).
      
      This change is only for readability, for Issue #428.  Another
      assertion on len being an integer multiple of OS_FILE_LOG_BLOCK_SIZE
      already ensured together with the old ut_ad(len > 0) that actually len
      must be at least OS_FILE_LOG_BLOCK_SIZE.
      0b33b0c2
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 357e5c0e
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6321 | marko | 2009-12-16 16:16:33 +0200 (Wed, 16 Dec 2009) | 4 lines
      branches/zip: row_merge_drop_temp_indexes(): Revert a hack to
      transaction isolation level that was made unnecessary by r5826 (Issue #337).
      When this function is called, any active data dictionary transaction
      should have been rolled back.
      357e5c0e
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 5065980e
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6312 | marko | 2009-12-16 10:10:36 +0200 (Wed, 16 Dec 2009) | 6 lines
      branches/zip: fil_close(): Add #ifndef UNIV_HOTBACKUP around a debug
      assertion on mutex.magic_n.  InnoDB Hot Backup is a single-threaded
      program and does not contain mutexes.  This change allows InnoDB Hot
      Backup to be compiled with UNIV_DEBUG.
      
      Suggested by Michael Izioumtchenko.
      5065980e
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · bf7191c1
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6309 | marko | 2009-12-15 14:05:50 +0200 (Tue, 15 Dec 2009) | 3 lines
      branches/zip: lock_rec_insert_check_and_lock(): Avoid casting away constness.
      Use page_rec_get_next_const() instead. This silences a gcc 4.2.4 warning.
      Reported by Sunny Bains.
      bf7191c1
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · f3ca08d2
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6305 | marko | 2009-12-14 13:03:57 +0200 (Mon, 14 Dec 2009) | 2 lines
      branches/zip: row_undo_mod_del_unmark_sec_and_undo_update(): Add a missing
      const qualifier.
      f3ca08d2