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''

1 files changed, 91 insertions, 90 deletions

diff --git a/storage/innobase/trx/trx0roll.c b/storage/innobase/trx/trx0roll.c
index fdfb7428129..fd733ef5fb8 100644
--- a/storage/innobase/trx/trx0roll.c
+++ b/storage/innobase/trx/trx0roll.c
@@ -77,7 +77,7 @@ trx_general_rollback_for_mysql(
 	trx->error_state = DB_SUCCESS;
 
 	thr = pars_complete_graph_for_exec(roll_node, trx, heap);
-	
+
 	ut_a(thr == que_fork_start_command(que_node_get_parent(thr)));
 	que_run_threads(thr);
 
@@ -94,9 +94,9 @@ trx_general_rollback_for_mysql(
 
 	mutex_exit(&kernel_mutex);
 
- 	mem_heap_free(heap);
+	mem_heap_free(heap);
 
- 	ut_a(trx->error_state == DB_SUCCESS);
+	ut_a(trx->error_state == DB_SUCCESS);
 
 	/* Tell Innobase server that there might be work for
 	utility threads: */
@@ -109,6 +109,7 @@ trx_general_rollback_for_mysql(
 	InnoDB Hot Backup builds.  Besides, this function should never
 	be called in InnoDB Hot Backup. */
 	ut_error;
+	return(DB_FAIL);
 #endif /* UNIV_HOTBACKUP */
 }
 
@@ -129,13 +130,13 @@ trx_rollback_for_mysql(
 	}
 
 	trx->op_info = "rollback";
-	
+
 	err = trx_general_rollback_for_mysql(trx, FALSE, NULL);
 
 	trx->op_info = "";
 
 	return(err);
-}	
+}
 
 /***********************************************************************
 Rollback the latest SQL statement for MySQL. */
@@ -154,14 +155,14 @@ trx_rollback_last_sql_stat_for_mysql(
 	}
 
 	trx->op_info = "rollback of SQL statement";
-	
+
 	err = trx_general_rollback_for_mysql(trx, TRUE,
 						&(trx->last_sql_stat_start));
 	/* The following call should not be needed, but we play safe: */
 	trx_mark_sql_stat_end(trx);
 
 	trx->op_info = "";
-	
+
 	return(err);
 }
 
@@ -179,13 +180,13 @@ trx_roll_savepoints_free(
 	trx_named_savept_t*	next_savep;
 
 	if (savep == NULL) {
-	        savep = UT_LIST_GET_FIRST(trx->trx_savepoints);
+		savep = UT_LIST_GET_FIRST(trx->trx_savepoints);
 	} else {
-	        savep = UT_LIST_GET_NEXT(trx_savepoints, savep);
+		savep = UT_LIST_GET_NEXT(trx_savepoints, savep);
 	}
-	
+
 	while (savep != NULL) {
-	        next_savep = UT_LIST_GET_NEXT(trx_savepoints, savep);
+		next_savep = UT_LIST_GET_NEXT(trx_savepoints, savep);
 
 		UT_LIST_REMOVE(trx_savepoints, trx->trx_savepoints, savep);
 		mem_free(savep->name);
@@ -199,7 +200,7 @@ trx_roll_savepoints_free(
 Rolls back a transaction back to a named savepoint. Modifications after the
 savepoint are undone but InnoDB does NOT release the corresponding locks
 which are stored in memory. If a lock is 'implicit', that is, a new inserted
-row holds a lock where the lock information is carried by the trx id stored in 
+row holds a lock where the lock information is carried by the trx id stored in
 the row, these locks are naturally released in the rollback. Savepoints which
 were set after this savepoint are deleted. */
 
@@ -225,16 +226,16 @@ trx_rollback_to_savepoint_for_mysql(
 	savep = UT_LIST_GET_FIRST(trx->trx_savepoints);
 
 	while (savep != NULL) {
-	        if (0 == ut_strcmp(savep->name, savepoint_name)) {
-		        /* Found */
+		if (0 == ut_strcmp(savep->name, savepoint_name)) {
+			/* Found */
 			break;
 		}
-	        savep = UT_LIST_GET_NEXT(trx_savepoints, savep);
+		savep = UT_LIST_GET_NEXT(trx_savepoints, savep);
 	}
 
-	if (savep == NULL) {	
+	if (savep == NULL) {
 
-	        return(DB_NO_SAVEPOINT);
+		return(DB_NO_SAVEPOINT);
 	}
 
 	if (trx->conc_state == TRX_NOT_STARTED) {
@@ -242,7 +243,7 @@ trx_rollback_to_savepoint_for_mysql(
 		fputs("  InnoDB: Error: transaction has a savepoint ", stderr);
 		ut_print_name(stderr, trx, savep->name);
 		fputs(" though it is not started\n", stderr);
-	        return(DB_ERROR);
+		return(DB_ERROR);
 	}
 
 	/* We can now free all savepoints strictly later than this one */
@@ -252,7 +253,7 @@ trx_rollback_to_savepoint_for_mysql(
 	*mysql_binlog_cache_pos = savep->mysql_binlog_cache_pos;
 
 	trx->op_info = "rollback to a savepoint";
-	
+
 	err = trx_general_rollback_for_mysql(trx, TRUE, &(savep->savept));
 
 	/* Store the current undo_no of the transaction so that we know where
@@ -292,18 +293,18 @@ trx_savepoint_for_mysql(
 	savep = UT_LIST_GET_FIRST(trx->trx_savepoints);
 
 	while (savep != NULL) {
-	        if (0 == ut_strcmp(savep->name, savepoint_name)) {
-		        /* Found */
+		if (0 == ut_strcmp(savep->name, savepoint_name)) {
+			/* Found */
 			break;
 		}
-	        savep = UT_LIST_GET_NEXT(trx_savepoints, savep);
+		savep = UT_LIST_GET_NEXT(trx_savepoints, savep);
 	}
 
 	if (savep) {
-	        /* There is a savepoint with the same name: free that */
+		/* There is a savepoint with the same name: free that */
 
 		UT_LIST_REMOVE(trx_savepoints, trx->trx_savepoints, savep);
-		
+
 		mem_free(savep->name);
 		mem_free(savep);
 	}
@@ -342,22 +343,22 @@ trx_release_savepoint_for_mysql(
 	savep = UT_LIST_GET_FIRST(trx->trx_savepoints);
 
 	while (savep != NULL) {
-	        if (0 == ut_strcmp(savep->name, savepoint_name)) {
-		        /* Found */
+		if (0 == ut_strcmp(savep->name, savepoint_name)) {
+			/* Found */
 			break;
 		}
-	        savep = UT_LIST_GET_NEXT(trx_savepoints, savep);
+		savep = UT_LIST_GET_NEXT(trx_savepoints, savep);
 	}
 
-	if (savep == NULL) {	
+	if (savep == NULL) {
 
-	        return(DB_NO_SAVEPOINT);
+		return(DB_NO_SAVEPOINT);
 	}
 
 	/* We can now free all savepoints strictly later than this one */
 
 	trx_roll_savepoints_free(trx, savep);
-	
+
 	/* Now we can free this savepoint too */
 
 	UT_LIST_REMOVE(trx_savepoints, trx->trx_savepoints, savep);
@@ -387,7 +388,7 @@ trx_savept_take(
 /***********************************************************************
 Rollback or clean up transactions which have no user session. If the
 transaction already was committed, then we clean up a possible insert
-undo log. If the transaction was not yet committed, then we roll it back. 
+undo log. If the transaction was not yet committed, then we roll it back.
 Note: this is done in a background thread. */
 
 #ifndef __WIN__
@@ -397,10 +398,10 @@ ulint
 #endif
 trx_rollback_or_clean_all_without_sess(
 /*===================================*/
-                        /* out: a dummy parameter */
-        void*   arg __attribute__((unused)))
-                        /* in: a dummy parameter required by
-                        os_thread_create */
+			/* out: a dummy parameter */
+	void*	arg __attribute__((unused)))
+			/* in: a dummy parameter required by
+			os_thread_create */
 {
 	mem_heap_t*	heap;
 	que_fork_t*	fork;
@@ -413,20 +414,20 @@ trx_rollback_or_clean_all_without_sess(
 	int		err;
 
 	mutex_enter(&kernel_mutex);
-	
+
 	/* Open a dummy session */
 
 	if (!trx_dummy_sess) {
 		trx_dummy_sess = sess_open();
 	}
-	
+
 	mutex_exit(&kernel_mutex);
 
 	if (UT_LIST_GET_FIRST(trx_sys->trx_list)) {
 
 		fprintf(stderr,
 "InnoDB: Starting in background the rollback of uncommitted transactions\n");
-	} else {		
+	} else {
 		goto leave_function;
 	}
 loop:
@@ -447,7 +448,7 @@ loop:
 			break;
 		}
 	}
-	
+
 	mutex_exit(&kernel_mutex);
 
 	if (trx == NULL) {
@@ -455,20 +456,20 @@ loop:
 		fprintf(stderr,
 		"  InnoDB: Rollback of non-prepared transactions completed\n");
 
- 		mem_heap_free(heap);
+		mem_heap_free(heap);
 
 		goto leave_function;
 	}
 
 	trx->sess = trx_dummy_sess;
 
-	if (trx->conc_state == TRX_COMMITTED_IN_MEMORY) {	
+	if (trx->conc_state == TRX_COMMITTED_IN_MEMORY) {
 		fprintf(stderr, "InnoDB: Cleaning up trx with id %lu %lu\n",
 					(ulong) ut_dulint_get_high(trx->id),
 					(ulong) ut_dulint_get_low(trx->id));
 
 		trx_cleanup_at_db_startup(trx);
-					
+
 		mem_heap_free(heap);
 
 		goto loop;
@@ -484,12 +485,12 @@ loop:
 	thr->child = roll_node;
 	roll_node->common.parent = thr;
 
-	mutex_enter(&kernel_mutex);	
+	mutex_enter(&kernel_mutex);
 
 	trx->graph = fork;
 
 	ut_a(thr == que_fork_start_command(fork));
-	
+
 	trx_roll_crash_recv_trx	= trx;
 	trx_roll_max_undo_no = ut_conv_dulint_to_longlong(trx->undo_no);
 	trx_roll_progress_printed_pct = 0;
@@ -545,7 +546,7 @@ loop:
 
 		table = dict_table_get_on_id_low(trx->table_id, trx);
 
-		if (table) {		
+		if (table) {
 			fputs("InnoDB: Table found: dropping table ", stderr);
 			ut_print_name(stderr, trx, table->name);
 			fputs(" in recovery\n", stderr);
@@ -578,12 +579,12 @@ leave_function:
 	/* The following is dummy code to keep the compiler happy: */
 
 #ifndef __WIN__
-        return(NULL);
+	return(NULL);
 #else
-        return(0);
+	return(0);
 #endif
 }
-	
+
 /***********************************************************************
 Creates an undo number array. */
 
@@ -594,7 +595,7 @@ trx_undo_arr_create(void)
 	trx_undo_arr_t*	arr;
 	mem_heap_t*	heap;
 	ulint		i;
-	
+
 	heap = mem_heap_create(1024);
 
 	arr = mem_heap_alloc(heap, sizeof(trx_undo_arr_t));
@@ -649,7 +650,7 @@ trx_undo_arr_store_info(
 	arr = trx->undo_no_arr;
 	n_used = arr->n_used;
 	stored_here = NULL;
-	
+
 	for (i = 0;; i++) {
 		cell = trx_undo_arr_get_nth_info(arr, i);
 
@@ -679,7 +680,7 @@ trx_undo_arr_store_info(
 				return(FALSE);
 			}
 		}
-		
+
 		if (n == n_used && stored_here) {
 
 			ut_ad(arr->n_used == 1 + n_used);
@@ -710,10 +711,10 @@ trx_undo_arr_remove_info(
 		cell = trx_undo_arr_get_nth_info(arr, i);
 
 		if (cell->in_use
-			     && 0 == ut_dulint_cmp(cell->undo_no, undo_no)) {
+			&& 0 == ut_dulint_cmp(cell->undo_no, undo_no)) {
 
 			cell->in_use = FALSE;
-				
+
 			ut_ad(arr->n_used > 0);
 
 			arr->n_used--;
@@ -738,11 +739,11 @@ trx_undo_arr_get_biggest(
 	dulint		biggest;
 	ulint		n;
 	ulint		i;
-	
+
 	n = 0;
 	n_used = arr->n_used;
 	biggest = ut_dulint_zero;
-	
+
 	for (i = 0;; i++) {
 		cell = trx_undo_arr_get_nth_info(arr, i);
 
@@ -753,7 +754,7 @@ trx_undo_arr_get_biggest(
 				biggest = cell->undo_no;
 			}
 		}
-		
+
 		if (n == n_used) {
 			return(biggest);
 		}
@@ -771,14 +772,14 @@ trx_roll_try_truncate(
 	trx_undo_arr_t*	arr;
 	dulint		limit;
 	dulint		biggest;
-	
+
 #ifdef UNIV_SYNC_DEBUG
 	ut_ad(mutex_own(&(trx->undo_mutex)));
 	ut_ad(mutex_own(&((trx->rseg)->mutex)));
 #endif /* UNIV_SYNC_DEBUG */
 
 	trx->pages_undone = 0;
-	
+
 	arr = trx->undo_no_arr;
 
 	limit = trx->undo_no;
@@ -786,10 +787,10 @@ trx_roll_try_truncate(
 	if (arr->n_used > 0) {
 		biggest = trx_undo_arr_get_biggest(arr);
 
-	    	if (ut_dulint_cmp(biggest, limit) >= 0) {
+		if (ut_dulint_cmp(biggest, limit) >= 0) {
 
-	    		limit = ut_dulint_add(biggest, 1);
-	    	}
+			limit = ut_dulint_add(biggest, 1);
+		}
 	}
 
 	if (trx->insert_undo) {
@@ -813,7 +814,7 @@ trx_roll_pop_top_rec(
 	trx_undo_t*	undo,	/* in: undo log */
 	mtr_t*		mtr)	/* in: mtr */
 {
-	page_t* 	undo_page;
+	page_t*		undo_page;
 	ulint		offset;
 	trx_undo_rec_t*	prev_rec;
 	page_t*		prev_rec_page;
@@ -838,12 +839,12 @@ trx_roll_pop_top_rec(
 		undo->empty = TRUE;
 	} else {
 		prev_rec_page = buf_frame_align(prev_rec);
-	
+
 		if (prev_rec_page != undo_page) {
 
 			trx->pages_undone++;
 		}
-	
+
 		undo->top_page_no = buf_frame_get_page_no(prev_rec_page);
 		undo->top_offset  = prev_rec - prev_rec_page;
 		undo->top_undo_no = trx_undo_rec_get_undo_no(prev_rec);
@@ -880,7 +881,7 @@ trx_roll_pop_top_rec_of_trx(
 	trx_rseg_t*	rseg;
 	ulint		progress_pct;
 	mtr_t		mtr;
-	
+
 	rseg = trx->rseg;
 try_again:
 	mutex_enter(&(trx->undo_mutex));
@@ -910,9 +911,9 @@ try_again:
 	if (!undo || undo->empty
 			|| (ut_dulint_cmp(limit, undo->top_undo_no) > 0)) {
 
-	    	if ((trx->undo_no_arr)->n_used == 0) {
+		if ((trx->undo_no_arr)->n_used == 0) {
 			/* Rollback is ending */
-			
+
 			mutex_enter(&(rseg->mutex));
 
 			trx_roll_try_truncate(trx);
@@ -930,7 +931,7 @@ try_again:
 	} else {
 		is_insert = FALSE;
 	}
-	
+
 	*roll_ptr = trx_undo_build_roll_ptr(is_insert, (undo->rseg)->id,
 					undo->top_page_no, undo->top_offset);
 	mtr_start(&mtr);
@@ -946,7 +947,7 @@ try_again:
 
 	if (trx == trx_roll_crash_recv_trx && trx_roll_max_undo_no > 1000) {
 
-	  	progress_pct = 100 - (ulint)
+		progress_pct = 100 - (ulint)
 				((ut_conv_dulint_to_longlong(undo_no) * 100)
 				/ trx_roll_max_undo_no);
 		if (progress_pct != trx_roll_progress_printed_pct) {
@@ -970,16 +971,16 @@ try_again:
 		mutex_exit(&(trx->undo_mutex));
 
 		mtr_commit(&mtr);
-		
+
 		goto try_again;
 	}
 
 	undo_rec_copy = trx_undo_rec_copy(undo_rec, heap);
-	
+
 	mutex_exit(&(trx->undo_mutex));
 
 	mtr_commit(&mtr);
-	
+
 	return(undo_rec_copy);
 }
 
@@ -996,11 +997,11 @@ trx_undo_rec_reserve(
 	dulint	undo_no)/* in: undo number of the record */
 {
 	ibool	ret;
-	
+
 	mutex_enter(&(trx->undo_mutex));
 
 	ret = trx_undo_arr_store_info(trx, undo_no);
-	
+
 	mutex_exit(&(trx->undo_mutex));
 
 	return(ret);
@@ -1016,7 +1017,7 @@ trx_undo_rec_release(
 	dulint	undo_no)/* in: undo number */
 {
 	trx_undo_arr_t*	arr;
-	
+
 	mutex_enter(&(trx->undo_mutex));
 
 	arr = trx->undo_no_arr;
@@ -1027,7 +1028,7 @@ trx_undo_rec_release(
 }
 
 /*************************************************************************
-Starts a rollback operation. */	
+Starts a rollback operation. */
 
 void
 trx_rollback(
@@ -1049,7 +1050,7 @@ trx_rollback(
 	ut_ad(mutex_own(&kernel_mutex));
 #endif /* UNIV_SYNC_DEBUG */
 	ut_ad((trx->undo_no_arr == NULL) || ((trx->undo_no_arr)->n_used == 0));
-	
+
 	/* Initialize the rollback field in the transaction */
 
 	if (sig->type == TRX_SIG_TOTAL_ROLLBACK) {
@@ -1057,7 +1058,7 @@ trx_rollback(
 		trx->roll_limit = ut_dulint_zero;
 
 	} else if (sig->type == TRX_SIG_ROLLBACK_TO_SAVEPT) {
-		
+
 		trx->roll_limit = (sig->savept).least_undo_no;
 
 	} else if (sig->type == TRX_SIG_ERROR_OCCURRED) {
@@ -1074,7 +1075,7 @@ trx_rollback(
 	if (trx->undo_no_arr == NULL) {
 		trx->undo_no_arr = trx_undo_arr_create();
 	}
-	
+
 	/* Build a 'query' graph which will perform the undo operations */
 
 	roll_graph = trx_roll_graph_build(trx);
@@ -1089,7 +1090,7 @@ trx_rollback(
 /*	thr2 = que_fork_start_command(roll_graph);
 
 	ut_ad(thr2); */
-	
+
 	if (next_thr && (*next_thr == NULL)) {
 		*next_thr = thr;
 /*		srv_que_task_enqueue_low(thr2); */
@@ -1127,7 +1128,7 @@ trx_roll_graph_build(
 	thr = que_thr_create(fork, heap);
 /*	thr2 = que_thr_create(fork, heap); */
 
-	thr->child = row_undo_node_create(trx, thr, heap);  
+	thr->child = row_undo_node_create(trx, thr, heap);
 /*	thr2->child = row_undo_node_create(trx, thr2, heap); */
 
 	return(fork);
@@ -1206,13 +1207,13 @@ trx_finish_rollback_off_kernel(
 	que_thr_t**	next_thr)/* in/out: next query thread to run;
 				if the value which is passed in is
 				a pointer to a NULL pointer, then the
-   				calling function can start running
+				calling function can start running
 				a new query thread; if this parameter is
 				NULL, it is ignored */
 {
 	trx_sig_t*	sig;
 	trx_sig_t*	next_sig;
-	
+
 #ifdef UNIV_SYNC_DEBUG
 	ut_ad(mutex_own(&kernel_mutex));
 #endif /* UNIV_SYNC_DEBUG */
@@ -1238,7 +1239,7 @@ trx_finish_rollback_off_kernel(
 	}
 
 #ifdef UNIV_DEBUG
-	if (lock_print_waits) {			
+	if (lock_print_waits) {
 		fprintf(stderr, "Trx %lu rollback finished\n",
 						(ulong) ut_dulint_get_low(trx->id));
 	}
@@ -1250,7 +1251,7 @@ trx_finish_rollback_off_kernel(
 	send reply messages to them */
 
 	trx->que_state = TRX_QUE_RUNNING;
-	
+
 	while (sig != NULL) {
 		next_sig = UT_LIST_GET_NEXT(signals, sig);
 
@@ -1281,7 +1282,7 @@ roll_node_create(
 	node->state = ROLL_NODE_SEND;
 
 	node->partial = FALSE;
-	
+
 	return(node);
 }
 
@@ -1298,7 +1299,7 @@ trx_rollback_step(
 	ibool		success;
 	ulint		sig_no;
 	trx_savept_t*	savept;
-	
+
 	node = thr->run_node;
 
 	ut_ad(que_node_get_type(node) == QUE_NODE_ROLLBACK);
@@ -1327,7 +1328,7 @@ trx_rollback_step(
 					thr, savept, NULL);
 
 		thr->state = QUE_THR_SIG_REPLY_WAIT;
-		
+
 		mutex_exit(&kernel_mutex);
 
 		if (!success) {
@@ -1339,8 +1340,8 @@ trx_rollback_step(
 	}
 
 	ut_ad(node->state == ROLL_NODE_WAIT);
-		
+
 	thr->run_node = que_node_get_parent(node);
-	
+
 	return(thr);
 }