• unknown's avatar
    NULL MERGE UP to 5.1. · 9016198a
    unknown authored
    Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
    
    Fixes:
    Bug#9709:  InnoDB inconsistensy causes "Operating System Error 32/33"
    Bug#22819: SHOW INNODB STATUS crashes the server with an assertion failure under high load
    Bug#25645: Assertion failure in file srv0srv.c
    Bug#27294: insert into ... select ... causes crash with innodb_locks_unsafe_for_binlog=1
    Bug#28138: indexing column prefixes produces corruption in InnoDB
    
    
    innobase/btr/btr0btr.c:
      Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
      
      Revision r1547:
      branches/5.0: Merge r1546 from trunk:
      
      When buffering an insert to a prefix index of a variable-length column,
      do not incorrectly mark the column as fixed-length.  (Bug #28138)
      
      ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
      dtype_new_store_for_order_and_null_size().  Add debug assertions.
      
      btr_index_rec_validate(): Correct a comment about prefix indexes.
      
      rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
      debug assertions and comments.
      
      dict_col_type_assert_equal(): New debug function.
    innobase/buf/buf0buf.c:
      Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
      
      Revision r1502:
      branches/5.0: Add debug code for Bug 26081. This change has some debug
      assertions that have been promoted to normal assertions. These will need
      to be undone once we've nailed this bug.
    innobase/buf/buf0lru.c:
      Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
      
      Revision r1502:
      branches/5.0: Add debug code for Bug 26081. This change has some debug
      assertions that have been promoted to normal assertions. These will need
      to be undone once we've nailed this bug.
    innobase/ibuf/ibuf0ibuf.c:
      Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
      
      Revision r1547:
      branches/5.0: Merge r1546 from trunk:
      
      When buffering an insert to a prefix index of a variable-length column,
      do not incorrectly mark the column as fixed-length.  (Bug #28138)
      
      ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
      dtype_new_store_for_order_and_null_size().  Add debug assertions.
      
      btr_index_rec_validate(): Correct a comment about prefix indexes.
      
      rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
      debug assertions and comments.
      
      dict_col_type_assert_equal(): New debug function.
    innobase/include/buf0buf.ic:
      Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
      
      Revision r1502:
      branches/5.0: Add debug code for Bug 26081. This change has some debug
      assertions that have been promoted to normal assertions. These will need
      to be undone once we've nailed this bug.
    innobase/include/buf0lru.h:
      Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
      
      Revision r1502:
      branches/5.0: Add debug code for Bug 26081. This change has some debug
      assertions that have been promoted to normal assertions. These will need
      to be undone once we've nailed this bug.
    innobase/include/dict0dict.h:
      Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
      
      Revision r1547:
      branches/5.0: Merge r1546 from trunk:
      
      When buffering an insert to a prefix index of a variable-length column,
      do not incorrectly mark the column as fixed-length.  (Bug #28138)
      
      ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
      dtype_new_store_for_order_and_null_size().  Add debug assertions.
      
      btr_index_rec_validate(): Correct a comment about prefix indexes.
      
      rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
      debug assertions and comments.
      
      dict_col_type_assert_equal(): New debug function.
    innobase/include/dict0dict.ic:
      Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
      
      Revision r1547:
      branches/5.0: Merge r1546 from trunk:
      
      When buffering an insert to a prefix index of a variable-length column,
      do not incorrectly mark the column as fixed-length.  (Bug #28138)
      
      ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
      dtype_new_store_for_order_and_null_size().  Add debug assertions.
      
      btr_index_rec_validate(): Correct a comment about prefix indexes.
      
      rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
      debug assertions and comments.
      
      dict_col_type_assert_equal(): New debug function.
    innobase/include/dict0mem.h:
      Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
      
      Revision r1537:
      branches/5.0: merge r1536 and partially r1535
      
      Change the comment to a more appropriate one. Discussed with Heikki on IM.
      
      Document that DICT_MAX_INDEX_COL_LEN should not be changed.
    innobase/include/os0file.h:
      Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
      
      Revision r1417:
      branches/5.0: Fix Bug#9709 by retrying (forever) if ERROR_SHARING_VIOLATION or
      ERROR_LOCK_VIOLATION is encountered during file operation.
      This is caused by backup software, so InnoDB should retry while the backup
      software is done with the file.
      
      Approved by:	Heikki
    innobase/include/trx0trx.h:
      Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
      
      Revision r1463:
      branches/5.0: merge r1462 from trunk:
      
      Fix typo in comment.
    innobase/lock/lock0lock.c:
      Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
      
      Revision r1458:
      branches/5.0: Fix Bug#22819, remove assertion.  (http://bugs.mysql.com/bug.php?id=22819)
    innobase/log/log0log.c:
      Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
      
      Revision r1520:
      Patch to allow monitor threads to stop before proceeding with normal shutdown. 
      Also have a separate time counter for tablespace monitor.
      
      reviewed by: Heikki
      
      
      Revision r1525:
      backport of r1524
      
      Log:
      Undo bad space formatting introduced in earlier commit r1521
      
      spotted by: Marko
    innobase/mtr/mtr0mtr.c:
      Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
      
      Revision r1502:
      branches/5.0: Add debug code for Bug 26081. This change has some debug
      assertions that have been promoted to normal assertions. These will need
      to be undone once we've nailed this bug.
    innobase/os/os0file.c:
      Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
      
      Revision r1417:
      branches/5.0: Fix Bug#9709 by retrying (forever) if ERROR_SHARING_VIOLATION or
      ERROR_LOCK_VIOLATION is encountered during file operation.
      This is caused by backup software, so InnoDB should retry while the backup
      software is done with the file.
      
      Approved by:	Heikki
    innobase/rem/rem0rec.c:
      Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
      
      Revision r1547:
      branches/5.0: Merge r1546 from trunk:
      
      When buffering an insert to a prefix index of a variable-length column,
      do not incorrectly mark the column as fixed-length.  (Bug #28138)
      
      ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
      dtype_new_store_for_order_and_null_size().  Add debug assertions.
      
      btr_index_rec_validate(): Correct a comment about prefix indexes.
      
      rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
      debug assertions and comments.
      
      dict_col_type_assert_equal(): New debug function.
    innobase/row/row0sel.c:
      Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
      
      Revision r1456:
      branches/5.0: merge r1452 from trunk:
      
      Fix phantom reads (http://bugs.mysql.com/27197) following Heikki's
      patch in the bug followup.
    innobase/srv/srv0srv.c:
      Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
      
      Revision r1460:
      branches/5.0: Merge r1459 from trunk:
      
      Fix typo in the comment.
      
      
      Revision r1520:
      Patch to allow monitor threads to stop before proceeding with normal shutdown. 
      Also have a separate time counter for tablespace monitor.
      
      reviewed by: Heikki
    sql/ha_innodb.cc:
      Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
      
      Revision r1436:
      branches/5.0: Fix Bug#27294 by using trx returned by check_trx_exists()
      instead of prebuilt->trx. This has been fixed in 5.1 in r782.
      
      Approved by:	Heikki
      
      
      Revision r1443:
      branches/5.0: merge r1442 from trunk:
      
      Potential fix for Bug#25645:
      
      "Move innobase_release_stat_resources(trx) outside the 'if' in
      ha_innobase::external_lock(). That would add more safety that whatever
      MySQL does at a query end, there would be no risk of a hang on the btr
      search latch."
      
      Also call innobase_release_temporary_latches() in the beginning of
      ha_innobase::close().
      
      Approved by:	Heikki
      
      
      Revision r1454:
      branches/5.0: merge r1453 from trunk:
      
      Bugfix: only call innobase_release_temporary_latches() in case of current_thd
      is not NULL, otherwise we get NULL pointer dereferencing.
      
      
      
      Revision r1504:
      branches/5.0: Apply patch for Bug 27650 from MySQL.
      
      
      Revision r1539:
      Backport of r1538 from 5.1
      Do not return error in ha_innobase::info if srv_force_recovery >= 4. This is to allow for
      normal processing of the query by MySQL instead of generating an error.
      
      Reviewed by: Heikki
    9016198a
srv0srv.c 74.6 KB