mirror of
https://github.com/MariaDB/server.git
synced 2025-01-21 22:34:18 +01:00
050f14ac37
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''
719 lines
16 KiB
Text
719 lines
16 KiB
Text
/**********************************************************************
|
|
Utilities for converting data from the database file
|
|
to the machine format.
|
|
|
|
(c) 1995 Innobase Oy
|
|
|
|
Created 11/28/1995 Heikki Tuuri
|
|
***********************************************************************/
|
|
|
|
/***********************************************************
|
|
The following function is used to store data in one byte. */
|
|
UNIV_INLINE
|
|
void
|
|
mach_write_to_1(
|
|
/*============*/
|
|
byte* b, /* in: pointer to byte where to store */
|
|
ulint n) /* in: ulint integer to be stored, >= 0, < 256 */
|
|
{
|
|
ut_ad(b);
|
|
ut_ad(n <= 0xFFUL);
|
|
|
|
b[0] = (byte)n;
|
|
}
|
|
|
|
/************************************************************
|
|
The following function is used to fetch data from one byte. */
|
|
UNIV_INLINE
|
|
ulint
|
|
mach_read_from_1(
|
|
/*=============*/
|
|
/* out: ulint integer, >= 0, < 256 */
|
|
byte* b) /* in: pointer to byte */
|
|
{
|
|
ut_ad(b);
|
|
return((ulint)(b[0]));
|
|
}
|
|
|
|
/***********************************************************
|
|
The following function is used to store data in two consecutive
|
|
bytes. We store the most significant byte to the lowest address. */
|
|
UNIV_INLINE
|
|
void
|
|
mach_write_to_2(
|
|
/*============*/
|
|
byte* b, /* in: pointer to two bytes where to store */
|
|
ulint n) /* in: ulint integer to be stored */
|
|
{
|
|
ut_ad(b);
|
|
ut_ad(n <= 0xFFFFUL);
|
|
|
|
b[0] = (byte)(n >> 8);
|
|
b[1] = (byte)(n);
|
|
}
|
|
|
|
/************************************************************
|
|
The following function is used to fetch data from 2 consecutive
|
|
bytes. The most significant byte is at the lowest address. */
|
|
UNIV_INLINE
|
|
ulint
|
|
mach_read_from_2(
|
|
/*=============*/
|
|
/* out: ulint integer */
|
|
byte* b) /* in: pointer to 2 bytes */
|
|
{
|
|
ut_ad(b);
|
|
return( ((ulint)(b[0]) << 8)
|
|
+ (ulint)(b[1])
|
|
);
|
|
}
|
|
|
|
/************************************************************
|
|
The following function is used to convert a 16-bit data item
|
|
to the canonical format, for fast bytewise equality test
|
|
against memory. */
|
|
UNIV_INLINE
|
|
uint16
|
|
mach_encode_2(
|
|
/*==========*/
|
|
/* out: 16-bit integer in canonical format */
|
|
ulint n) /* in: integer in machine-dependent format */
|
|
{
|
|
uint16 ret;
|
|
ut_ad(2 == sizeof ret);
|
|
mach_write_to_2((byte*) &ret, n);
|
|
return(ret);
|
|
}
|
|
/************************************************************
|
|
The following function is used to convert a 16-bit data item
|
|
from the canonical format, for fast bytewise equality test
|
|
against memory. */
|
|
UNIV_INLINE
|
|
ulint
|
|
mach_decode_2(
|
|
/*==========*/
|
|
/* out: integer in machine-dependent format */
|
|
uint16 n) /* in: 16-bit integer in canonical format */
|
|
{
|
|
ut_ad(2 == sizeof n);
|
|
return(mach_read_from_2((byte*) &n));
|
|
}
|
|
|
|
/***********************************************************
|
|
The following function is used to store data in 3 consecutive
|
|
bytes. We store the most significant byte to the lowest address. */
|
|
UNIV_INLINE
|
|
void
|
|
mach_write_to_3(
|
|
/*============*/
|
|
byte* b, /* in: pointer to 3 bytes where to store */
|
|
ulint n) /* in: ulint integer to be stored */
|
|
{
|
|
ut_ad(b);
|
|
ut_ad(n <= 0xFFFFFFUL);
|
|
|
|
b[0] = (byte)(n >> 16);
|
|
b[1] = (byte)(n >> 8);
|
|
b[2] = (byte)(n);
|
|
}
|
|
|
|
/************************************************************
|
|
The following function is used to fetch data from 3 consecutive
|
|
bytes. The most significant byte is at the lowest address. */
|
|
UNIV_INLINE
|
|
ulint
|
|
mach_read_from_3(
|
|
/*=============*/
|
|
/* out: ulint integer */
|
|
byte* b) /* in: pointer to 3 bytes */
|
|
{
|
|
ut_ad(b);
|
|
return( ((ulint)(b[0]) << 16)
|
|
+ ((ulint)(b[1]) << 8)
|
|
+ (ulint)(b[2])
|
|
);
|
|
}
|
|
|
|
/***********************************************************
|
|
The following function is used to store data in four consecutive
|
|
bytes. We store the most significant byte to the lowest address. */
|
|
UNIV_INLINE
|
|
void
|
|
mach_write_to_4(
|
|
/*============*/
|
|
byte* b, /* in: pointer to four bytes where to store */
|
|
ulint n) /* in: ulint integer to be stored */
|
|
{
|
|
ut_ad(b);
|
|
|
|
#if (0 == 1) && !defined(__STDC__) && defined(UNIV_INTEL) && (UNIV_WORD_SIZE == 4) && defined(UNIV_VISUALC)
|
|
|
|
/* We do not use this even on Intel, because unaligned accesses may
|
|
be slow */
|
|
|
|
__asm MOV EAX, n
|
|
__asm BSWAP EAX /* Intel is little-endian, must swap bytes */
|
|
__asm MOV n, EAX
|
|
|
|
*((ulint*)b) = n;
|
|
#else
|
|
b[0] = (byte)(n >> 24);
|
|
b[1] = (byte)(n >> 16);
|
|
b[2] = (byte)(n >> 8);
|
|
b[3] = (byte)n;
|
|
#endif
|
|
}
|
|
|
|
/************************************************************
|
|
The following function is used to fetch data from 4 consecutive
|
|
bytes. The most significant byte is at the lowest address. */
|
|
UNIV_INLINE
|
|
ulint
|
|
mach_read_from_4(
|
|
/*=============*/
|
|
/* out: ulint integer */
|
|
byte* b) /* in: pointer to four bytes */
|
|
{
|
|
#if (0 == 1) && !defined(__STDC__) && defined(UNIV_INTEL) && (UNIV_WORD_SIZE == 4) && defined(UNIV_VISUALC)
|
|
/* We do not use this even on Intel, because unaligned accesses may
|
|
be slow */
|
|
|
|
ulint res;
|
|
|
|
ut_ad(b);
|
|
|
|
__asm MOV EDX, b
|
|
__asm MOV ECX, DWORD PTR [EDX]
|
|
__asm BSWAP ECX /* Intel is little-endian, must swap bytes */
|
|
__asm MOV res, ECX
|
|
|
|
return(res);
|
|
#else
|
|
ut_ad(b);
|
|
return( ((ulint)(b[0]) << 24)
|
|
+ ((ulint)(b[1]) << 16)
|
|
+ ((ulint)(b[2]) << 8)
|
|
+ (ulint)(b[3])
|
|
);
|
|
#endif
|
|
}
|
|
|
|
/*************************************************************
|
|
Writes a ulint in a compressed form where the first byte codes the
|
|
length of the stored ulint. We look at the most significant bits of
|
|
the byte. If the most significant bit is zero, it means 1-byte storage,
|
|
else if the 2nd bit is 0, it means 2-byte storage, else if 3rd is 0,
|
|
it means 3-byte storage, else if 4th is 0, it means 4-byte storage,
|
|
else the storage is 5-byte. */
|
|
UNIV_INLINE
|
|
ulint
|
|
mach_write_compressed(
|
|
/*==================*/
|
|
/* out: compressed size in bytes */
|
|
byte* b, /* in: pointer to memory where to store */
|
|
ulint n) /* in: ulint integer (< 2^32) to be stored */
|
|
{
|
|
ut_ad(b);
|
|
|
|
if (n < 0x80UL) {
|
|
mach_write_to_1(b, n);
|
|
return(1);
|
|
} else if (n < 0x4000UL) {
|
|
mach_write_to_2(b, n | 0x8000UL);
|
|
return(2);
|
|
} else if (n < 0x200000UL) {
|
|
mach_write_to_3(b, n | 0xC00000UL);
|
|
return(3);
|
|
} else if (n < 0x10000000UL) {
|
|
mach_write_to_4(b, n | 0xE0000000UL);
|
|
return(4);
|
|
} else {
|
|
mach_write_to_1(b, 0xF0UL);
|
|
mach_write_to_4(b + 1, n);
|
|
return(5);
|
|
}
|
|
}
|
|
|
|
/*************************************************************
|
|
Returns the size of a ulint when written in the compressed form. */
|
|
UNIV_INLINE
|
|
ulint
|
|
mach_get_compressed_size(
|
|
/*=====================*/
|
|
/* out: compressed size in bytes */
|
|
ulint n) /* in: ulint integer (< 2^32) to be stored */
|
|
{
|
|
if (n < 0x80UL) {
|
|
return(1);
|
|
} else if (n < 0x4000UL) {
|
|
return(2);
|
|
} else if (n < 0x200000UL) {
|
|
return(3);
|
|
} else if (n < 0x10000000UL) {
|
|
return(4);
|
|
} else {
|
|
return(5);
|
|
}
|
|
}
|
|
|
|
/*************************************************************
|
|
Reads a ulint in a compressed form. */
|
|
UNIV_INLINE
|
|
ulint
|
|
mach_read_compressed(
|
|
/*=================*/
|
|
/* out: read integer (< 2^32) */
|
|
byte* b) /* in: pointer to memory from where to read */
|
|
{
|
|
ulint flag;
|
|
|
|
ut_ad(b);
|
|
|
|
flag = mach_read_from_1(b);
|
|
|
|
if (flag < 0x80UL) {
|
|
return(flag);
|
|
} else if (flag < 0xC0UL) {
|
|
return(mach_read_from_2(b) & 0x7FFFUL);
|
|
} else if (flag < 0xE0UL) {
|
|
return(mach_read_from_3(b) & 0x3FFFFFUL);
|
|
} else if (flag < 0xF0UL) {
|
|
return(mach_read_from_4(b) & 0x1FFFFFFFUL);
|
|
} else {
|
|
ut_ad(flag == 0xF0UL);
|
|
return(mach_read_from_4(b + 1));
|
|
}
|
|
}
|
|
|
|
/***********************************************************
|
|
The following function is used to store data in 8 consecutive
|
|
bytes. We store the most significant byte to the lowest address. */
|
|
UNIV_INLINE
|
|
void
|
|
mach_write_to_8(
|
|
/*============*/
|
|
byte* b, /* in: pointer to 8 bytes where to store */
|
|
dulint n) /* in: dulint integer to be stored */
|
|
{
|
|
ut_ad(b);
|
|
|
|
mach_write_to_4(b, ut_dulint_get_high(n));
|
|
mach_write_to_4(b + 4, ut_dulint_get_low(n));
|
|
}
|
|
|
|
/************************************************************
|
|
The following function is used to fetch data from 8 consecutive
|
|
bytes. The most significant byte is at the lowest address. */
|
|
UNIV_INLINE
|
|
dulint
|
|
mach_read_from_8(
|
|
/*=============*/
|
|
/* out: dulint integer */
|
|
byte* b) /* in: pointer to 8 bytes */
|
|
{
|
|
ulint high;
|
|
ulint low;
|
|
|
|
ut_ad(b);
|
|
|
|
high = mach_read_from_4(b);
|
|
low = mach_read_from_4(b + 4);
|
|
|
|
return(ut_dulint_create(high, low));
|
|
}
|
|
|
|
/***********************************************************
|
|
The following function is used to store data in 7 consecutive
|
|
bytes. We store the most significant byte to the lowest address. */
|
|
UNIV_INLINE
|
|
void
|
|
mach_write_to_7(
|
|
/*============*/
|
|
byte* b, /* in: pointer to 7 bytes where to store */
|
|
dulint n) /* in: dulint integer to be stored */
|
|
{
|
|
ut_ad(b);
|
|
|
|
mach_write_to_3(b, ut_dulint_get_high(n));
|
|
mach_write_to_4(b + 3, ut_dulint_get_low(n));
|
|
}
|
|
|
|
/************************************************************
|
|
The following function is used to fetch data from 7 consecutive
|
|
bytes. The most significant byte is at the lowest address. */
|
|
UNIV_INLINE
|
|
dulint
|
|
mach_read_from_7(
|
|
/*=============*/
|
|
/* out: dulint integer */
|
|
byte* b) /* in: pointer to 7 bytes */
|
|
{
|
|
ulint high;
|
|
ulint low;
|
|
|
|
ut_ad(b);
|
|
|
|
high = mach_read_from_3(b);
|
|
low = mach_read_from_4(b + 3);
|
|
|
|
return(ut_dulint_create(high, low));
|
|
}
|
|
|
|
/***********************************************************
|
|
The following function is used to store data in 6 consecutive
|
|
bytes. We store the most significant byte to the lowest address. */
|
|
UNIV_INLINE
|
|
void
|
|
mach_write_to_6(
|
|
/*============*/
|
|
byte* b, /* in: pointer to 6 bytes where to store */
|
|
dulint n) /* in: dulint integer to be stored */
|
|
{
|
|
ut_ad(b);
|
|
|
|
mach_write_to_2(b, ut_dulint_get_high(n));
|
|
mach_write_to_4(b + 2, ut_dulint_get_low(n));
|
|
}
|
|
|
|
/************************************************************
|
|
The following function is used to fetch data from 6 consecutive
|
|
bytes. The most significant byte is at the lowest address. */
|
|
UNIV_INLINE
|
|
dulint
|
|
mach_read_from_6(
|
|
/*=============*/
|
|
/* out: dulint integer */
|
|
byte* b) /* in: pointer to 7 bytes */
|
|
{
|
|
ulint high;
|
|
ulint low;
|
|
|
|
ut_ad(b);
|
|
|
|
high = mach_read_from_2(b);
|
|
low = mach_read_from_4(b + 2);
|
|
|
|
return(ut_dulint_create(high, low));
|
|
}
|
|
|
|
/*************************************************************
|
|
Writes a dulint in a compressed form (5..9 bytes). */
|
|
UNIV_INLINE
|
|
ulint
|
|
mach_dulint_write_compressed(
|
|
/*=========================*/
|
|
/* out: size in bytes */
|
|
byte* b, /* in: pointer to memory where to store */
|
|
dulint n) /* in: dulint integer to be stored */
|
|
{
|
|
ulint size;
|
|
|
|
ut_ad(b);
|
|
|
|
size = mach_write_compressed(b, ut_dulint_get_high(n));
|
|
mach_write_to_4(b + size, ut_dulint_get_low(n));
|
|
|
|
return(size + 4);
|
|
}
|
|
|
|
/*************************************************************
|
|
Returns the size of a dulint when written in the compressed form. */
|
|
UNIV_INLINE
|
|
ulint
|
|
mach_dulint_get_compressed_size(
|
|
/*============================*/
|
|
/* out: compressed size in bytes */
|
|
dulint n) /* in: dulint integer to be stored */
|
|
{
|
|
return(4 + mach_get_compressed_size(ut_dulint_get_high(n)));
|
|
}
|
|
|
|
/*************************************************************
|
|
Reads a dulint in a compressed form. */
|
|
UNIV_INLINE
|
|
dulint
|
|
mach_dulint_read_compressed(
|
|
/*========================*/
|
|
/* out: read dulint */
|
|
byte* b) /* in: pointer to memory from where to read */
|
|
{
|
|
ulint high;
|
|
ulint low;
|
|
ulint size;
|
|
|
|
ut_ad(b);
|
|
|
|
high = mach_read_compressed(b);
|
|
|
|
size = mach_get_compressed_size(high);
|
|
|
|
low = mach_read_from_4(b + size);
|
|
|
|
return(ut_dulint_create(high, low));
|
|
}
|
|
|
|
/*************************************************************
|
|
Writes a dulint in a compressed form (1..11 bytes). */
|
|
UNIV_INLINE
|
|
ulint
|
|
mach_dulint_write_much_compressed(
|
|
/*==============================*/
|
|
/* out: size in bytes */
|
|
byte* b, /* in: pointer to memory where to store */
|
|
dulint n) /* in: dulint integer to be stored */
|
|
{
|
|
ulint size;
|
|
|
|
ut_ad(b);
|
|
|
|
if (ut_dulint_get_high(n) == 0) {
|
|
return(mach_write_compressed(b, ut_dulint_get_low(n)));
|
|
}
|
|
|
|
*b = (byte)0xFF;
|
|
size = 1 + mach_write_compressed(b + 1, ut_dulint_get_high(n));
|
|
|
|
size += mach_write_compressed(b + size, ut_dulint_get_low(n));
|
|
|
|
return(size);
|
|
}
|
|
|
|
/*************************************************************
|
|
Returns the size of a dulint when written in the compressed form. */
|
|
UNIV_INLINE
|
|
ulint
|
|
mach_dulint_get_much_compressed_size(
|
|
/*=================================*/
|
|
/* out: compressed size in bytes */
|
|
dulint n) /* in: dulint integer to be stored */
|
|
{
|
|
if (0 == ut_dulint_get_high(n)) {
|
|
return(mach_get_compressed_size(ut_dulint_get_low(n)));
|
|
}
|
|
|
|
return(1 + mach_get_compressed_size(ut_dulint_get_high(n))
|
|
+ mach_get_compressed_size(ut_dulint_get_low(n)));
|
|
}
|
|
|
|
/*************************************************************
|
|
Reads a dulint in a compressed form. */
|
|
UNIV_INLINE
|
|
dulint
|
|
mach_dulint_read_much_compressed(
|
|
/*=============================*/
|
|
/* out: read dulint */
|
|
byte* b) /* in: pointer to memory from where to read */
|
|
{
|
|
ulint high;
|
|
ulint low;
|
|
ulint size;
|
|
|
|
ut_ad(b);
|
|
|
|
if (*b != (byte)0xFF) {
|
|
high = 0;
|
|
size = 0;
|
|
} else {
|
|
high = mach_read_compressed(b + 1);
|
|
|
|
size = 1 + mach_get_compressed_size(high);
|
|
}
|
|
|
|
low = mach_read_compressed(b + size);
|
|
|
|
return(ut_dulint_create(high, low));
|
|
}
|
|
|
|
/*************************************************************
|
|
Reads a double. It is stored in a little-endian format. */
|
|
UNIV_INLINE
|
|
double
|
|
mach_double_read(
|
|
/*=============*/
|
|
/* out: double read */
|
|
byte* b) /* in: pointer to memory from where to read */
|
|
{
|
|
double d;
|
|
ulint i;
|
|
byte* ptr;
|
|
|
|
ptr = (byte*)&d;
|
|
|
|
for (i = 0; i < sizeof(double); i++) {
|
|
#ifdef WORDS_BIGENDIAN
|
|
ptr[sizeof(double) - i - 1] = b[i];
|
|
#else
|
|
ptr[i] = b[i];
|
|
#endif
|
|
}
|
|
|
|
return(d);
|
|
}
|
|
|
|
/*************************************************************
|
|
Writes a double. It is stored in a little-endian format. */
|
|
UNIV_INLINE
|
|
void
|
|
mach_double_write(
|
|
/*==============*/
|
|
byte* b, /* in: pointer to memory where to write */
|
|
double d) /* in: double */
|
|
{
|
|
ulint i;
|
|
byte* ptr;
|
|
|
|
ptr = (byte*)&d;
|
|
|
|
for (i = 0; i < sizeof(double); i++) {
|
|
#ifdef WORDS_BIGENDIAN
|
|
b[i] = ptr[sizeof(double) - i - 1];
|
|
#else
|
|
b[i] = ptr[i];
|
|
#endif
|
|
}
|
|
}
|
|
|
|
/*************************************************************
|
|
Reads a float. It is stored in a little-endian format. */
|
|
UNIV_INLINE
|
|
float
|
|
mach_float_read(
|
|
/*============*/
|
|
/* out: float read */
|
|
byte* b) /* in: pointer to memory from where to read */
|
|
{
|
|
float d;
|
|
ulint i;
|
|
byte* ptr;
|
|
|
|
ptr = (byte*)&d;
|
|
|
|
for (i = 0; i < sizeof(float); i++) {
|
|
#ifdef WORDS_BIGENDIAN
|
|
ptr[sizeof(float) - i - 1] = b[i];
|
|
#else
|
|
ptr[i] = b[i];
|
|
#endif
|
|
}
|
|
|
|
return(d);
|
|
}
|
|
|
|
/*************************************************************
|
|
Writes a float. It is stored in a little-endian format. */
|
|
UNIV_INLINE
|
|
void
|
|
mach_float_write(
|
|
/*=============*/
|
|
byte* b, /* in: pointer to memory where to write */
|
|
float d) /* in: float */
|
|
{
|
|
ulint i;
|
|
byte* ptr;
|
|
|
|
ptr = (byte*)&d;
|
|
|
|
for (i = 0; i < sizeof(float); i++) {
|
|
#ifdef WORDS_BIGENDIAN
|
|
b[i] = ptr[sizeof(float) - i - 1];
|
|
#else
|
|
b[i] = ptr[i];
|
|
#endif
|
|
}
|
|
}
|
|
|
|
/*************************************************************
|
|
Reads a ulint stored in the little-endian format. */
|
|
UNIV_INLINE
|
|
ulint
|
|
mach_read_from_n_little_endian(
|
|
/*===========================*/
|
|
/* out: unsigned long int */
|
|
byte* buf, /* in: from where to read */
|
|
ulint buf_size) /* in: from how many bytes to read */
|
|
{
|
|
ulint n = 0;
|
|
byte* ptr;
|
|
|
|
ut_ad(buf_size <= sizeof(ulint));
|
|
ut_ad(buf_size > 0);
|
|
|
|
ptr = buf + buf_size;
|
|
|
|
for (;;) {
|
|
ptr--;
|
|
|
|
n = n << 8;
|
|
|
|
n += (ulint)(*ptr);
|
|
|
|
if (ptr == buf) {
|
|
break;
|
|
}
|
|
}
|
|
|
|
return(n);
|
|
}
|
|
|
|
/*************************************************************
|
|
Writes a ulint in the little-endian format. */
|
|
UNIV_INLINE
|
|
void
|
|
mach_write_to_n_little_endian(
|
|
/*==========================*/
|
|
byte* dest, /* in: where to write */
|
|
ulint dest_size, /* in: into how many bytes to write */
|
|
ulint n) /* in: unsigned long int to write */
|
|
{
|
|
byte* end;
|
|
|
|
ut_ad(dest_size <= sizeof(ulint));
|
|
ut_ad(dest_size > 0);
|
|
|
|
end = dest + dest_size;
|
|
|
|
for (;;) {
|
|
*dest = (byte)(n & 0xFF);
|
|
|
|
n = n >> 8;
|
|
|
|
dest++;
|
|
|
|
if (dest == end) {
|
|
break;
|
|
}
|
|
}
|
|
|
|
ut_ad(n == 0);
|
|
}
|
|
|
|
/*************************************************************
|
|
Reads a ulint stored in the little-endian format. */
|
|
UNIV_INLINE
|
|
ulint
|
|
mach_read_from_2_little_endian(
|
|
/*===========================*/
|
|
/* out: unsigned long int */
|
|
byte* buf) /* in: from where to read */
|
|
{
|
|
return((ulint)(*buf) + ((ulint)(*(buf + 1))) * 256);
|
|
}
|
|
|
|
/*************************************************************
|
|
Writes a ulint in the little-endian format. */
|
|
UNIV_INLINE
|
|
void
|
|
mach_write_to_2_little_endian(
|
|
/*==========================*/
|
|
byte* dest, /* in: where to write */
|
|
ulint n) /* in: unsigned long int to write */
|
|
{
|
|
ut_ad(n < 256 * 256);
|
|
|
|
*dest = (byte)(n & 0xFFUL);
|
|
|
|
n = n >> 8;
|
|
dest++;
|
|
|
|
*dest = (byte)(n & 0xFFUL);
|
|
}
|