mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 23:34:34 +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''
551 lines
12 KiB
C
551 lines
12 KiB
C
/******************************************************
|
|
Mini-transaction log routines
|
|
|
|
(c) 1995 Innobase Oy
|
|
|
|
Created 12/7/1995 Heikki Tuuri
|
|
*******************************************************/
|
|
|
|
#include "mtr0log.h"
|
|
|
|
#ifdef UNIV_NONINL
|
|
#include "mtr0log.ic"
|
|
#endif
|
|
|
|
#include "buf0buf.h"
|
|
#include "dict0boot.h"
|
|
#include "log0recv.h"
|
|
#include "page0page.h"
|
|
|
|
/************************************************************
|
|
Catenates n bytes to the mtr log. */
|
|
|
|
void
|
|
mlog_catenate_string(
|
|
/*=================*/
|
|
mtr_t* mtr, /* in: mtr */
|
|
const byte* str, /* in: string to write */
|
|
ulint len) /* in: string length */
|
|
{
|
|
dyn_array_t* mlog;
|
|
|
|
if (mtr_get_log_mode(mtr) == MTR_LOG_NONE) {
|
|
|
|
return;
|
|
}
|
|
|
|
mlog = &(mtr->log);
|
|
|
|
dyn_push_string(mlog, str, len);
|
|
}
|
|
|
|
/************************************************************
|
|
Writes the initial part of a log record consisting of one-byte item
|
|
type and four-byte space and page numbers. Also pushes info
|
|
to the mtr memo that a buffer page has been modified. */
|
|
|
|
void
|
|
mlog_write_initial_log_record(
|
|
/*==========================*/
|
|
byte* ptr, /* in: pointer to (inside) a buffer frame holding the
|
|
file page where modification is made */
|
|
byte type, /* in: log item type: MLOG_1BYTE, ... */
|
|
mtr_t* mtr) /* in: mini-transaction handle */
|
|
{
|
|
byte* log_ptr;
|
|
|
|
ut_ad(type <= MLOG_BIGGEST_TYPE);
|
|
ut_ad(type > MLOG_8BYTES);
|
|
|
|
if (ptr < buf_pool->frame_zero || ptr >= buf_pool->high_end) {
|
|
fprintf(stderr,
|
|
"InnoDB: Error: trying to write to a stray memory location %p\n", ptr);
|
|
ut_error;
|
|
}
|
|
|
|
log_ptr = mlog_open(mtr, 11);
|
|
|
|
/* If no logging is requested, we may return now */
|
|
if (log_ptr == NULL) {
|
|
|
|
return;
|
|
}
|
|
|
|
log_ptr = mlog_write_initial_log_record_fast(ptr, type, log_ptr, mtr);
|
|
|
|
mlog_close(mtr, log_ptr);
|
|
}
|
|
|
|
/************************************************************
|
|
Parses an initial log record written by mlog_write_initial_log_record. */
|
|
|
|
byte*
|
|
mlog_parse_initial_log_record(
|
|
/*==========================*/
|
|
/* out: parsed record end, NULL if not a complete
|
|
record */
|
|
byte* ptr, /* in: buffer */
|
|
byte* end_ptr,/* in: buffer end */
|
|
byte* type, /* out: log record type: MLOG_1BYTE, ... */
|
|
ulint* space, /* out: space id */
|
|
ulint* page_no)/* out: page number */
|
|
{
|
|
if (end_ptr < ptr + 1) {
|
|
|
|
return(NULL);
|
|
}
|
|
|
|
*type = (byte)((ulint)*ptr & ~MLOG_SINGLE_REC_FLAG);
|
|
ut_ad(*type <= MLOG_BIGGEST_TYPE);
|
|
|
|
ptr++;
|
|
|
|
if (end_ptr < ptr + 2) {
|
|
|
|
return(NULL);
|
|
}
|
|
|
|
ptr = mach_parse_compressed(ptr, end_ptr, space);
|
|
|
|
if (ptr == NULL) {
|
|
|
|
return(NULL);
|
|
}
|
|
|
|
ptr = mach_parse_compressed(ptr, end_ptr, page_no);
|
|
|
|
return(ptr);
|
|
}
|
|
|
|
/************************************************************
|
|
Parses a log record written by mlog_write_ulint or mlog_write_dulint. */
|
|
|
|
byte*
|
|
mlog_parse_nbytes(
|
|
/*==============*/
|
|
/* out: parsed record end, NULL if not a complete
|
|
record or a corrupt record */
|
|
ulint type, /* in: log record type: MLOG_1BYTE, ... */
|
|
byte* ptr, /* in: buffer */
|
|
byte* end_ptr,/* in: buffer end */
|
|
byte* page) /* in: page where to apply the log record, or NULL */
|
|
{
|
|
ulint offset;
|
|
ulint val;
|
|
dulint dval;
|
|
|
|
ut_a(type <= MLOG_8BYTES);
|
|
|
|
if (end_ptr < ptr + 2) {
|
|
|
|
return(NULL);
|
|
}
|
|
|
|
offset = mach_read_from_2(ptr);
|
|
ptr += 2;
|
|
|
|
if (offset >= UNIV_PAGE_SIZE) {
|
|
recv_sys->found_corrupt_log = TRUE;
|
|
|
|
return(NULL);
|
|
}
|
|
|
|
if (type == MLOG_8BYTES) {
|
|
ptr = mach_dulint_parse_compressed(ptr, end_ptr, &dval);
|
|
|
|
if (ptr == NULL) {
|
|
|
|
return(NULL);
|
|
}
|
|
|
|
if (page) {
|
|
mach_write_to_8(page + offset, dval);
|
|
}
|
|
|
|
return(ptr);
|
|
}
|
|
|
|
ptr = mach_parse_compressed(ptr, end_ptr, &val);
|
|
|
|
if (ptr == NULL) {
|
|
|
|
return(NULL);
|
|
}
|
|
|
|
if (type == MLOG_1BYTE) {
|
|
if (val > 0xFFUL) {
|
|
recv_sys->found_corrupt_log = TRUE;
|
|
|
|
return(NULL);
|
|
}
|
|
} else if (type == MLOG_2BYTES) {
|
|
if (val > 0xFFFFUL) {
|
|
recv_sys->found_corrupt_log = TRUE;
|
|
|
|
return(NULL);
|
|
}
|
|
} else {
|
|
if (type != MLOG_4BYTES) {
|
|
recv_sys->found_corrupt_log = TRUE;
|
|
|
|
return(NULL);
|
|
}
|
|
}
|
|
|
|
if (page) {
|
|
if (type == MLOG_1BYTE) {
|
|
mach_write_to_1(page + offset, val);
|
|
} else if (type == MLOG_2BYTES) {
|
|
mach_write_to_2(page + offset, val);
|
|
} else {
|
|
ut_a(type == MLOG_4BYTES);
|
|
mach_write_to_4(page + offset, val);
|
|
}
|
|
}
|
|
|
|
return(ptr);
|
|
}
|
|
|
|
/************************************************************
|
|
Writes 1 - 4 bytes to a file page buffered in the buffer pool.
|
|
Writes the corresponding log record to the mini-transaction log. */
|
|
|
|
void
|
|
mlog_write_ulint(
|
|
/*=============*/
|
|
byte* ptr, /* in: pointer where to write */
|
|
ulint val, /* in: value to write */
|
|
byte type, /* in: MLOG_1BYTE, MLOG_2BYTES, MLOG_4BYTES */
|
|
mtr_t* mtr) /* in: mini-transaction handle */
|
|
{
|
|
byte* log_ptr;
|
|
|
|
if (ptr < buf_pool->frame_zero || ptr >= buf_pool->high_end) {
|
|
fprintf(stderr,
|
|
"InnoDB: Error: trying to write to a stray memory location %p\n", ptr);
|
|
ut_error;
|
|
}
|
|
|
|
if (type == MLOG_1BYTE) {
|
|
mach_write_to_1(ptr, val);
|
|
} else if (type == MLOG_2BYTES) {
|
|
mach_write_to_2(ptr, val);
|
|
} else {
|
|
ut_ad(type == MLOG_4BYTES);
|
|
mach_write_to_4(ptr, val);
|
|
}
|
|
|
|
log_ptr = mlog_open(mtr, 11 + 2 + 5);
|
|
|
|
/* If no logging is requested, we may return now */
|
|
if (log_ptr == NULL) {
|
|
|
|
return;
|
|
}
|
|
|
|
log_ptr = mlog_write_initial_log_record_fast(ptr, type, log_ptr, mtr);
|
|
|
|
mach_write_to_2(log_ptr, ptr - buf_frame_align(ptr));
|
|
log_ptr += 2;
|
|
|
|
log_ptr += mach_write_compressed(log_ptr, val);
|
|
|
|
mlog_close(mtr, log_ptr);
|
|
}
|
|
|
|
/************************************************************
|
|
Writes 8 bytes to a file page buffered in the buffer pool.
|
|
Writes the corresponding log record to the mini-transaction log. */
|
|
|
|
void
|
|
mlog_write_dulint(
|
|
/*==============*/
|
|
byte* ptr, /* in: pointer where to write */
|
|
dulint val, /* in: value to write */
|
|
mtr_t* mtr) /* in: mini-transaction handle */
|
|
{
|
|
byte* log_ptr;
|
|
|
|
if (ptr < buf_pool->frame_zero || ptr >= buf_pool->high_end) {
|
|
fprintf(stderr,
|
|
"InnoDB: Error: trying to write to a stray memory location %p\n", ptr);
|
|
ut_error;
|
|
}
|
|
|
|
ut_ad(ptr && mtr);
|
|
|
|
mach_write_to_8(ptr, val);
|
|
|
|
log_ptr = mlog_open(mtr, 11 + 2 + 9);
|
|
|
|
/* If no logging is requested, we may return now */
|
|
if (log_ptr == NULL) {
|
|
|
|
return;
|
|
}
|
|
|
|
log_ptr = mlog_write_initial_log_record_fast(ptr, MLOG_8BYTES,
|
|
log_ptr, mtr);
|
|
|
|
mach_write_to_2(log_ptr, ptr - buf_frame_align(ptr));
|
|
log_ptr += 2;
|
|
|
|
log_ptr += mach_dulint_write_compressed(log_ptr, val);
|
|
|
|
mlog_close(mtr, log_ptr);
|
|
}
|
|
|
|
/************************************************************
|
|
Writes a string to a file page buffered in the buffer pool. Writes the
|
|
corresponding log record to the mini-transaction log. */
|
|
|
|
void
|
|
mlog_write_string(
|
|
/*==============*/
|
|
byte* ptr, /* in: pointer where to write */
|
|
const byte* str, /* in: string to write */
|
|
ulint len, /* in: string length */
|
|
mtr_t* mtr) /* in: mini-transaction handle */
|
|
{
|
|
byte* log_ptr;
|
|
|
|
if (UNIV_UNLIKELY(ptr < buf_pool->frame_zero)
|
|
|| UNIV_UNLIKELY(ptr >= buf_pool->high_end)) {
|
|
fprintf(stderr,
|
|
"InnoDB: Error: trying to write to a stray memory location %p\n", ptr);
|
|
ut_error;
|
|
}
|
|
ut_ad(ptr && mtr);
|
|
ut_a(len < UNIV_PAGE_SIZE);
|
|
|
|
ut_memcpy(ptr, str, len);
|
|
|
|
log_ptr = mlog_open(mtr, 30);
|
|
|
|
/* If no logging is requested, we may return now */
|
|
if (log_ptr == NULL) {
|
|
|
|
return;
|
|
}
|
|
|
|
log_ptr = mlog_write_initial_log_record_fast(ptr, MLOG_WRITE_STRING,
|
|
log_ptr, mtr);
|
|
mach_write_to_2(log_ptr, ptr - buf_frame_align(ptr));
|
|
log_ptr += 2;
|
|
|
|
mach_write_to_2(log_ptr, len);
|
|
log_ptr += 2;
|
|
|
|
mlog_close(mtr, log_ptr);
|
|
|
|
mlog_catenate_string(mtr, str, len);
|
|
}
|
|
|
|
/************************************************************
|
|
Parses a log record written by mlog_write_string. */
|
|
|
|
byte*
|
|
mlog_parse_string(
|
|
/*==============*/
|
|
/* out: parsed record end, NULL if not a complete
|
|
record */
|
|
byte* ptr, /* in: buffer */
|
|
byte* end_ptr,/* in: buffer end */
|
|
byte* page) /* in: page where to apply the log record, or NULL */
|
|
{
|
|
ulint offset;
|
|
ulint len;
|
|
|
|
if (end_ptr < ptr + 4) {
|
|
|
|
return(NULL);
|
|
}
|
|
|
|
offset = mach_read_from_2(ptr);
|
|
ptr += 2;
|
|
|
|
if (offset >= UNIV_PAGE_SIZE) {
|
|
recv_sys->found_corrupt_log = TRUE;
|
|
|
|
return(NULL);
|
|
}
|
|
|
|
len = mach_read_from_2(ptr);
|
|
ptr += 2;
|
|
|
|
ut_a(len + offset < UNIV_PAGE_SIZE);
|
|
|
|
if (end_ptr < ptr + len) {
|
|
|
|
return(NULL);
|
|
}
|
|
|
|
if (page) {
|
|
ut_memcpy(page + offset, ptr, len);
|
|
}
|
|
|
|
return(ptr + len);
|
|
}
|
|
|
|
/************************************************************
|
|
Opens a buffer for mlog, writes the initial log record and,
|
|
if needed, the field lengths of an index. */
|
|
|
|
byte*
|
|
mlog_open_and_write_index(
|
|
/*======================*/
|
|
/* out: buffer, NULL if log mode
|
|
MTR_LOG_NONE */
|
|
mtr_t* mtr, /* in: mtr */
|
|
byte* rec, /* in: index record or page */
|
|
dict_index_t* index, /* in: record descriptor */
|
|
byte type, /* in: log item type */
|
|
ulint size) /* in: requested buffer size in bytes
|
|
(if 0, calls mlog_close() and returns NULL) */
|
|
{
|
|
byte* log_ptr;
|
|
const byte* log_start;
|
|
const byte* log_end;
|
|
|
|
ut_ad(!!page_rec_is_comp(rec) == dict_table_is_comp(index->table));
|
|
|
|
if (!page_rec_is_comp(rec)) {
|
|
log_start = log_ptr = mlog_open(mtr, 11 + size);
|
|
if (!log_ptr) {
|
|
return(NULL); /* logging is disabled */
|
|
}
|
|
log_ptr = mlog_write_initial_log_record_fast(rec, type,
|
|
log_ptr, mtr);
|
|
log_end = log_ptr + 11 + size;
|
|
} else {
|
|
ulint i;
|
|
ulint n = dict_index_get_n_fields(index);
|
|
/* total size needed */
|
|
ulint total = 11 + size + (n + 2) * 2;
|
|
ulint alloc = total;
|
|
/* allocate at most DYN_ARRAY_DATA_SIZE at a time */
|
|
if (alloc > DYN_ARRAY_DATA_SIZE) {
|
|
alloc = DYN_ARRAY_DATA_SIZE;
|
|
}
|
|
log_start = log_ptr = mlog_open(mtr, alloc);
|
|
if (!log_ptr) {
|
|
return(NULL); /* logging is disabled */
|
|
}
|
|
log_end = log_ptr + alloc;
|
|
log_ptr = mlog_write_initial_log_record_fast(rec, type,
|
|
log_ptr, mtr);
|
|
mach_write_to_2(log_ptr, n);
|
|
log_ptr += 2;
|
|
mach_write_to_2(log_ptr,
|
|
dict_index_get_n_unique_in_tree(index));
|
|
log_ptr += 2;
|
|
for (i = 0; i < n; i++) {
|
|
dict_field_t* field;
|
|
dtype_t* type;
|
|
ulint len;
|
|
field = dict_index_get_nth_field(index, i);
|
|
type = dict_col_get_type(dict_field_get_col(field));
|
|
len = field->fixed_len;
|
|
ut_ad(len < 0x7fff);
|
|
if (len == 0 && (dtype_get_len(type) > 255
|
|
|| dtype_get_mtype(type) == DATA_BLOB)) {
|
|
/* variable-length field
|
|
with maximum length > 255 */
|
|
len = 0x7fff;
|
|
}
|
|
if (dtype_get_prtype(type) & DATA_NOT_NULL) {
|
|
len |= 0x8000;
|
|
}
|
|
if (log_ptr + 2 > log_end) {
|
|
mlog_close(mtr, log_ptr);
|
|
ut_a(total > (ulint) (log_ptr - log_start));
|
|
total -= log_ptr - log_start;
|
|
alloc = total;
|
|
if (alloc > DYN_ARRAY_DATA_SIZE) {
|
|
alloc = DYN_ARRAY_DATA_SIZE;
|
|
}
|
|
log_start = log_ptr = mlog_open(mtr, alloc);
|
|
if (!log_ptr) {
|
|
return(NULL); /* logging is disabled */
|
|
}
|
|
log_end = log_ptr + alloc;
|
|
}
|
|
mach_write_to_2(log_ptr, len);
|
|
log_ptr += 2;
|
|
}
|
|
}
|
|
if (size == 0) {
|
|
mlog_close(mtr, log_ptr);
|
|
log_ptr = NULL;
|
|
} else if (log_ptr + size > log_end) {
|
|
mlog_close(mtr, log_ptr);
|
|
log_ptr = mlog_open(mtr, size);
|
|
}
|
|
return(log_ptr);
|
|
}
|
|
|
|
/************************************************************
|
|
Parses a log record written by mlog_open_and_write_index. */
|
|
|
|
byte*
|
|
mlog_parse_index(
|
|
/*=============*/
|
|
/* out: parsed record end,
|
|
NULL if not a complete record */
|
|
byte* ptr, /* in: buffer */
|
|
byte* end_ptr,/* in: buffer end */
|
|
/* out: new value of log_ptr */
|
|
ibool comp, /* in: TRUE=compact record format */
|
|
dict_index_t** index) /* out, own: dummy index */
|
|
{
|
|
ulint i, n, n_uniq;
|
|
dict_table_t* table;
|
|
dict_index_t* ind;
|
|
|
|
ut_ad(comp == FALSE || comp == TRUE);
|
|
|
|
if (comp) {
|
|
if (end_ptr < ptr + 4) {
|
|
return(NULL);
|
|
}
|
|
n = mach_read_from_2(ptr);
|
|
ptr += 2;
|
|
n_uniq = mach_read_from_2(ptr);
|
|
ut_ad(n_uniq <= n);
|
|
if (end_ptr < ptr + (n + 1) * 2) {
|
|
return(NULL);
|
|
}
|
|
} else {
|
|
n = n_uniq = 1;
|
|
}
|
|
table = dict_mem_table_create("LOG_DUMMY", DICT_HDR_SPACE, n,
|
|
comp ? DICT_TF_COMPACT : 0);
|
|
ind = dict_mem_index_create("LOG_DUMMY", "LOG_DUMMY",
|
|
DICT_HDR_SPACE, 0, n);
|
|
ind->table = table;
|
|
ind->n_uniq = n_uniq;
|
|
if (n_uniq != n) {
|
|
ind->type = DICT_CLUSTERED;
|
|
}
|
|
/* avoid ut_ad(index->cached) in dict_index_get_n_unique_in_tree */
|
|
ind->cached = TRUE;
|
|
if (comp) {
|
|
for (i = 0; i < n; i++) {
|
|
ulint len = mach_read_from_2(ptr += 2);
|
|
/* The high-order bit of len is the NOT NULL flag;
|
|
the rest is 0 or 0x7fff for variable-length fields,
|
|
and 1..0x7ffe for fixed-length fields. */
|
|
dict_mem_table_add_col(table, "DUMMY",
|
|
((len + 1) & 0x7fff) <= 1
|
|
? DATA_BINARY
|
|
: DATA_FIXBINARY,
|
|
len & 0x8000 ? DATA_NOT_NULL : 0,
|
|
len & 0x7fff, 0);
|
|
dict_index_add_col(ind,
|
|
dict_table_get_nth_col(table, i), 0);
|
|
}
|
|
ptr += 2;
|
|
}
|
|
*index = ind;
|
|
return(ptr);
|
|
}
|