mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +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''
564 lines
16 KiB
C
564 lines
16 KiB
C
/******************************************************
|
|
The index tree persistent cursor
|
|
|
|
(c) 1996 Innobase Oy
|
|
|
|
Created 2/23/1996 Heikki Tuuri
|
|
*******************************************************/
|
|
|
|
#include "btr0pcur.h"
|
|
|
|
#ifdef UNIV_NONINL
|
|
#include "btr0pcur.ic"
|
|
#endif
|
|
|
|
#include "ut0byte.h"
|
|
#include "rem0cmp.h"
|
|
#include "trx0trx.h"
|
|
|
|
/******************************************************************
|
|
Allocates memory for a persistent cursor object and initializes the cursor. */
|
|
|
|
btr_pcur_t*
|
|
btr_pcur_create_for_mysql(void)
|
|
/*============================*/
|
|
/* out, own: persistent cursor */
|
|
{
|
|
btr_pcur_t* pcur;
|
|
|
|
pcur = mem_alloc(sizeof(btr_pcur_t));
|
|
|
|
pcur->btr_cur.index = NULL;
|
|
btr_pcur_init(pcur);
|
|
|
|
return(pcur);
|
|
}
|
|
|
|
/******************************************************************
|
|
Frees the memory for a persistent cursor object. */
|
|
|
|
void
|
|
btr_pcur_free_for_mysql(
|
|
/*====================*/
|
|
btr_pcur_t* cursor) /* in, own: persistent cursor */
|
|
{
|
|
if (cursor->old_rec_buf != NULL) {
|
|
|
|
mem_free(cursor->old_rec_buf);
|
|
|
|
cursor->old_rec_buf = NULL;
|
|
}
|
|
|
|
cursor->btr_cur.page_cur.rec = NULL;
|
|
cursor->old_rec = NULL;
|
|
cursor->old_n_fields = 0;
|
|
cursor->old_stored = BTR_PCUR_OLD_NOT_STORED;
|
|
|
|
cursor->latch_mode = BTR_NO_LATCHES;
|
|
cursor->pos_state = BTR_PCUR_NOT_POSITIONED;
|
|
|
|
mem_free(cursor);
|
|
}
|
|
|
|
/******************************************************************
|
|
The position of the cursor is stored by taking an initial segment of the
|
|
record the cursor is positioned on, before, or after, and copying it to the
|
|
cursor data structure, or just setting a flag if the cursor id before the
|
|
first in an EMPTY tree, or after the last in an EMPTY tree. NOTE that the
|
|
page where the cursor is positioned must not be empty if the index tree is
|
|
not totally empty! */
|
|
|
|
void
|
|
btr_pcur_store_position(
|
|
/*====================*/
|
|
btr_pcur_t* cursor, /* in: persistent cursor */
|
|
mtr_t* mtr) /* in: mtr */
|
|
{
|
|
page_cur_t* page_cursor;
|
|
rec_t* rec;
|
|
dict_tree_t* tree;
|
|
page_t* page;
|
|
ulint offs;
|
|
|
|
ut_a(cursor->pos_state == BTR_PCUR_IS_POSITIONED);
|
|
ut_ad(cursor->latch_mode != BTR_NO_LATCHES);
|
|
|
|
tree = btr_cur_get_tree(btr_pcur_get_btr_cur(cursor));
|
|
|
|
page_cursor = btr_pcur_get_page_cur(cursor);
|
|
|
|
rec = page_cur_get_rec(page_cursor);
|
|
page = ut_align_down(rec, UNIV_PAGE_SIZE);
|
|
offs = ut_align_offset(rec, UNIV_PAGE_SIZE);
|
|
|
|
ut_ad(mtr_memo_contains(mtr, buf_block_align(page),
|
|
MTR_MEMO_PAGE_S_FIX)
|
|
|| mtr_memo_contains(mtr, buf_block_align(page),
|
|
MTR_MEMO_PAGE_X_FIX));
|
|
ut_a(cursor->latch_mode != BTR_NO_LATCHES);
|
|
|
|
if (UNIV_UNLIKELY(page_get_n_recs(page) == 0)) {
|
|
/* It must be an empty index tree; NOTE that in this case
|
|
we do not store the modify_clock, but always do a search
|
|
if we restore the cursor position */
|
|
|
|
ut_a(btr_page_get_next(page, mtr) == FIL_NULL);
|
|
ut_a(btr_page_get_prev(page, mtr) == FIL_NULL);
|
|
|
|
cursor->old_stored = BTR_PCUR_OLD_STORED;
|
|
|
|
if (page_rec_is_supremum_low(offs)) {
|
|
|
|
cursor->rel_pos = BTR_PCUR_AFTER_LAST_IN_TREE;
|
|
} else {
|
|
cursor->rel_pos = BTR_PCUR_BEFORE_FIRST_IN_TREE;
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
if (page_rec_is_supremum_low(offs)) {
|
|
|
|
rec = page_rec_get_prev(rec);
|
|
|
|
cursor->rel_pos = BTR_PCUR_AFTER;
|
|
|
|
} else if (page_rec_is_infimum_low(offs)) {
|
|
|
|
rec = page_rec_get_next(rec);
|
|
|
|
cursor->rel_pos = BTR_PCUR_BEFORE;
|
|
} else {
|
|
cursor->rel_pos = BTR_PCUR_ON;
|
|
}
|
|
|
|
cursor->old_stored = BTR_PCUR_OLD_STORED;
|
|
cursor->old_rec = dict_tree_copy_rec_order_prefix(tree, rec,
|
|
&cursor->old_n_fields,
|
|
&cursor->old_rec_buf,
|
|
&cursor->buf_size);
|
|
|
|
cursor->block_when_stored = buf_block_align(page);
|
|
cursor->modify_clock = buf_block_get_modify_clock(
|
|
cursor->block_when_stored);
|
|
}
|
|
|
|
/******************************************************************
|
|
Copies the stored position of a pcur to another pcur. */
|
|
|
|
void
|
|
btr_pcur_copy_stored_position(
|
|
/*==========================*/
|
|
btr_pcur_t* pcur_receive, /* in: pcur which will receive the
|
|
position info */
|
|
btr_pcur_t* pcur_donate) /* in: pcur from which the info is
|
|
copied */
|
|
{
|
|
if (pcur_receive->old_rec_buf) {
|
|
mem_free(pcur_receive->old_rec_buf);
|
|
}
|
|
|
|
ut_memcpy(pcur_receive, pcur_donate, sizeof(btr_pcur_t));
|
|
|
|
if (pcur_donate->old_rec_buf) {
|
|
|
|
pcur_receive->old_rec_buf = mem_alloc(pcur_donate->buf_size);
|
|
|
|
ut_memcpy(pcur_receive->old_rec_buf, pcur_donate->old_rec_buf,
|
|
pcur_donate->buf_size);
|
|
pcur_receive->old_rec = pcur_receive->old_rec_buf
|
|
+ (pcur_donate->old_rec - pcur_donate->old_rec_buf);
|
|
}
|
|
|
|
pcur_receive->old_n_fields = pcur_donate->old_n_fields;
|
|
}
|
|
|
|
/******************************************************************
|
|
Restores the stored position of a persistent cursor bufferfixing the page and
|
|
obtaining the specified latches. If the cursor position was saved when the
|
|
(1) cursor was positioned on a user record: this function restores the position
|
|
to the last record LESS OR EQUAL to the stored record;
|
|
(2) cursor was positioned on a page infimum record: restores the position to
|
|
the last record LESS than the user record which was the successor of the page
|
|
infimum;
|
|
(3) cursor was positioned on the page supremum: restores to the first record
|
|
GREATER than the user record which was the predecessor of the supremum.
|
|
(4) cursor was positioned before the first or after the last in an empty tree:
|
|
restores to before first or after the last in the tree. */
|
|
|
|
ibool
|
|
btr_pcur_restore_position(
|
|
/*======================*/
|
|
/* out: TRUE if the cursor position
|
|
was stored when it was on a user record
|
|
and it can be restored on a user record
|
|
whose ordering fields are identical to
|
|
the ones of the original user record */
|
|
ulint latch_mode, /* in: BTR_SEARCH_LEAF, ... */
|
|
btr_pcur_t* cursor, /* in: detached persistent cursor */
|
|
mtr_t* mtr) /* in: mtr */
|
|
{
|
|
dict_tree_t* tree;
|
|
page_t* page;
|
|
dtuple_t* tuple;
|
|
ulint mode;
|
|
ulint old_mode;
|
|
mem_heap_t* heap;
|
|
|
|
if (UNIV_UNLIKELY(cursor->old_stored != BTR_PCUR_OLD_STORED)
|
|
|| UNIV_UNLIKELY(cursor->pos_state != BTR_PCUR_WAS_POSITIONED
|
|
&& cursor->pos_state != BTR_PCUR_IS_POSITIONED)) {
|
|
ut_print_buf(stderr, cursor, sizeof(btr_pcur_t));
|
|
if (cursor->trx_if_known) {
|
|
trx_print(stderr, cursor->trx_if_known, 0);
|
|
}
|
|
|
|
ut_error;
|
|
}
|
|
|
|
if (UNIV_UNLIKELY(cursor->rel_pos == BTR_PCUR_AFTER_LAST_IN_TREE
|
|
|| cursor->rel_pos == BTR_PCUR_BEFORE_FIRST_IN_TREE)) {
|
|
|
|
/* In these cases we do not try an optimistic restoration,
|
|
but always do a search */
|
|
|
|
btr_cur_open_at_index_side(
|
|
cursor->rel_pos == BTR_PCUR_BEFORE_FIRST_IN_TREE,
|
|
btr_pcur_get_btr_cur(cursor)->index, latch_mode,
|
|
btr_pcur_get_btr_cur(cursor), mtr);
|
|
|
|
cursor->block_when_stored =
|
|
buf_block_align(btr_pcur_get_page(cursor));
|
|
|
|
return(FALSE);
|
|
}
|
|
|
|
ut_a(cursor->old_rec);
|
|
ut_a(cursor->old_n_fields);
|
|
|
|
page = btr_cur_get_page(btr_pcur_get_btr_cur(cursor));
|
|
|
|
if (UNIV_LIKELY(latch_mode == BTR_SEARCH_LEAF)
|
|
|| UNIV_LIKELY(latch_mode == BTR_MODIFY_LEAF)) {
|
|
/* Try optimistic restoration */
|
|
|
|
if (UNIV_LIKELY(buf_page_optimistic_get(latch_mode,
|
|
cursor->block_when_stored, page,
|
|
cursor->modify_clock, mtr))) {
|
|
cursor->pos_state = BTR_PCUR_IS_POSITIONED;
|
|
#ifdef UNIV_SYNC_DEBUG
|
|
buf_page_dbg_add_level(page, SYNC_TREE_NODE);
|
|
#endif /* UNIV_SYNC_DEBUG */
|
|
if (cursor->rel_pos == BTR_PCUR_ON) {
|
|
#ifdef UNIV_DEBUG
|
|
rec_t* rec;
|
|
ulint* offsets1;
|
|
ulint* offsets2;
|
|
dict_index_t* index;
|
|
#endif /* UNIV_DEBUG */
|
|
cursor->latch_mode = latch_mode;
|
|
#ifdef UNIV_DEBUG
|
|
rec = btr_pcur_get_rec(cursor);
|
|
index = dict_tree_find_index(
|
|
btr_cur_get_tree(
|
|
btr_pcur_get_btr_cur(cursor)),
|
|
rec);
|
|
|
|
heap = mem_heap_create(256);
|
|
offsets1 = rec_get_offsets(cursor->old_rec,
|
|
index, NULL,
|
|
cursor->old_n_fields, &heap);
|
|
offsets2 = rec_get_offsets(rec, index, NULL,
|
|
cursor->old_n_fields, &heap);
|
|
|
|
ut_ad(cmp_rec_rec(cursor->old_rec,
|
|
rec, offsets1, offsets2, index) == 0);
|
|
mem_heap_free(heap);
|
|
#endif /* UNIV_DEBUG */
|
|
return(TRUE);
|
|
}
|
|
|
|
return(FALSE);
|
|
}
|
|
}
|
|
|
|
/* If optimistic restoration did not succeed, open the cursor anew */
|
|
|
|
heap = mem_heap_create(256);
|
|
|
|
tree = btr_cur_get_tree(btr_pcur_get_btr_cur(cursor));
|
|
tuple = dict_tree_build_data_tuple(tree, cursor->old_rec,
|
|
cursor->old_n_fields, heap);
|
|
|
|
/* Save the old search mode of the cursor */
|
|
old_mode = cursor->search_mode;
|
|
|
|
if (UNIV_LIKELY(cursor->rel_pos == BTR_PCUR_ON)) {
|
|
mode = PAGE_CUR_LE;
|
|
} else if (cursor->rel_pos == BTR_PCUR_AFTER) {
|
|
mode = PAGE_CUR_G;
|
|
} else {
|
|
ut_ad(cursor->rel_pos == BTR_PCUR_BEFORE);
|
|
mode = PAGE_CUR_L;
|
|
}
|
|
|
|
btr_pcur_open_with_no_init(btr_pcur_get_btr_cur(cursor)->index, tuple,
|
|
mode, latch_mode, cursor, 0, mtr);
|
|
|
|
/* Restore the old search mode */
|
|
cursor->search_mode = old_mode;
|
|
|
|
if (cursor->rel_pos == BTR_PCUR_ON
|
|
&& btr_pcur_is_on_user_rec(cursor, mtr)
|
|
&& 0 == cmp_dtuple_rec(tuple, btr_pcur_get_rec(cursor),
|
|
rec_get_offsets(btr_pcur_get_rec(cursor),
|
|
btr_pcur_get_btr_cur(cursor)->index,
|
|
NULL, ULINT_UNDEFINED, &heap))) {
|
|
|
|
/* We have to store the NEW value for the modify clock, since
|
|
the cursor can now be on a different page! But we can retain
|
|
the value of old_rec */
|
|
|
|
cursor->block_when_stored =
|
|
buf_block_align(btr_pcur_get_page(cursor));
|
|
cursor->modify_clock =
|
|
buf_block_get_modify_clock(cursor->block_when_stored);
|
|
cursor->old_stored = BTR_PCUR_OLD_STORED;
|
|
|
|
mem_heap_free(heap);
|
|
|
|
return(TRUE);
|
|
}
|
|
|
|
mem_heap_free(heap);
|
|
|
|
/* We have to store new position information, modify_clock etc.,
|
|
to the cursor because it can now be on a different page, the record
|
|
under it may have been removed, etc. */
|
|
|
|
btr_pcur_store_position(cursor, mtr);
|
|
|
|
return(FALSE);
|
|
}
|
|
|
|
/******************************************************************
|
|
If the latch mode of the cursor is BTR_LEAF_SEARCH or BTR_LEAF_MODIFY,
|
|
releases the page latch and bufferfix reserved by the cursor.
|
|
NOTE! In the case of BTR_LEAF_MODIFY, there should not exist changes
|
|
made by the current mini-transaction to the data protected by the
|
|
cursor latch, as then the latch must not be released until mtr_commit. */
|
|
|
|
void
|
|
btr_pcur_release_leaf(
|
|
/*==================*/
|
|
btr_pcur_t* cursor, /* in: persistent cursor */
|
|
mtr_t* mtr) /* in: mtr */
|
|
{
|
|
page_t* page;
|
|
|
|
ut_a(cursor->pos_state == BTR_PCUR_IS_POSITIONED);
|
|
ut_ad(cursor->latch_mode != BTR_NO_LATCHES);
|
|
|
|
page = btr_cur_get_page(btr_pcur_get_btr_cur(cursor));
|
|
|
|
btr_leaf_page_release(page, cursor->latch_mode, mtr);
|
|
|
|
cursor->latch_mode = BTR_NO_LATCHES;
|
|
|
|
cursor->pos_state = BTR_PCUR_WAS_POSITIONED;
|
|
}
|
|
|
|
/*************************************************************
|
|
Moves the persistent cursor to the first record on the next page. Releases the
|
|
latch on the current page, and bufferunfixes it. Note that there must not be
|
|
modifications on the current page, as then the x-latch can be released only in
|
|
mtr_commit. */
|
|
|
|
void
|
|
btr_pcur_move_to_next_page(
|
|
/*=======================*/
|
|
btr_pcur_t* cursor, /* in: persistent cursor; must be on the
|
|
last record of the current page */
|
|
mtr_t* mtr) /* in: mtr */
|
|
{
|
|
ulint next_page_no;
|
|
ulint space;
|
|
page_t* page;
|
|
page_t* next_page;
|
|
|
|
ut_a(cursor->pos_state == BTR_PCUR_IS_POSITIONED);
|
|
ut_ad(cursor->latch_mode != BTR_NO_LATCHES);
|
|
ut_ad(btr_pcur_is_after_last_on_page(cursor, mtr));
|
|
|
|
cursor->old_stored = BTR_PCUR_OLD_NOT_STORED;
|
|
|
|
page = btr_pcur_get_page(cursor);
|
|
|
|
next_page_no = btr_page_get_next(page, mtr);
|
|
space = buf_frame_get_space_id(page);
|
|
|
|
ut_ad(next_page_no != FIL_NULL);
|
|
|
|
next_page = btr_page_get(space, next_page_no, cursor->latch_mode, mtr);
|
|
ut_a(page_is_comp(next_page) == page_is_comp(page));
|
|
buf_block_align(next_page)->check_index_page_at_flush = TRUE;
|
|
|
|
btr_leaf_page_release(page, cursor->latch_mode, mtr);
|
|
|
|
page_cur_set_before_first(next_page, btr_pcur_get_page_cur(cursor));
|
|
|
|
page_check_dir(next_page);
|
|
}
|
|
|
|
/*************************************************************
|
|
Moves the persistent cursor backward if it is on the first record of the page.
|
|
Commits mtr. Note that to prevent a possible deadlock, the operation
|
|
first stores the position of the cursor, commits mtr, acquires the necessary
|
|
latches and restores the cursor position again before returning. The
|
|
alphabetical position of the cursor is guaranteed to be sensible on
|
|
return, but it may happen that the cursor is not positioned on the last
|
|
record of any page, because the structure of the tree may have changed
|
|
during the time when the cursor had no latches. */
|
|
|
|
void
|
|
btr_pcur_move_backward_from_page(
|
|
/*=============================*/
|
|
btr_pcur_t* cursor, /* in: persistent cursor, must be on the first
|
|
record of the current page */
|
|
mtr_t* mtr) /* in: mtr */
|
|
{
|
|
ulint prev_page_no;
|
|
ulint space;
|
|
page_t* page;
|
|
page_t* prev_page;
|
|
ulint latch_mode;
|
|
ulint latch_mode2;
|
|
|
|
ut_a(cursor->pos_state == BTR_PCUR_IS_POSITIONED);
|
|
ut_ad(cursor->latch_mode != BTR_NO_LATCHES);
|
|
ut_ad(btr_pcur_is_before_first_on_page(cursor, mtr));
|
|
ut_ad(!btr_pcur_is_before_first_in_tree(cursor, mtr));
|
|
|
|
latch_mode = cursor->latch_mode;
|
|
|
|
if (latch_mode == BTR_SEARCH_LEAF) {
|
|
|
|
latch_mode2 = BTR_SEARCH_PREV;
|
|
|
|
} else if (latch_mode == BTR_MODIFY_LEAF) {
|
|
|
|
latch_mode2 = BTR_MODIFY_PREV;
|
|
} else {
|
|
latch_mode2 = 0; /* To eliminate compiler warning */
|
|
ut_error;
|
|
}
|
|
|
|
btr_pcur_store_position(cursor, mtr);
|
|
|
|
mtr_commit(mtr);
|
|
|
|
mtr_start(mtr);
|
|
|
|
btr_pcur_restore_position(latch_mode2, cursor, mtr);
|
|
|
|
page = btr_pcur_get_page(cursor);
|
|
|
|
prev_page_no = btr_page_get_prev(page, mtr);
|
|
space = buf_frame_get_space_id(page);
|
|
|
|
if (btr_pcur_is_before_first_on_page(cursor, mtr)
|
|
&& (prev_page_no != FIL_NULL)) {
|
|
|
|
prev_page = btr_pcur_get_btr_cur(cursor)->left_page;
|
|
|
|
btr_leaf_page_release(page, latch_mode, mtr);
|
|
|
|
page_cur_set_after_last(prev_page,
|
|
btr_pcur_get_page_cur(cursor));
|
|
} else if (prev_page_no != FIL_NULL) {
|
|
|
|
/* The repositioned cursor did not end on an infimum record on
|
|
a page. Cursor repositioning acquired a latch also on the
|
|
previous page, but we do not need the latch: release it. */
|
|
|
|
prev_page = btr_pcur_get_btr_cur(cursor)->left_page;
|
|
|
|
btr_leaf_page_release(prev_page, latch_mode, mtr);
|
|
}
|
|
|
|
cursor->latch_mode = latch_mode;
|
|
|
|
cursor->old_stored = BTR_PCUR_OLD_NOT_STORED;
|
|
}
|
|
|
|
/*************************************************************
|
|
Moves the persistent cursor to the previous record in the tree. If no records
|
|
are left, the cursor stays 'before first in tree'. */
|
|
|
|
ibool
|
|
btr_pcur_move_to_prev(
|
|
/*==================*/
|
|
/* out: TRUE if the cursor was not before first
|
|
in tree */
|
|
btr_pcur_t* cursor, /* in: persistent cursor; NOTE that the
|
|
function may release the page latch */
|
|
mtr_t* mtr) /* in: mtr */
|
|
{
|
|
ut_ad(cursor->pos_state == BTR_PCUR_IS_POSITIONED);
|
|
ut_ad(cursor->latch_mode != BTR_NO_LATCHES);
|
|
|
|
cursor->old_stored = BTR_PCUR_OLD_NOT_STORED;
|
|
|
|
if (btr_pcur_is_before_first_on_page(cursor, mtr)) {
|
|
|
|
if (btr_pcur_is_before_first_in_tree(cursor, mtr)) {
|
|
|
|
return(FALSE);
|
|
}
|
|
|
|
btr_pcur_move_backward_from_page(cursor, mtr);
|
|
|
|
return(TRUE);
|
|
}
|
|
|
|
btr_pcur_move_to_prev_on_page(cursor, mtr);
|
|
|
|
return(TRUE);
|
|
}
|
|
|
|
/******************************************************************
|
|
If mode is PAGE_CUR_G or PAGE_CUR_GE, opens a persistent cursor on the first
|
|
user record satisfying the search condition, in the case PAGE_CUR_L or
|
|
PAGE_CUR_LE, on the last user record. If no such user record exists, then
|
|
in the first case sets the cursor after last in tree, and in the latter case
|
|
before first in tree. The latching mode must be BTR_SEARCH_LEAF or
|
|
BTR_MODIFY_LEAF. */
|
|
|
|
void
|
|
btr_pcur_open_on_user_rec(
|
|
/*======================*/
|
|
dict_index_t* index, /* in: index */
|
|
dtuple_t* tuple, /* in: tuple on which search done */
|
|
ulint mode, /* in: PAGE_CUR_L, ... */
|
|
ulint latch_mode, /* in: BTR_SEARCH_LEAF or
|
|
BTR_MODIFY_LEAF */
|
|
btr_pcur_t* cursor, /* in: memory buffer for persistent
|
|
cursor */
|
|
mtr_t* mtr) /* in: mtr */
|
|
{
|
|
btr_pcur_open(index, tuple, mode, latch_mode, cursor, mtr);
|
|
|
|
if ((mode == PAGE_CUR_GE) || (mode == PAGE_CUR_G)) {
|
|
|
|
if (btr_pcur_is_after_last_on_page(cursor, mtr)) {
|
|
|
|
btr_pcur_move_to_next_user_rec(cursor, mtr);
|
|
}
|
|
} else {
|
|
ut_ad((mode == PAGE_CUR_LE) || (mode == PAGE_CUR_L));
|
|
|
|
/* Not implemented yet */
|
|
|
|
ut_error;
|
|
}
|
|
}
|