mariadb/storage/innobase/include/dyn0dyn.ic
unknown 050f14ac37 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''
2006-03-10 19:22:21 +03:00

346 lines
7.3 KiB
Text

/******************************************************
The dynamically allocated array
(c) 1996 Innobase Oy
Created 2/5/1996 Heikki Tuuri
*******************************************************/
#define DYN_BLOCK_MAGIC_N 375767
#define DYN_BLOCK_FULL_FLAG 0x1000000UL
/****************************************************************
Adds a new block to a dyn array. */
dyn_block_t*
dyn_array_add_block(
/*================*/
/* out: created block */
dyn_array_t* arr); /* in: dyn array */
/****************************************************************
Gets the first block in a dyn array. */
UNIV_INLINE
dyn_block_t*
dyn_array_get_first_block(
/*======================*/
dyn_array_t* arr) /* in: dyn array */
{
return(arr);
}
/****************************************************************
Gets the last block in a dyn array. */
UNIV_INLINE
dyn_block_t*
dyn_array_get_last_block(
/*=====================*/
dyn_array_t* arr) /* in: dyn array */
{
if (arr->heap == NULL) {
return(arr);
}
return(UT_LIST_GET_LAST(arr->base));
}
/************************************************************************
Gets the next block in a dyn array. */
UNIV_INLINE
dyn_block_t*
dyn_array_get_next_block(
/*=====================*/
/* out: pointer to next, NULL if end of list */
dyn_array_t* arr, /* in: dyn array */
dyn_block_t* block) /* in: dyn array block */
{
ut_ad(arr && block);
if (arr->heap == NULL) {
ut_ad(arr == block);
return(NULL);
}
return(UT_LIST_GET_NEXT(list, block));
}
/************************************************************************
Gets the number of used bytes in a dyn array block. */
UNIV_INLINE
ulint
dyn_block_get_used(
/*===============*/
/* out: number of bytes used */
dyn_block_t* block) /* in: dyn array block */
{
ut_ad(block);
return((block->used) & ~DYN_BLOCK_FULL_FLAG);
}
/************************************************************************
Gets pointer to the start of data in a dyn array block. */
UNIV_INLINE
byte*
dyn_block_get_data(
/*===============*/
/* out: pointer to data */
dyn_block_t* block) /* in: dyn array block */
{
ut_ad(block);
return(block->data);
}
/*************************************************************************
Initializes a dynamic array. */
UNIV_INLINE
dyn_array_t*
dyn_array_create(
/*=============*/
/* out: initialized dyn array */
dyn_array_t* arr) /* in: pointer to a memory buffer of
size sizeof(dyn_array_t) */
{
ut_ad(arr);
#if DYN_ARRAY_DATA_SIZE >= DYN_BLOCK_FULL_FLAG
# error "DYN_ARRAY_DATA_SIZE >= DYN_BLOCK_FULL_FLAG"
#endif
arr->heap = NULL;
arr->used = 0;
#ifdef UNIV_DEBUG
arr->buf_end = 0;
arr->magic_n = DYN_BLOCK_MAGIC_N;
#endif
return(arr);
}
/****************************************************************
Frees a dynamic array. */
UNIV_INLINE
void
dyn_array_free(
/*===========*/
dyn_array_t* arr) /* in: dyn array */
{
if (arr->heap != NULL) {
mem_heap_free(arr->heap);
}
#ifdef UNIV_DEBUG
arr->magic_n = 0;
#endif
}
/*************************************************************************
Makes room on top of a dyn array and returns a pointer to the added element.
The caller must copy the element to the pointer returned. */
UNIV_INLINE
void*
dyn_array_push(
/*===========*/
/* out: pointer to the element */
dyn_array_t* arr, /* in: dynamic array */
ulint size) /* in: size in bytes of the element */
{
dyn_block_t* block;
ulint used;
ut_ad(arr);
ut_ad(arr->magic_n == DYN_BLOCK_MAGIC_N);
ut_ad(size <= DYN_ARRAY_DATA_SIZE);
ut_ad(size);
block = arr;
used = block->used;
if (used + size > DYN_ARRAY_DATA_SIZE) {
/* Get the last array block */
block = dyn_array_get_last_block(arr);
used = block->used;
if (used + size > DYN_ARRAY_DATA_SIZE) {
block = dyn_array_add_block(arr);
used = block->used;
}
}
block->used = used + size;
ut_ad(block->used <= DYN_ARRAY_DATA_SIZE);
return((block->data) + used);
}
/*************************************************************************
Makes room on top of a dyn array and returns a pointer to a buffer in it.
After copying the elements, the caller must close the buffer using
dyn_array_close. */
UNIV_INLINE
byte*
dyn_array_open(
/*===========*/
/* out: pointer to the buffer */
dyn_array_t* arr, /* in: dynamic array */
ulint size) /* in: size in bytes of the buffer; MUST be
smaller than DYN_ARRAY_DATA_SIZE! */
{
dyn_block_t* block;
ulint used;
ut_ad(arr);
ut_ad(arr->magic_n == DYN_BLOCK_MAGIC_N);
ut_ad(size <= DYN_ARRAY_DATA_SIZE);
ut_ad(size);
block = arr;
used = block->used;
if (used + size > DYN_ARRAY_DATA_SIZE) {
/* Get the last array block */
block = dyn_array_get_last_block(arr);
used = block->used;
if (used + size > DYN_ARRAY_DATA_SIZE) {
block = dyn_array_add_block(arr);
used = block->used;
ut_a(size <= DYN_ARRAY_DATA_SIZE);
}
}
ut_ad(block->used <= DYN_ARRAY_DATA_SIZE);
#ifdef UNIV_DEBUG
ut_ad(arr->buf_end == 0);
arr->buf_end = used + size;
#endif
return((block->data) + used);
}
/*************************************************************************
Closes the buffer returned by dyn_array_open. */
UNIV_INLINE
void
dyn_array_close(
/*============*/
dyn_array_t* arr, /* in: dynamic array */
byte* ptr) /* in: buffer space from ptr up was not used */
{
dyn_block_t* block;
ut_ad(arr);
ut_ad(arr->magic_n == DYN_BLOCK_MAGIC_N);
block = dyn_array_get_last_block(arr);
ut_ad(arr->buf_end + block->data >= ptr);
block->used = ptr - block->data;
ut_ad(block->used <= DYN_ARRAY_DATA_SIZE);
#ifdef UNIV_DEBUG
arr->buf_end = 0;
#endif
}
/****************************************************************
Returns pointer to an element in dyn array. */
UNIV_INLINE
void*
dyn_array_get_element(
/*==================*/
/* out: pointer to element */
dyn_array_t* arr, /* in: dyn array */
ulint pos) /* in: position of element as bytes
from array start */
{
dyn_block_t* block;
ulint used;
ut_ad(arr);
ut_ad(arr->magic_n == DYN_BLOCK_MAGIC_N);
/* Get the first array block */
block = dyn_array_get_first_block(arr);
if (arr->heap != NULL) {
used = dyn_block_get_used(block);
while (pos >= used) {
pos -= used;
block = UT_LIST_GET_NEXT(list, block);
ut_ad(block);
used = dyn_block_get_used(block);
}
}
ut_ad(block);
ut_ad(dyn_block_get_used(block) >= pos);
return(block->data + pos);
}
/****************************************************************
Returns the size of stored data in a dyn array. */
UNIV_INLINE
ulint
dyn_array_get_data_size(
/*====================*/
/* out: data size in bytes */
dyn_array_t* arr) /* in: dyn array */
{
dyn_block_t* block;
ulint sum = 0;
ut_ad(arr);
ut_ad(arr->magic_n == DYN_BLOCK_MAGIC_N);
if (arr->heap == NULL) {
return(arr->used);
}
/* Get the first array block */
block = dyn_array_get_first_block(arr);
while (block != NULL) {
sum += dyn_block_get_used(block);
block = dyn_array_get_next_block(arr, block);
}
return(sum);
}
/************************************************************
Pushes n bytes to a dyn array. */
UNIV_INLINE
void
dyn_push_string(
/*============*/
dyn_array_t* arr, /* in: dyn array */
const byte* str, /* in: string to write */
ulint len) /* in: string length */
{
ulint n_copied;
while (len > 0) {
if (len > DYN_ARRAY_DATA_SIZE) {
n_copied = DYN_ARRAY_DATA_SIZE;
} else {
n_copied = len;
}
memcpy(dyn_array_push(arr, n_copied), str, n_copied);
str += n_copied;
len -= n_copied;
}
}