Commit 050f14ac authored by unknown's avatar unknown
Browse files

Applied innodb-5.1-ss269 snapshot. 

  Fixed BUGS:
  #3300: "UPDATE statement with no index column in where condition locks
    all rows"
    Implement semi-consistent read to reduce lock conflicts at the cost
    of breaking serializability.
    ha_innobase::unlock_row(): reset the "did semi consistent read" flag
    ha_innobase::was_semi_consistent_read(),
    ha_innobase::try_semi_consistent_read(): new methods
    row_prebuilt_t, row_create_prebuilt(): add field row_read_type for
    keeping track of semi-consistent reads
    row_vers_build_for_semi_consistent_read(),
    row_sel_build_committed_vers_for_mysql(): new functions
    row_search_for_mysql(): implement semi-consistent reads

  #9802: "Foreign key checks disallow alter table".
    Added test cases.

  #12456: "Cursor shows incorrect data - DML does not affect,
    probably caching"
    This patch implements a high-granularity read view to be used with
    cursors. In this high-granularity consistent read view modifications 
    done by the creating transaction after the cursor is created or 
   future transactions are not visible. But those modifications that 
   transaction did before the cursor was created are visible.

  #12701: "Support >4GB buffer pool and log files on 64-bit Windows"
    Do not call os_file_create_tmpfile() at runtime. Instead, create all
    tempfiles at startup and guard access to them with mutexes.

  #13778: "If FOREIGN_KEY_CHECKS=0, one can create inconsistent FOREIGN KEYs".
    When FOREIGN_KEY_CHECKS=0 we still need to check that datatypes between
    foreign key references are compatible.

  #14189: "VARBINARY and BINARY variables: trailing space ignored with InnoDB"
    innobase_init(): Assert that
    DATA_MYSQL_BINARY_CHARSET_COLL == my_charset_bin.number.
    dtype_get_pad_char(): Do not pad VARBINARY or BINARY columns.
    row_ins_cascade_calc_update_vec(): Refuse ON UPDATE CASCADE when trying
    to change the length of a VARBINARY column that refers to or is referenced
    by a BINARY column. BINARY columns are no longer padded on comparison,
    and thus they cannot be padded on storage either.

  #14747: "Race condition can cause btr_search_drop_page_hash_index() to crash"
    Note that buf_block_t::index should be protected by btr_search_latch
    or an s-latch or x-latch on the index page.
    btr_search_drop_page_hash_index(): Read block->index while holding
    btr_search_latch and use the cached value in the loop.  Remove some
    redundant assertions.

  #15108: "mysqld crashes when innodb_log_file_size is set > 4G"

  #15308: "Problem of Order with Enum Column in Primary Key"

  #15550: "mysqld crashes in printing a FOREIGN KEY error in InnoDB"
    row_ins_foreign_report_add_err(): When printing the parent record,
    use the index in the parent table rather than the index in the child table.

  #15653: "Slow inserts to InnoDB if many thousands of .ibd files"
    Keep track on unflushed modifications to file spaces.  When there are tens
    of thousands of file spaces, flushing all files in fil_flush_file_spaces()
    would be very slow.
    fil_flush_file_spaces(): Only flush unflushed file spaces.
    fil_space_t, fil_system_t: Add a list of unflushed spaces.

  #15991: "innodb-file-per-table + symlink database + rename = cr"
   os_file_handle_error(): Map the error codes EXDEV, ENOTDIR, and EISDIR
   to the new code OS_FILE_PATH_ERROR. Treat this code as OS_FILE_PATH_ERROR.
   This fixes the crash on RENAME TABLE when the .ibd file is a symbolic link
   to a different file system.

  #16157: "InnoDB crashes when main location settings are empty"
    This patch is from Heikki.

  #16298: "InnoDB segfaults in INSERTs in upgrade of 4.0 -> 5.0 tables
    with VARCHAR BINARY"
    dict_load_columns(): Set the charset-collation code
    DATA_MYSQL_BINARY_CHARSET_COLL for those binary string columns
    that lack a charset-collation code, i.e., the tables were created
    with an older version of MySQL/InnoDB than 4.1.2.

  #16229: "MySQL/InnoDB uses full explicit table locks in trigger processing"
    Take a InnoDB table lock only if user has explicitly requested a table
    lock. Added some additional comments to store_lock() and external_lock().

  #16387: "InnoDB crash when dropping a foreign key <table>_ibfk_0"
    Do not mistake TABLENAME_ibfk_0 for auto-generated id.
    dict_table_get_highest_foreign_id(): Ignore foreign constraint
    identifiers starting with the pattern TABLENAME_ibfk_0.

  #16582: "InnoDB: Error in an adaptive hash index pointer to page"
    Account for a race condition when dropping the adaptive hash index
    for a B-tree page.
    btr_search_drop_page_hash_index(): Retry the operation if a hash index
    with different parameters was built meanwhile.  Add diagnostics for the
    case that hash node pointers to the page remain.
    btr_search_info_update_hash(), btr_search_info_update_slow():
    Document the parameter "info" as in/out.

  #16814: "SHOW INNODB STATUS format error in LATEST FOREIGN KEY ERROR
    section"
    Add a missing newline to the LAST FOREIGN KEY ERROR section in SHOW
    INNODB STATUS output.
    dict_foreign_error_report(): Always print a newline after invoking
    dict_print_info_on_foreign_key_in_create_format().

  #16827: "Better InnoDB error message if ibdata files omitted from my.cnf"

  #17126: "CHECK TABLE on InnoDB causes a short hang during check of adaptive
    hash"
    CHECK TABLE blocking other queries, by releasing the btr_search_latch
    periodically during the adaptive hash table validation.

  #17405: "Valgrind: conditional jump or move depends on unititialised values"
    buf_block_init(): Reset magic_n, buf_fix_count and io_fix to avoid
    testing uninitialized variables.



mysql-test/r/innodb.result:
  Applied innodb-5.1-ss269 snapshot.
mysql-test/t/innodb.test:
  Applied innodb-5.1-ss269 snapshot.
sql/ha_innodb.cc:
  Applied innodb-5.1-ss269 snapshot.
sql/ha_innodb.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/btr/btr0btr.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/btr/btr0cur.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/btr/btr0pcur.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/btr/btr0sea.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/buf/buf0buf.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/buf/buf0flu.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/buf/buf0lru.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/buf/buf0rea.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/data/data0data.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/data/data0type.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/dict/dict0boot.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/dict/dict0crea.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/dict/dict0dict.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/dict/dict0load.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/dict/dict0mem.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/dyn/dyn0dyn.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/eval/eval0eval.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/eval/eval0proc.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/fil/fil0fil.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/fsp/fsp0fsp.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/fut/fut0lst.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/ha/ha0ha.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/ha/hash0hash.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/ibuf/ibuf0ibuf.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/btr0btr.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/btr0btr.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/btr0cur.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/btr0cur.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/btr0pcur.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/btr0pcur.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/btr0sea.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/btr0sea.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/btr0types.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/buf0buf.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/buf0buf.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/buf0flu.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/buf0flu.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/buf0lru.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/data0data.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/data0data.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/data0type.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/data0type.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/db0err.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/dict0boot.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/dict0boot.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/dict0crea.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/dict0dict.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/dict0dict.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/dict0load.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/dict0mem.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/dyn0dyn.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/dyn0dyn.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/eval0eval.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/eval0eval.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/eval0proc.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/eval0proc.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/fil0fil.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/fsp0fsp.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/fut0lst.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/ha0ha.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/hash0hash.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/hash0hash.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/ibuf0ibuf.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/ibuf0ibuf.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/lock0lock.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/lock0types.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/log0log.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/log0log.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/log0recv.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/mach0data.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/mach0data.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/mem0dbg.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/mem0dbg.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/mem0mem.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/mem0mem.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/mem0pool.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/mtr0log.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/mtr0mtr.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/mtr0mtr.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/os0file.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/os0proc.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/os0sync.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/os0sync.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/os0thread.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/page0cur.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/page0cur.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/page0page.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/page0page.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/page0types.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/pars0grm.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/pars0opt.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/pars0pars.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/pars0sym.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/pars0types.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/que0que.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/que0que.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/que0types.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/read0read.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/read0read.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/rem0cmp.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/rem0cmp.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/rem0rec.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/rem0rec.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/row0ins.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/row0mysql.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/row0purge.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/row0row.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/row0row.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/row0sel.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/row0sel.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/row0types.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/row0uins.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/row0umod.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/row0undo.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/row0upd.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/row0upd.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/row0vers.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/srv0srv.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/srv0start.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/sync0arr.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/sync0rw.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/sync0rw.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/sync0sync.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/sync0sync.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/trx0purge.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/trx0purge.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/trx0rec.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/trx0roll.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/trx0rseg.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/trx0rseg.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/trx0sys.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/trx0sys.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/trx0trx.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/trx0trx.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/trx0types.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/trx0undo.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/trx0undo.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/trx0xa.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/univ.i:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/usr0sess.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/usr0types.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/ut0byte.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/ut0byte.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/ut0dbg.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/ut0lst.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/ut0mem.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/ut0mem.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/ut0rnd.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/ut0rnd.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/ut0sort.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/ut0ut.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/include/ut0ut.ic:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/lock/lock0lock.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/log/log0log.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/log/log0recv.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/mach/mach0data.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/mem/mem0dbg.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/mem/mem0mem.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/mem/mem0pool.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/mtr/mtr0log.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/mtr/mtr0mtr.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/os/os0file.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/os/os0proc.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/os/os0sync.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/os/os0thread.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/page/page0cur.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/page/page0page.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/pars/lexyy.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/pars/pars0grm.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/pars/pars0grm.h:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/pars/pars0grm.y:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/pars/pars0lex.l:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/pars/pars0opt.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/pars/pars0pars.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/pars/pars0sym.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/que/que0que.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/read/read0read.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/rem/rem0cmp.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/rem/rem0rec.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/row/row0ins.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/row/row0mysql.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/row/row0purge.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/row/row0row.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/row/row0sel.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/row/row0uins.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/row/row0umod.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/row/row0undo.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/row/row0upd.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/row/row0vers.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/srv/srv0que.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/srv/srv0srv.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/srv/srv0start.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/sync/sync0arr.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/sync/sync0rw.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/sync/sync0sync.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/thr/thr0loc.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/trx/trx0purge.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/trx/trx0rec.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/trx/trx0roll.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/trx/trx0rseg.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/trx/trx0sys.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/trx/trx0trx.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/trx/trx0undo.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/usr/usr0sess.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/ut/ut0byte.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/ut/ut0dbg.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/ut/ut0mem.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/ut/ut0rnd.c:
  Applied innodb-5.1-ss269 snapshot.
storage/innobase/ut/ut0ut.c:
  Applied innodb-5.1-ss269 snapshot.
mysql-test/r/innodb_unsafe_binlog.result:
  New BitKeeper file ``mysql-test/r/innodb_unsafe_binlog.result''
mysql-test/t/innodb_unsafe_binlog-master.opt:
  New BitKeeper file ``mysql-test/t/innodb_unsafe_binlog-master.opt''
mysql-test/t/innodb_unsafe_binlog.test:
  New BitKeeper file ``mysql-test/t/innodb_unsafe_binlog.test''
storage/innobase/pars/make_bison.sh:
  New BitKeeper file ``storage/innobase/pars/make_bison.sh''
parent 1cef1679

mysql-test/r/innodb.result

+440 −2
Original line number Diff line number Diff line
@@ -1784,7 +1784,7 @@ innodb_sync_spin_loops 20 
show variables like "innodb_thread_concurrency";

Variable_name	Value

innodb_thread_concurrency	20

set global innodb_thread_concurrency=1000;

set global innodb_thread_concurrency=1001;

show variables like "innodb_thread_concurrency";

Variable_name	Value

innodb_thread_concurrency	1000
@@ -2661,6 +2661,32 @@ insert into t2 values (4,_ucs2 0x0563,_ucs2 0x0563,'ten'); 
insert into t2 values (4,_ucs2 0x05630563,_ucs2 0x05630563,'eleven');

insert into t2 values (4,_ucs2 0x0563001fc0563,_ucs2 0x0563001fc0563,'point');

insert into t2 values (4,_ucs2 0x05612020,_ucs2 0x05612020,'taken');

update t1 set filler = 'boo' where a = 1;

update t2 set filler ='email' where a = 4;

select a,hex(b),hex(c),filler from t1 order by filler;

a	hex(b)	hex(c)	filler

1	61626364656667	61626364656667	boo

4	D0B1	D0B1	eight

4	5B	5B	five

4	E880BD	E880BD	four

4	E880BDD0B1E880BD	E880BDD0B1E880BD	seven

4	E880BDE880BD	E880BDE880BD	six

3	71727374757677	71727374757677	three

2	696A6B696C6D6E	696A6B696C6D6E	two

select a,hex(b),hex(c),filler from t2 order by filler;

a	hex(b)	hex(c)	filler

4	05630563	05630563	email

4	0563	0563	email

4	05612020	05612020	email

4	01FC	01FC	email

4	0120	0120	email

4	00640065	00640065	email

4	00E400E50068	00E400E50068	email

4	0000E400	0000E400	email

4	0000563001FC0563	0000563001FC0563	email

1	0061006200630064006500660067	0061006200630064006500660067	one

3	0071007200730074007500760077	0071007200730074007500760077	three

2	0069006A006B0069006C006D006E	0069006A006B0069006C006D006E	two

drop table t1;

drop table t2;

create table t1 (
@@ -2689,6 +2715,32 @@ insert into t2 values (4,_ucs2 0x0563,_ucs2 0x0563,'ten'); 
insert into t2 values (4,_ucs2 0x05630563,_ucs2 0x05630563,'eleven');

insert into t2 values (4,_ucs2 0x0563001fc0563,_ucs2 0x0563001fc0563,'point');

insert into t2 values (4,_ucs2 0x05612020,_ucs2 0x05612020,'taken');

update t1 set filler = 'boo' where a = 1;

update t2 set filler ='email' where a = 4;

select a,hex(b),hex(c),filler from t1 order by filler;

a	hex(b)	hex(c)	filler

1	61626364656667	61626364656667	boo

4	D0B1	D0B1	eight

4	5B	5B	five

4	E880BD	E880BD	four

4	E880BDD0B1E880BD	E880BDD0B1E880BD	seven

4	E880BDE880BD	E880BDE880BD	six

3	71727374757677	71727374757677	three

2	696A6B696C6D6E	696A6B696C6D6E	two

select a,hex(b),hex(c),filler from t2 order by filler;

a	hex(b)	hex(c)	filler

4	05630563	05630563	email

4	0563	0563	email

4	05612020	05612020	email

4	01FC	01FC	email

4	0120	0120	email

4	00640065	00640065	email

4	00E400E50068	00E400E50068	email

4	0000E400	0000E400	email

4	0000563001FC0563	0000563001FC0563	email

1	0061006200630064006500660067	0061006200630064006500660067	one

3	0071007200730074007500760077	0071007200730074007500760077	three

2	0069006A006B0069006C006D006E	0069006A006B0069006C006D006E	two

drop table t1;

drop table t2;

create table t1 (
@@ -2717,6 +2769,32 @@ insert into t2 values (4,_ucs2 0x0563,_ucs2 0x0563,'ten'); 
insert into t2 values (4,_ucs2 0x05630563,_ucs2 0x05630563,'eleven');

insert into t2 values (4,_ucs2 0x0563001fc0563,_ucs2 0x0563001fc0563,'point');

insert into t2 values (4,_ucs2 0x05612020,_ucs2 0x05612020,'taken');

update t1 set filler = 'boo' where a = 1;

update t2 set filler ='email' where a = 4;

select a,hex(b),hex(c),filler from t1 order by filler;

a	hex(b)	hex(c)	filler

1	61626364656667	61626364656667	boo

4	D0B1	D0B1	eight

4	5B	5B	five

4	E880BD	E880BD	four

4	E880BDD0B1E880BD	E880BDD0B1E880BD	seven

4	E880BDE880BD	E880BDE880BD	six

3	71727374757677	71727374757677	three

2	696A6B696C6D6E	696A6B696C6D6E	two

select a,hex(b),hex(c),filler from t2 order by filler;

a	hex(b)	hex(c)	filler

4	0120	0120	email

4	01FC	01FC	email

4	0563	0563	email

4	0000563001FC0563	0000563001FC0563	email

4	0000E400	0000E400	email

4	00640065	00640065	email

4	00E400E50068	00E400E50068	email

4	05612020	05612020	email

4	05630563	05630563	email

1	0061006200630064006500660067	0061006200630064006500660067	one

3	0071007200730074007500760077	0071007200730074007500760077	three

2	0069006A006B0069006C006D006E	0069006A006B0069006C006D006E	two

drop table t1;

drop table t2;

create table t1 (
@@ -2741,9 +2819,92 @@ insert into t2 values (4,_ucs2 0x01fc,_ucs2 0x01fc,'seven'); 
insert into t2 values (4,_ucs2 0x0120,_ucs2 0x0120,'eight');

insert into t2 values (4,_ucs2 0x0563,_ucs2 0x0563,'ten');

insert into t2 values (4,_ucs2 0x05612020,_ucs2 0x05612020,'taken');

update t1 set filler = 'boo' where a = 1;

update t2 set filler ='email' where a = 4;

select a,hex(b),hex(c),filler from t1 order by filler;

a	hex(b)	hex(c)	filler

1	61626364656667	61626364656667	boo

4	D0B1	D0B1	eight

4	5B	5B	five

4	E880BD	E880BD	four

3	71727374757677	71727374757677	three

2	696A6B696C6D6E	696A6B696C6D6E	two

select a,hex(b),hex(c),filler from t2 order by filler;

a	hex(b)	hex(c)	filler

4	0000E400	0000E400	email

4	00640065	00640065	email

4	00E400E50068	00E400E50068	email

4	0120	0120	email

4	01FC	01FC	email

4	05612020	05612020	email

4	0563	0563	email

1	61626364656667	61626364656667	one

3	71727374757677	71727374757677	three

2	696A6B696C6D6E	696A6B696C6D6E	two

drop table t1;

drop table t2;

commit;

set foreign_key_checks=0;

create table t2 (a int primary key, b int, foreign key (b) references t1(a)) engine = innodb;

create table t1(a char(10) primary key, b varchar(20)) engine = innodb;

ERROR HY000: Can't create table 'test.t1' (errno: 150)

set foreign_key_checks=1;

drop table t2;

set foreign_key_checks=0;

create table t1(a varchar(10) primary key) engine = innodb DEFAULT CHARSET=latin1;

create table t2 (a varchar(10), foreign key (a) references t1(a)) engine = innodb DEFAULT CHARSET=utf8;

ERROR HY000: Can't create table 'test.t2' (errno: 150)

set foreign_key_checks=1;

drop table t1;

set foreign_key_checks=0;

create table t2 (a varchar(10), foreign key (a) references t1(a)) engine = innodb;

create table t1(a varchar(10) primary key) engine = innodb;

alter table t1 modify column a int;

Got one of the listed errors

set foreign_key_checks=1;

drop table t2,t1;

set foreign_key_checks=0;

create table t2 (a varchar(10), foreign key (a) references t1(a)) engine = innodb DEFAULT CHARSET=latin1;

create table t1(a varchar(10) primary key) engine = innodb DEFAULT CHARSET=latin1;

alter table t1 convert to character set utf8;

set foreign_key_checks=1;

drop table t2,t1;

set foreign_key_checks=0;

create table t2 (a varchar(10), foreign key (a) references t1(a)) engine = innodb DEFAULT CHARSET=latin1;

create table t3(a varchar(10) primary key) engine = innodb DEFAULT CHARSET=utf8;

rename table t3 to t1;

ERROR HY000: Error on rename of './test/t3' to './test/t1' (errno: 150)

set foreign_key_checks=1;

drop table t2,t3;

create table t1(a int primary key) row_format=redundant engine=innodb;

create table t2(a int primary key,constraint foreign key(a)references t1(a)) row_format=compact engine=innodb;

create table t3(a int primary key) row_format=compact engine=innodb;

create table t4(a int primary key,constraint foreign key(a)references t3(a)) row_format=redundant engine=innodb;

insert into t1 values(1);

insert into t3 values(1);

insert into t2 values(2);

ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test/t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`))

insert into t4 values(2);

ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test/t4`, CONSTRAINT `t4_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t3` (`a`))

insert into t2 values(1);

insert into t4 values(1);

update t1 set a=2;

ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test/t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`))

update t2 set a=2;

ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test/t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`))

update t3 set a=2;

ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test/t4`, CONSTRAINT `t4_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t3` (`a`))

update t4 set a=2;

ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test/t4`, CONSTRAINT `t4_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t3` (`a`))

truncate t1;

ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test/t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`))

truncate t3;

ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test/t4`, CONSTRAINT `t4_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t3` (`a`))

truncate t2;

truncate t4;

truncate t1;

truncate t3;

drop table t4,t3,t2,t1;

create table t1 (a varchar(255) character set utf8,

b varchar(255) character set utf8,

c varchar(255) character set utf8,
@@ -2757,7 +2918,284 @@ d varchar(255) character set utf8, 
e varchar(255) character set utf8,

key (a,b,c,d,e)) engine=innodb;

ERROR 42000: Specified key was too long; max key length is 3072 bytes

End of 5.0 tests

create table t1 (s1 varbinary(2),primary key (s1)) engine=innodb;

create table t2 (s1 binary(2),primary key (s1)) engine=innodb;

create table t3 (s1 varchar(2) binary,primary key (s1)) engine=innodb;

create table t4 (s1 char(2) binary,primary key (s1)) engine=innodb;

insert into t1 values (0x41),(0x4120),(0x4100);

insert into t2 values (0x41),(0x4120),(0x4100);

ERROR 23000: Duplicate entry 'A' for key 'PRIMARY'

insert into t2 values (0x41),(0x4120);

insert into t3 values (0x41),(0x4120),(0x4100);

ERROR 23000: Duplicate entry 'A ' for key 'PRIMARY'

insert into t3 values (0x41),(0x4100);

insert into t4 values (0x41),(0x4120),(0x4100);

ERROR 23000: Duplicate entry 'A' for key 'PRIMARY'

insert into t4 values (0x41),(0x4100);

select hex(s1) from t1;

hex(s1)

41

4100

4120

select hex(s1) from t2;

hex(s1)

4100

4120

select hex(s1) from t3;

hex(s1)

4100

41

select hex(s1) from t4;

hex(s1)

4100

41

drop table t1,t2,t3,t4;

create table t1 (a int primary key,s1 varbinary(3) not null unique) engine=innodb;

create table t2 (s1 binary(2) not null, constraint c foreign key(s1) references t1(s1) on update cascade) engine=innodb;

insert into t1 values(1,0x4100),(2,0x41),(3,0x4120),(4,0x42);

insert into t2 values(0x42);

ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test/t2`, CONSTRAINT `c` FOREIGN KEY (`s1`) REFERENCES `t1` (`s1`) ON UPDATE CASCADE)

insert into t2 values(0x41);

select hex(s1) from t2;

hex(s1)

4100

update t1 set s1=0x123456 where a=2;

select hex(s1) from t2;

hex(s1)

4100

update t1 set s1=0x12 where a=1;

ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test/t2`, CONSTRAINT `c` FOREIGN KEY (`s1`) REFERENCES `t1` (`s1`) ON UPDATE CASCADE)

update t1 set s1=0x12345678 where a=1;

ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test/t2`, CONSTRAINT `c` FOREIGN KEY (`s1`) REFERENCES `t1` (`s1`) ON UPDATE CASCADE)

update t1 set s1=0x123457 where a=1;

ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test/t2`, CONSTRAINT `c` FOREIGN KEY (`s1`) REFERENCES `t1` (`s1`) ON UPDATE CASCADE)

update t1 set s1=0x1220 where a=1;

select hex(s1) from t2;

hex(s1)

1220

update t1 set s1=0x1200 where a=1;

select hex(s1) from t2;

hex(s1)

1200

update t1 set s1=0x4200 where a=1;

select hex(s1) from t2;

hex(s1)

4200

delete from t1 where a=1;

ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test/t2`, CONSTRAINT `c` FOREIGN KEY (`s1`) REFERENCES `t1` (`s1`) ON UPDATE CASCADE)

delete from t1 where a=2;

update t2 set s1=0x4120;

delete from t1;

ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test/t2`, CONSTRAINT `c` FOREIGN KEY (`s1`) REFERENCES `t1` (`s1`) ON UPDATE CASCADE)

delete from t1 where a!=3;

select a,hex(s1) from t1;

a	hex(s1)

3	4120

select hex(s1) from t2;

hex(s1)

4120

drop table t2,t1;

create table t1 (a int primary key,s1 varchar(2) binary not null unique) engine=innodb;

create table t2 (s1 char(2) binary not null, constraint c foreign key(s1) references t1(s1) on update cascade) engine=innodb;

insert into t1 values(1,0x4100),(2,0x41);

insert into t2 values(0x41);

select hex(s1) from t2;

hex(s1)

41

update t1 set s1=0x1234 where a=1;

select hex(s1) from t2;

hex(s1)

41

update t1 set s1=0x12 where a=2;

select hex(s1) from t2;

hex(s1)

12

delete from t1 where a=1;

delete from t1 where a=2;

ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test/t2`, CONSTRAINT `c` FOREIGN KEY (`s1`) REFERENCES `t1` (`s1`) ON UPDATE CASCADE)

select a,hex(s1) from t1;

a	hex(s1)

2	12

select hex(s1) from t2;

hex(s1)

12

drop table t2,t1;

CREATE TABLE t1 (

ind enum('0','1','2') NOT NULL default '0',

string1 varchar(250) NOT NULL,

PRIMARY KEY  (ind)

) ENGINE=InnoDB DEFAULT CHARSET=utf8;

CREATE TABLE t2 (

ind enum('0','1','2') NOT NULL default '0',

string1 varchar(250) NOT NULL,

PRIMARY KEY  (ind)

) ENGINE=InnoDB DEFAULT CHARSET=ucs2;

INSERT INTO t1 VALUES ('1', ''),('2', '');

INSERT INTO t2 VALUES ('1', ''),('2', '');

SELECT hex(ind),hex(string1) FROM t1 ORDER BY string1;

hex(ind)	hex(string1)

31	

32	

SELECT hex(ind),hex(string1) FROM t2 ORDER BY string1;

hex(ind)	hex(string1)

0031	

0032	

drop table t1,t2;

CREATE TABLE t1 (

ind set('0','1','2') NOT NULL default '0',

string1 varchar(250) NOT NULL,

PRIMARY KEY  (ind)

) ENGINE=InnoDB DEFAULT CHARSET=utf8;

CREATE TABLE t2 (

ind set('0','1','2') NOT NULL default '0',

string1 varchar(250) NOT NULL,

PRIMARY KEY  (ind)

) ENGINE=InnoDB DEFAULT CHARSET=ucs2;

INSERT INTO t1 VALUES ('1', ''),('2', '');

INSERT INTO t2 VALUES ('1', ''),('2', '');

SELECT hex(ind),hex(string1) FROM t1 ORDER BY string1;

hex(ind)	hex(string1)

31	

32	

SELECT hex(ind),hex(string1) FROM t2 ORDER BY string1;

hex(ind)	hex(string1)

0031	

0032	

drop table t1,t2;

CREATE TABLE t1 (

ind bit not null,

string1 varchar(250) NOT NULL,

PRIMARY KEY  (ind)

) ENGINE=InnoDB DEFAULT CHARSET=utf8;

CREATE TABLE t2 (

ind bit not null,

string1 varchar(250) NOT NULL,

PRIMARY KEY  (ind)

) ENGINE=InnoDB DEFAULT CHARSET=ucs2;

insert into t1 values(0,''),(1,'');

insert into t2 values(0,''),(1,'');

select hex(ind),hex(string1) from t1 order by string1;

hex(ind)	hex(string1)

0	

1	

select hex(ind),hex(string1) from t2 order by string1;

hex(ind)	hex(string1)

0	

1	

drop table t1,t2;

create table t2 (

a int, b char(10), filler char(10), primary key(a, b(2)) 

) character set utf8 engine = innodb;

insert into t2 values (1,'abcdefg','one');

insert into t2 values (2,'ijkilmn','two');

insert into t2 values (3, 'qrstuvw','three');

update t2 set a=5, filler='booo' where a=1;

drop table t2;

create table t2 (

a int, b char(10), filler char(10), primary key(a, b(2)) 

) character set ucs2 engine = innodb;

insert into t2 values (1,'abcdefg','one');

insert into t2 values (2,'ijkilmn','two');

insert into t2 values (3, 'qrstuvw','three');

update t2 set a=5, filler='booo' where a=1;

drop table t2;

create table t1(a int not null, b char(110),primary key(a,b(100))) engine=innodb default charset=utf8;

insert into t1 values(1,'abcdefg'),(2,'defghijk');

insert into t1 values(6,_utf8 0xD0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1);

insert into t1 values(7,_utf8 0xD0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B2);

select a,hex(b) from t1 order by b;

a	hex(b)

1	61626364656667

2	6465666768696A6B

6	D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1

7	D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B2

update t1 set b = 'three' where a = 6;

drop table t1;

create table t1(a int not null, b text(110),primary key(a,b(100))) engine=innodb default charset=utf8;

insert into t1 values(1,'abcdefg'),(2,'defghijk');

insert into t1 values(6,_utf8 0xD0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1);

insert into t1 values(7,_utf8 0xD0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B2);

select a,hex(b) from t1 order by b;

a	hex(b)

1	61626364656667

2	6465666768696A6B

6	D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1

7	D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B2

update t1 set b = 'three' where a = 6;

drop table t1;

CREATE TABLE t1(a INT, PRIMARY KEY(a)) ENGINE=InnoDB;

CREATE TABLE t2(a INT) ENGINE=InnoDB;

ALTER TABLE t2 ADD FOREIGN KEY (a) REFERENCES t1(a);

ALTER TABLE t2 DROP FOREIGN KEY t2_ibfk_1;

ALTER TABLE t2 ADD CONSTRAINT t2_ibfk_0 FOREIGN KEY (a) REFERENCES t1(a);

ALTER TABLE t2 DROP FOREIGN KEY t2_ibfk_0;

SHOW CREATE TABLE t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `a` int(11) DEFAULT NULL,

  KEY `t2_ibfk_0` (`a`),

  CONSTRAINT `t2_ibfk_0` FOREIGN KEY (`a`) REFERENCES `t1` (`a`),

  CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`)

) ENGINE=InnoDB DEFAULT CHARSET=latin1

DROP TABLE t2,t1;

create table t1(a int not null, b int, c int, d int, primary key(a)) engine=innodb;

insert into t1(a) values (1),(2),(3);

commit;

set autocommit = 0;

update t1 set b = 5 where a = 2;

create trigger t1t before insert on t1 for each row begin set NEW.b = NEW.a * 10 + 5, NEW.c = NEW.a / 10; end |

set autocommit = 0;

insert into t1(a) values (10),(20),(30),(40),(50),(60),(70),(80),(90),(100),

(11),(21),(31),(41),(51),(61),(71),(81),(91),(101),

(12),(22),(32),(42),(52),(62),(72),(82),(92),(102),

(13),(23),(33),(43),(53),(63),(73),(83),(93),(103),

(14),(24),(34),(44),(54),(64),(74),(84),(94),(104);

commit;

commit;

drop trigger t1t;

drop table t1;

create table t1(a int not null, b int, c int, d int, primary key(a)) engine=innodb;

create table t2(a int not null, b int, c int, d int, primary key(a)) engine=innodb;

create table t3(a int not null, b int, c int, d int, primary key(a)) engine=innodb;

create table t4(a int not null, b int, c int, d int, primary key(a)) engine=innodb;

create table t5(a int not null, b int, c int, d int, primary key(a)) engine=innodb;

insert into t1(a) values (1),(2),(3);

insert into t2(a) values (1),(2),(3);

insert into t3(a) values (1),(2),(3);

insert into t4(a) values (1),(2),(3);

insert into t3(a) values (5),(7),(8);

insert into t4(a) values (5),(7),(8);

insert into t5(a) values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12);

create trigger t1t before insert on t1 for each row begin 

INSERT INTO t2 SET a = NEW.a;

end |

create trigger t2t before insert on t2 for each row begin

DELETE FROM t3 WHERE a = NEW.a;

end |

create trigger t3t before delete on t3 for each row begin  

UPDATE t4 SET b = b + 1 WHERE a = OLD.a;

end |

create trigger t4t before update on t4 for each row begin

UPDATE t5 SET b = b + 1 where a = NEW.a;

end |

commit;

set autocommit = 0;

update t1 set b = b + 5 where a = 1;

update t2 set b = b + 5 where a = 1;

update t3 set b = b + 5 where a = 1;

update t4 set b = b + 5 where a = 1;

insert into t5(a) values(20);

set autocommit = 0;

insert into t1(a) values(7);

insert into t2(a) values(8);

delete from t2 where a = 3;

update t4 set b = b + 1 where a = 3;

commit;

drop trigger t1t;

drop trigger t2t;

drop trigger t3t;

drop trigger t4t;

drop table t1, t2, t3, t4, t5;

CREATE TABLE t1 (

field1 varchar(8) NOT NULL DEFAULT '',

field2 varchar(8) NOT NULL DEFAULT '',

mysql-test/r/innodb_unsafe_binlog.result

0 → 100644
+35 −0
Original line number Diff line number Diff line 
drop table if exists t1,t2;

create table t1 (id int not null, f_id int not null, f int not null,

primary key(f_id, id)) engine=innodb;

create table t2 (id int not null,s_id int not null,s varchar(200),

primary key(id)) engine=innodb;

INSERT INTO t1 VALUES (8, 1, 3);

INSERT INTO t1 VALUES (1, 2, 1);

INSERT INTO t2 VALUES (1, 0, '');

INSERT INTO t2 VALUES (8, 1, '');

commit;

DELETE ml.* FROM t1 AS ml LEFT JOIN t2 AS mm ON (mm.id=ml.id)

WHERE mm.id IS NULL;

select ml.* from t1 as ml left join t2 as mm on (mm.id=ml.id)

where mm.id is null lock in share mode;

id	f_id	f

drop table t1,t2;

create table t1(a int not null, b int, primary key(a)) engine=innodb;

insert into t1 values(1,1),(2,2),(3,1),(4,2),(5,1),(6,2);

commit;

set autocommit = 0;

select * from t1 lock in share mode;

a	b

1	1

2	2

3	1

4	2

5	1

6	2

update t1 set b = 5 where b = 1;

set autocommit = 0;

select * from t1 where a = 2 and b = 2 for update;

ERROR HY000: Lock wait timeout exceeded; try restarting transaction

commit;

commit;

drop table t1;

mysql-test/t/innodb.test

+371 −2

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/t/innodb_unsafe_binlog-master.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--innodb_locks_unsafe_for_binlog=true

mysql-test/t/innodb_unsafe_binlog.test

0 → 100644
+55 −0
Original line number Diff line number Diff line 
-- source include/have_innodb.inc

#

# Note that these tests uses a innodb_locks_unsafe_for_binlog option.

#

#

# Test cases for a bug #15650

#



--disable_warnings

drop table if exists t1,t2;

--enable_warnings

create table t1 (id int not null, f_id int not null, f int not null,

primary key(f_id, id)) engine=innodb;

create table t2 (id int not null,s_id int not null,s varchar(200),

primary key(id)) engine=innodb;

INSERT INTO t1 VALUES (8, 1, 3);

INSERT INTO t1 VALUES (1, 2, 1);

INSERT INTO t2 VALUES (1, 0, '');

INSERT INTO t2 VALUES (8, 1, '');

commit;

DELETE ml.* FROM t1 AS ml LEFT JOIN t2 AS mm ON (mm.id=ml.id)

WHERE mm.id IS NULL;

select ml.* from t1 as ml left join t2 as mm on (mm.id=ml.id)

where mm.id is null lock in share mode;

drop table t1,t2;



#

# Test case for unlock row bug where unlock releases all locks granted for

# a row. Only the latest lock should be released.

#



connect (a,localhost,root,,);

connect (b,localhost,root,,);

connection a;

create table t1(a int not null, b int, primary key(a)) engine=innodb;

insert into t1 values(1,1),(2,2),(3,1),(4,2),(5,1),(6,2);

commit;

set autocommit = 0; 

select * from t1 lock in share mode;

update t1 set b = 5 where b = 1;

connection b;

set autocommit = 0;

#

# S-lock to records (2,2),(4,2), and (6,2) should not be released in a update

#

--error 1205

select * from t1 where a = 2 and b = 2 for update;

connection a;

commit;

connection b;

commit;

drop table t1;

disconnect a;

disconnect b;