Applied innodb-5.1-ss269 snapshot.

Fixed BUGS: #3300: "UPDATE statement with no index column in where condition locks all rows" Implement semi-consistent read to reduce lock conflicts at the cost of breaking serializability. ha_innobase::unlock_row(): reset the "did semi consistent read" flag ha_innobase::was_semi_consistent_read(), ha_innobase::try_semi_consistent_read(): new methods row_prebuilt_t, row_create_prebuilt(): add field row_read_type for keeping track of semi-consistent reads row_vers_build_for_semi_consistent_read(), row_sel_build_committed_vers_for_mysql(): new functions row_search_for_mysql(): implement semi-consistent reads #9802: "Foreign key checks disallow alter table". Added test cases. #12456: "Cursor shows incorrect data - DML does not affect, probably caching" This patch implements a high-granularity read view to be used with cursors. In this high-granularity consistent read view modifications done by the creating transaction after the cursor is created or future transactions are not visible. But those modifications that transaction did before the cursor was created are visible. #12701: "Support >4GB buffer pool and log files on 64-bit Windows" Do not call os_file_create_tmpfile() at runtime. Instead, create all tempfiles at startup and guard access to them with mutexes. #13778: "If FOREIGN_KEY_CHECKS=0, one can create inconsistent FOREIGN KEYs". When FOREIGN_KEY_CHECKS=0 we still need to check that datatypes between foreign key references are compatible. #14189: "VARBINARY and BINARY variables: trailing space ignored with InnoDB" innobase_init(): Assert that DATA_MYSQL_BINARY_CHARSET_COLL == my_charset_bin.number. dtype_get_pad_char(): Do not pad VARBINARY or BINARY columns. row_ins_cascade_calc_update_vec(): Refuse ON UPDATE CASCADE when trying to change the length of a VARBINARY column that refers to or is referenced by a BINARY column. BINARY columns are no longer padded on comparison, and thus they cannot be padded on storage either. #14747: "Race condition can cause btr_search_drop_page_hash_index() to crash" Note that buf_block_t::index should be protected by btr_search_latch or an s-latch or x-latch on the index page. btr_search_drop_page_hash_index(): Read block->index while holding btr_search_latch and use the cached value in the loop. Remove some redundant assertions. #15108: "mysqld crashes when innodb_log_file_size is set > 4G" #15308: "Problem of Order with Enum Column in Primary Key" #15550: "mysqld crashes in printing a FOREIGN KEY error in InnoDB" row_ins_foreign_report_add_err(): When printing the parent record, use the index in the parent table rather than the index in the child table. #15653: "Slow inserts to InnoDB if many thousands of .ibd files" Keep track on unflushed modifications to file spaces. When there are tens of thousands of file spaces, flushing all files in fil_flush_file_spaces() would be very slow. fil_flush_file_spaces(): Only flush unflushed file spaces. fil_space_t, fil_system_t: Add a list of unflushed spaces. #15991: "innodb-file-per-table + symlink database + rename = cr" os_file_handle_error(): Map the error codes EXDEV, ENOTDIR, and EISDIR to the new code OS_FILE_PATH_ERROR. Treat this code as OS_FILE_PATH_ERROR. This fixes the crash on RENAME TABLE when the .ibd file is a symbolic link to a different file system. #16157: "InnoDB crashes when main location settings are empty" This patch is from Heikki. #16298: "InnoDB segfaults in INSERTs in upgrade of 4.0 -> 5.0 tables with VARCHAR BINARY" dict_load_columns(): Set the charset-collation code DATA_MYSQL_BINARY_CHARSET_COLL for those binary string columns that lack a charset-collation code, i.e., the tables were created with an older version of MySQL/InnoDB than 4.1.2. #16229: "MySQL/InnoDB uses full explicit table locks in trigger processing" Take a InnoDB table lock only if user has explicitly requested a table lock. Added some additional comments to store_lock() and external_lock(). #16387: "InnoDB crash when dropping a foreign key <table>_ibfk_0" Do not mistake TABLENAME_ibfk_0 for auto-generated id. dict_table_get_highest_foreign_id(): Ignore foreign constraint identifiers starting with the pattern TABLENAME_ibfk_0. #16582: "InnoDB: Error in an adaptive hash index pointer to page" Account for a race condition when dropping the adaptive hash index for a B-tree page. btr_search_drop_page_hash_index(): Retry the operation if a hash index with different parameters was built meanwhile. Add diagnostics for the case that hash node pointers to the page remain. btr_search_info_update_hash(), btr_search_info_update_slow(): Document the parameter "info" as in/out. #16814: "SHOW INNODB STATUS format error in LATEST FOREIGN KEY ERROR section" Add a missing newline to the LAST FOREIGN KEY ERROR section in SHOW INNODB STATUS output. dict_foreign_error_report(): Always print a newline after invoking dict_print_info_on_foreign_key_in_create_format(). #16827: "Better InnoDB error message if ibdata files omitted from my.cnf" #17126: "CHECK TABLE on InnoDB causes a short hang during check of adaptive hash" CHECK TABLE blocking other queries, by releasing the btr_search_latch periodically during the adaptive hash table validation. #17405: "Valgrind: conditional jump or move depends on unititialised values" buf_block_init(): Reset magic_n, buf_fix_count and io_fix to avoid testing uninitialized variables. mysql-test/r/innodb.result: Applied innodb-5.1-ss269 snapshot. mysql-test/t/innodb.test: Applied innodb-5.1-ss269 snapshot. sql/ha_innodb.cc: Applied innodb-5.1-ss269 snapshot. sql/ha_innodb.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/btr/btr0btr.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/btr/btr0cur.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/btr/btr0pcur.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/btr/btr0sea.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/buf/buf0buf.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/buf/buf0flu.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/buf/buf0lru.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/buf/buf0rea.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/data/data0data.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/data/data0type.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/dict/dict0boot.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/dict/dict0crea.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/dict/dict0dict.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/dict/dict0load.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/dict/dict0mem.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/dyn/dyn0dyn.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/eval/eval0eval.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/eval/eval0proc.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/fil/fil0fil.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/fsp/fsp0fsp.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/fut/fut0lst.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/ha/ha0ha.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/ha/hash0hash.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/ibuf/ibuf0ibuf.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/btr0btr.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/btr0btr.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/btr0cur.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/btr0cur.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/btr0pcur.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/btr0pcur.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/btr0sea.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/btr0sea.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/btr0types.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/buf0buf.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/buf0buf.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/buf0flu.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/buf0flu.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/buf0lru.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/data0data.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/data0data.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/data0type.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/data0type.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/db0err.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/dict0boot.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/dict0boot.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/dict0crea.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/dict0dict.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/dict0dict.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/dict0load.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/dict0mem.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/dyn0dyn.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/dyn0dyn.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/eval0eval.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/eval0eval.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/eval0proc.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/eval0proc.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/fil0fil.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/fsp0fsp.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/fut0lst.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/ha0ha.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/hash0hash.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/hash0hash.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/ibuf0ibuf.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/ibuf0ibuf.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/lock0lock.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/lock0types.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/log0log.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/log0log.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/log0recv.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/mach0data.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/mach0data.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/mem0dbg.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/mem0dbg.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/mem0mem.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/mem0mem.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/mem0pool.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/mtr0log.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/mtr0mtr.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/mtr0mtr.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/os0file.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/os0proc.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/os0sync.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/os0sync.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/os0thread.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/page0cur.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/page0cur.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/page0page.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/page0page.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/page0types.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/pars0grm.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/pars0opt.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/pars0pars.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/pars0sym.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/pars0types.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/que0que.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/que0que.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/que0types.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/read0read.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/read0read.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/rem0cmp.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/rem0cmp.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/rem0rec.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/rem0rec.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/row0ins.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/row0mysql.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/row0purge.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/row0row.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/row0row.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/row0sel.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/row0sel.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/row0types.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/row0uins.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/row0umod.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/row0undo.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/row0upd.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/row0upd.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/row0vers.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/srv0srv.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/srv0start.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/sync0arr.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/sync0rw.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/sync0rw.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/sync0sync.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/sync0sync.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/trx0purge.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/trx0purge.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/trx0rec.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/trx0roll.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/trx0rseg.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/trx0rseg.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/trx0sys.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/trx0sys.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/trx0trx.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/trx0trx.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/trx0types.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/trx0undo.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/trx0undo.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/trx0xa.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/univ.i: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/usr0sess.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/usr0types.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/ut0byte.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/ut0byte.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/ut0dbg.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/ut0lst.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/ut0mem.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/ut0mem.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/ut0rnd.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/ut0rnd.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/ut0sort.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/ut0ut.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/include/ut0ut.ic: Applied innodb-5.1-ss269 snapshot. storage/innobase/lock/lock0lock.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/log/log0log.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/log/log0recv.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/mach/mach0data.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/mem/mem0dbg.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/mem/mem0mem.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/mem/mem0pool.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/mtr/mtr0log.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/mtr/mtr0mtr.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/os/os0file.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/os/os0proc.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/os/os0sync.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/os/os0thread.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/page/page0cur.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/page/page0page.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/pars/lexyy.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/pars/pars0grm.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/pars/pars0grm.h: Applied innodb-5.1-ss269 snapshot. storage/innobase/pars/pars0grm.y: Applied innodb-5.1-ss269 snapshot. storage/innobase/pars/pars0lex.l: Applied innodb-5.1-ss269 snapshot. storage/innobase/pars/pars0opt.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/pars/pars0pars.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/pars/pars0sym.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/que/que0que.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/read/read0read.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/rem/rem0cmp.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/rem/rem0rec.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/row/row0ins.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/row/row0mysql.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/row/row0purge.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/row/row0row.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/row/row0sel.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/row/row0uins.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/row/row0umod.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/row/row0undo.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/row/row0upd.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/row/row0vers.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/srv/srv0que.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/srv/srv0srv.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/srv/srv0start.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/sync/sync0arr.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/sync/sync0rw.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/sync/sync0sync.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/thr/thr0loc.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/trx/trx0purge.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/trx/trx0rec.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/trx/trx0roll.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/trx/trx0rseg.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/trx/trx0sys.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/trx/trx0trx.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/trx/trx0undo.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/usr/usr0sess.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/ut/ut0byte.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/ut/ut0dbg.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/ut/ut0mem.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/ut/ut0rnd.c: Applied innodb-5.1-ss269 snapshot. storage/innobase/ut/ut0ut.c: Applied innodb-5.1-ss269 snapshot. mysql-test/r/innodb_unsafe_binlog.result: New BitKeeper file ``mysql-test/r/innodb_unsafe_binlog.result'' mysql-test/t/innodb_unsafe_binlog-master.opt: New BitKeeper file ``mysql-test/t/innodb_unsafe_binlog-master.opt'' mysql-test/t/innodb_unsafe_binlog.test: New BitKeeper file ``mysql-test/t/innodb_unsafe_binlog.test'' storage/innobase/pars/make_bison.sh: New BitKeeper file ``storage/innobase/pars/make_bison.sh''
2025-09-13 13:47:59 +03:00 · 2006-03-10 19:22:21 +03:00
parent 1cef1679a4
commit 050f14ac37
217 changed files with 17729 additions and 14911 deletions
--- a/storage/innobase/row/row0upd.c
+++ b/storage/innobase/row/row0upd.c
@@ -130,7 +130,7 @@ row_upd_index_is_referenced(

 		foreign = UT_LIST_GET_NEXT(referenced_list, foreign);
 	}
-	
+
 	if (froze_data_dict) {
 		row_mysql_unfreeze_data_dictionary(trx);
 	}
@@ -176,16 +176,16 @@ row_upd_check_references_constraints(

 	entry = row_rec_to_index_entry(ROW_COPY_DATA, index, rec, heap);

-	mtr_commit(mtr);	
+	mtr_commit(mtr);
+
+	mtr_start(mtr);

-	mtr_start(mtr);	
-	
 	if (trx->dict_operation_lock_mode == 0) {
 		got_s_lock = TRUE;

 		row_mysql_freeze_data_dictionary(trx);
 	}
-		
+
 	foreign = UT_LIST_GET_FIRST(table->referenced_list);

 	while (foreign) {
@@ -195,10 +195,11 @@ row_upd_check_references_constraints(
 		NOT break the constraint. */

 		if (foreign->referenced_index == index
-		    && (node->is_delete
-		       || row_upd_changes_first_fields_binary(entry, index,
-			    		node->update, foreign->n_fields))) {
-			    				
+			&& (node->is_delete
+				|| row_upd_changes_first_fields_binary(
+					entry, index, node->update,
+					foreign->n_fields))) {
+
 			if (foreign->foreign_table == NULL) {
 				dict_table_get(foreign->foreign_table_name,
 									trx);
@@ -217,7 +218,7 @@ row_upd_check_references_constraints(
 			we will release dict_operation_lock temporarily!
 			But the counter on the table protects 'foreign' from
 			being dropped while the check is running. */
-			
+
 			err = row_ins_check_foreign_constraint(FALSE, foreign,
 							table, entry, thr);

@@ -253,7 +254,7 @@ row_upd_check_references_constraints(
 	}

 	mem_heap_free(heap);
-	
+
 	return(DB_SUCCESS);
 }

@@ -279,18 +280,18 @@ upd_node_create(
 	node->ext_vec = NULL;
 	node->index = NULL;
 	node->update = NULL;
-	
+
 	node->foreign = NULL;
 	node->cascade_heap = NULL;
 	node->cascade_node = NULL;
-	
+
 	node->select = NULL;
-	
+
 	node->heap = mem_heap_create(128);
-	node->magic_n = UPD_NODE_MAGIC_N;	
+	node->magic_n = UPD_NODE_MAGIC_N;

 	node->cmpl_info = 0;
-	
+
 	return(node);
 }

@@ -396,7 +397,8 @@ row_upd_changes_field_size_or_external(
 		old_len = rec_offs_nth_size(offsets, upd_field->field_no);

 		if (rec_offs_comp(offsets)
-		    && rec_offs_nth_sql_null(offsets, upd_field->field_no)) {
+			&& rec_offs_nth_sql_null(offsets,
+				upd_field->field_no)) {
 			/* Note that in the compact table format, for a
 			variable length field, an SQL NULL will use zero
 			bytes in the offset array at the start of the physical
@@ -411,7 +413,7 @@ row_upd_changes_field_size_or_external(

 			return(TRUE);
 		}
-		
+
 		if (rec_offs_nth_extern(offsets, upd_field->field_no)) {

 			return(TRUE);
@@ -452,7 +454,7 @@ row_upd_rec_in_place(
 	for (i = 0; i < n_fields; i++) {
 		upd_field = upd_get_nth_field(update, i);
 		new_val = &(upd_field->new_val);
-		
+
 		rec_set_nth_field(rec, offsets, upd_field->field_no,
 						dfield_get_data(new_val),
 						dfield_get_len(new_val));
@@ -481,7 +483,7 @@ row_upd_write_sys_vals_to_log(
 			dict_index_get_sys_col_pos(index, DATA_TRX_ID));

 	trx_write_roll_ptr(log_ptr, roll_ptr);
-	log_ptr += DATA_ROLL_PTR_LEN;	
+	log_ptr += DATA_ROLL_PTR_LEN;

 	log_ptr += mach_dulint_write_compressed(log_ptr, trx->id);

@@ -512,9 +514,9 @@ row_upd_parse_sys_vals(

 		return(NULL);
 	}
-	
+
 	*roll_ptr = trx_read_roll_ptr(ptr);
-	ptr += DATA_ROLL_PTR_LEN;	
+	ptr += DATA_ROLL_PTR_LEN;

 	ptr = mach_dulint_parse_compressed(ptr, end_ptr, trx_id);

@@ -543,18 +545,20 @@ row_upd_index_write_log(
 	n_fields = upd_get_n_fields(update);

 	buf_end = log_ptr + MLOG_BUF_MARGIN;
-	
+
 	mach_write_to_1(log_ptr, update->info_bits);
 	log_ptr++;
 	log_ptr += mach_write_compressed(log_ptr, n_fields);
-	
+
 	for (i = 0; i < n_fields; i++) {

-		ut_ad(MLOG_BUF_MARGIN > 30);
+#if MLOG_BUF_MARGIN <= 30
+# error "MLOG_BUF_MARGIN <= 30"
+#endif

 		if (log_ptr + 30 > buf_end) {
 			mlog_close(mtr, log_ptr);
-			
+
 			log_ptr = mlog_open(mtr, MLOG_BUF_MARGIN);
 			buf_end = log_ptr + MLOG_BUF_MARGIN;
 		}
@@ -575,7 +579,7 @@ row_upd_index_write_log(
 				log_ptr += len;
 			} else {
 				mlog_close(mtr, log_ptr);
-			
+
 				mlog_catenate_string(mtr, new_val->data, len);

 				log_ptr = mlog_open(mtr, MLOG_BUF_MARGIN);
@@ -694,7 +698,7 @@ upd_ext_vec_contains(

 	return(FALSE);
 }
-	
+
 /*******************************************************************
 Builds an update vector from those fields which in a secondary index entry
 differ from a record that has the equal ordering fields. NOTE: we compare
@@ -828,10 +832,10 @@ row_upd_build_difference_binary(
 		}

 		extern_bit = upd_ext_vec_contains(ext_vec, n_ext_vec, i);
-		
+
 		if (UNIV_UNLIKELY(extern_bit ==
-			    (ibool)!rec_offs_nth_extern(offsets, i))
-		    || !dfield_data_is_binary_equal(dfield, len, data)) {
+				(ibool)!rec_offs_nth_extern(offsets, i))
+			|| !dfield_data_is_binary_equal(dfield, len, data)) {

 			upd_field = upd_get_nth_field(update, n_diff);

@@ -883,36 +887,36 @@ row_upd_index_replace_new_col_vals_index_pos(

 	for (j = 0; j < dict_index_get_n_fields(index); j++) {

-	        field = dict_index_get_nth_field(index, j);
+		field = dict_index_get_nth_field(index, j);

 		for (i = 0; i < upd_get_n_fields(update); i++) {

-		        upd_field = upd_get_nth_field(update, i);
+			upd_field = upd_get_nth_field(update, i);

 			if (upd_field->field_no == j) {

-			        dfield = dtuple_get_nth_field(entry, j);
+				dfield = dtuple_get_nth_field(entry, j);

 				new_val = &(upd_field->new_val);

 				dfield_set_data(dfield, new_val->data,
 								new_val->len);
 				if (heap && new_val->len != UNIV_SQL_NULL) {
-				        dfield->data = mem_heap_alloc(heap,
+					dfield->data = mem_heap_alloc(heap,
 								new_val->len);
 					ut_memcpy(dfield->data, new_val->data,
 								new_val->len);
 				}

 				if (field->prefix_len > 0
-			            && new_val->len != UNIV_SQL_NULL) {
+					&& new_val->len != UNIV_SQL_NULL) {

-				  	cur_type = dict_col_get_type(
+					cur_type = dict_col_get_type(
 						dict_field_get_col(field));

-				  	dfield->len = 
-				    		dtype_get_at_most_n_mbchars(
-				      			cur_type,
+					dfield->len =
+						dtype_get_at_most_n_mbchars(
+							cur_type,
 							field->prefix_len,
 							new_val->len,
 							new_val->data);
@@ -953,36 +957,36 @@ row_upd_index_replace_new_col_vals(

 	for (j = 0; j < dict_index_get_n_fields(index); j++) {

-	        field = dict_index_get_nth_field(index, j);
+		field = dict_index_get_nth_field(index, j);

 		for (i = 0; i < upd_get_n_fields(update); i++) {

-		        upd_field = upd_get_nth_field(update, i);
+			upd_field = upd_get_nth_field(update, i);

 			if (upd_field->field_no == field->col->clust_pos) {

-			        dfield = dtuple_get_nth_field(entry, j);
+				dfield = dtuple_get_nth_field(entry, j);

 				new_val = &(upd_field->new_val);

 				dfield_set_data(dfield, new_val->data,
 								new_val->len);
 				if (heap && new_val->len != UNIV_SQL_NULL) {
-				        dfield->data = mem_heap_alloc(heap,
+					dfield->data = mem_heap_alloc(heap,
 								new_val->len);
 					ut_memcpy(dfield->data, new_val->data,
 								new_val->len);
 				}

 				if (field->prefix_len > 0
-			            && new_val->len != UNIV_SQL_NULL) {
+					&& new_val->len != UNIV_SQL_NULL) {

 					cur_type = dict_col_get_type(
 						dict_field_get_col(field));

-				  	dfield->len =
-				    		dtype_get_at_most_n_mbchars(
-				      			cur_type,
+					dfield->len =
+						dtype_get_at_most_n_mbchars(
+							cur_type,
 							field->prefix_len,
 							new_val->len,
 							new_val->data);
@@ -1022,7 +1026,7 @@ row_upd_changes_ord_field_binary(
 	ulint		col_pos;
 	ulint		col_no;
 	ulint		i, j;
-	
+
 	ut_ad(update && index);

 	n_unique = dict_index_get_n_unique(index);
@@ -1045,10 +1049,11 @@ row_upd_changes_ord_field_binary(
 			the datas */

 			if (col_pos == upd_field->field_no
-			    && (row == NULL
-			        || ind_field->prefix_len > 0
-				|| !dfield_datas_are_binary_equal(
-					dtuple_get_nth_field(row, col_no),
+				&& (row == NULL
+					|| ind_field->prefix_len > 0
+					|| !dfield_datas_are_binary_equal(
+						dtuple_get_nth_field(row,
+							col_no),
 						&(upd_field->new_val)))) {
 				return(TRUE);
 			}
@@ -1073,21 +1078,21 @@ row_upd_changes_some_index_ord_field_binary(
 	upd_field_t*	upd_field;
 	dict_index_t*	index;
 	ulint		i;
-	
+
 	index = dict_table_get_first_index(table);
-	
+
 	for (i = 0; i < upd_get_n_fields(update); i++) {

 		upd_field = upd_get_nth_field(update, i);

 		if (dict_field_get_col(dict_index_get_nth_field(index,
-						upd_field->field_no))
-		    ->ord_part) {
+					upd_field->field_no))
+			->ord_part) {

-		    	return(TRUE);
+			return(TRUE);
 		}
 	}
-	
+
 	return(FALSE);
 }

@@ -1111,10 +1116,10 @@ row_upd_changes_first_fields_binary(
 	ulint		n_upd_fields;
 	ulint		col_pos;
 	ulint		i, j;
-	
+
 	ut_a(update && index);
 	ut_a(n <= dict_index_get_n_fields(index));
-	
+
 	n_upd_fields = upd_get_n_fields(update);

 	for (i = 0; i < n; i++) {
@@ -1130,9 +1135,10 @@ row_upd_changes_first_fields_binary(
 			upd_field = upd_get_nth_field(update, j);

 			if (col_pos == upd_field->field_no
-			    && !dfield_datas_are_binary_equal(
-					     dtuple_get_nth_field(entry, i),
-					     &(upd_field->new_val))) {
+				&& !dfield_datas_are_binary_equal(
+					dtuple_get_nth_field(entry, i),
+					&(upd_field->new_val))) {
+
 				return(TRUE);
 			}
 		}
@@ -1214,11 +1220,11 @@ row_upd_store_row(
 		mem_heap_empty(node->heap);
 		node->row = NULL;
 	}
-	
+
 	clust_index = dict_table_get_first_index(node->table);

 	rec = btr_pcur_get_rec(node->pcur);
-	
+
 	offsets = rec_get_offsets(rec, clust_index, offsets_,
 						ULINT_UNDEFINED, &heap);
 	node->row = row_build(ROW_COPY_DATA, clust_index, rec, offsets,
@@ -1230,7 +1236,7 @@ row_upd_store_row(
 	} else {
 		update = node->update;
 	}
-	
+
 	node->n_ext_vec = btr_push_update_extern_fields(node->ext_vec,
 						offsets, update);
 	if (UNIV_LIKELY_NULL(heap)) {
@@ -1262,7 +1268,7 @@ row_upd_sec_index_entry(
 	trx_t*		trx	= thr_get_trx(thr);

 	index = node->index;
-	
+
 	check_ref = row_upd_index_is_referenced(index, trx);

 	heap = mem_heap_create(1024);
@@ -1272,7 +1278,7 @@ row_upd_sec_index_entry(

 	log_free_check();
 	mtr_start(&mtr);
-	
+
 	found = row_search_index_entry(index, entry, BTR_MODIFY_LEAF, &pcur,
 									&mtr);
 	btr_cur = btr_pcur_get_btr_cur(&pcur);
@@ -1296,15 +1302,16 @@ row_upd_sec_index_entry(
 		fputs("\n"
 "InnoDB: Submit a detailed bug report to http://bugs.mysql.com\n", stderr);
 	} else {
- 	  	/* Delete mark the old index record; it can already be
-          	delete marked if we return after a lock wait in
-          	row_ins_index_entry below */
+		/* Delete mark the old index record; it can already be
+		delete marked if we return after a lock wait in
+		row_ins_index_entry below */

-		if (!rec_get_deleted_flag(rec, index->table->comp)) {
+		if (!rec_get_deleted_flag(rec,
+				dict_table_is_comp(index->table))) {
 			err = btr_cur_del_mark_set_sec_rec(0, btr_cur, TRUE,
 								thr, &mtr);
 			if (err == DB_SUCCESS && check_ref) {
-			    	
+
 				/* NOTE that the following call loses
 				the position of pcur ! */
 				err = row_upd_check_references_constraints(
@@ -1317,7 +1324,7 @@ row_upd_sec_index_entry(
 				}
 			}

-	  	}
+		}
 	}
 close_cur:
 	btr_pcur_close(&pcur);
@@ -1325,9 +1332,9 @@ close_cur:

 	if (node->is_delete || err != DB_SUCCESS) {

-		mem_heap_free(heap);	
+		mem_heap_free(heap);

-        	return(err);
+		return(err);
 	}

 	/* Build a new index entry */
@@ -1336,9 +1343,9 @@ close_cur:
 	/* Insert new index entry */
 	err = row_ins_index_entry(index, entry, NULL, 0, thr);

-	mem_heap_free(heap);	
+	mem_heap_free(heap);

-        return(err);
+	return(err);
 }

 /***************************************************************
@@ -1358,10 +1365,10 @@ row_upd_sec_step(
 	ut_ad((node->state == UPD_NODE_UPDATE_ALL_SEC)
 				|| (node->state == UPD_NODE_UPDATE_SOME_SEC));
 	ut_ad(!(node->index->type & DICT_CLUSTERED));
-	
+
 	if (node->state == UPD_NODE_UPDATE_ALL_SEC
-	    || row_upd_changes_ord_field_binary(node->row, node->index,
-							   node->update)) {
+		|| row_upd_changes_ord_field_binary(node->row, node->index,
+			node->update)) {
 		err = row_upd_sec_index_entry(node, thr);

 		return(err);
@@ -1395,7 +1402,7 @@ row_upd_clust_rec_by_insert(
 	dict_table_t*	table;
 	dtuple_t*	entry;
 	ulint		err;
-	
+
 	ut_ad(node);
 	ut_ad(index->type & DICT_CLUSTERED);

@@ -1403,7 +1410,7 @@ row_upd_clust_rec_by_insert(
 	table = node->table;
 	pcur = node->pcur;
 	btr_cur	= btr_pcur_get_btr_cur(pcur);
-	
+
 	if (node->state != UPD_NODE_INSERT_CLUSTERED) {
 		ulint	offsets_[REC_OFFS_NORMAL_SIZE];
 		*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -1439,7 +1446,7 @@ row_upd_clust_rec_by_insert(
 			}
 		}

-	} 
+	}

 	mtr_commit(mtr);

@@ -1451,26 +1458,26 @@ row_upd_clust_rec_by_insert(
 	entry = row_build_index_entry(node->row, index, heap);

 	row_upd_index_replace_new_col_vals(entry, index, node->update, NULL);
-	
+
 	row_upd_index_entry_sys_field(entry, index, DATA_TRX_ID, trx->id);
-	
+
 	/* If we return from a lock wait, for example, we may have
 	extern fields marked as not-owned in entry (marked in the
 	if-branch above). We must unmark them. */
-	
+
 	btr_cur_unmark_dtuple_extern_fields(entry, node->ext_vec,
 							node->n_ext_vec);
 	/* We must mark non-updated extern fields in entry as inherited,
 	so that a possible rollback will not free them */
-	
+
 	btr_cur_mark_dtuple_inherited_extern(entry, node->ext_vec,
 						node->n_ext_vec,
 						node->update);
-	
+
 	err = row_ins_index_entry(index, entry, node->ext_vec,
 						node->n_ext_vec, thr);
 	mem_heap_free(heap);
-	
+
 	return(err);
 }

@@ -1492,7 +1499,7 @@ row_upd_clust_rec(
 	btr_pcur_t*	pcur;
 	btr_cur_t*	btr_cur;
 	ulint		err;
-	
+
 	ut_ad(node);
 	ut_ad(index->type & DICT_CLUSTERED);

@@ -1500,8 +1507,8 @@ row_upd_clust_rec(
 	btr_cur = btr_pcur_get_btr_cur(pcur);

 	ut_ad(!rec_get_deleted_flag(btr_pcur_get_rec(pcur),
-					index->table->comp));
-	
+			dict_table_is_comp(index->table)));
+
 	/* Try optimistic updating of the record, keeping changes within
 	the page; we do not check locks because we assume the x-lock on the
 	record to update */
@@ -1517,7 +1524,7 @@ row_upd_clust_rec(
 	}

 	mtr_commit(mtr);
-	
+
 	if (err == DB_SUCCESS) {

 		return(err);
@@ -1527,7 +1534,7 @@ row_upd_clust_rec(
 	down the index tree */

 	mtr_start(mtr);
-	
+
 	/* NOTE: this transaction has an s-lock or x-lock on the record and
 	therefore other transactions cannot modify the record when we have no
 	latch on the page. In addition, we assume that other query threads of
@@ -1537,8 +1544,8 @@ row_upd_clust_rec(
 	ut_a(btr_pcur_restore_position(BTR_MODIFY_TREE, pcur, mtr));

 	ut_ad(!rec_get_deleted_flag(btr_pcur_get_rec(pcur),
-					index->table->comp));
-	
+			dict_table_is_comp(index->table)));
+
 	err = btr_cur_pessimistic_update(BTR_NO_LOCKING_FLAG, btr_cur,
 					&big_rec, node->update,
 					node->cmpl_info, thr, mtr);
@@ -1567,7 +1574,7 @@ row_upd_clust_rec(
 	if (big_rec) {
 		dtuple_big_rec_free(big_rec);
 	}
-		
+
 	return(err);
 }

@@ -1589,7 +1596,7 @@ row_upd_del_mark_clust_rec(
 	btr_pcur_t*	pcur;
 	btr_cur_t*	btr_cur;
 	ulint		err;
-	
+
 	ut_ad(node);
 	ut_ad(index->type & DICT_CLUSTERED);
 	ut_ad(node->is_delete);
@@ -1599,7 +1606,7 @@ row_upd_del_mark_clust_rec(

 	/* Store row because we have to build also the secondary index
 	entries */
-	
+
 	row_upd_store_row(node);

 	/* Mark the clustered index record deleted; we do not have to check
@@ -1621,7 +1628,7 @@ row_upd_del_mark_clust_rec(
 	}

 	mtr_commit(mtr);
-	
+
 	return(err);
 }

@@ -1660,7 +1667,7 @@ row_upd_clust_step(
 	mtr = &mtr_buf;

 	mtr_start(mtr);
-	
+
 	/* If the restoration does not succeed, then the same
 	transaction has deleted the record on which the cursor was,
 	and that is an SQL error. If the restoration succeeds, it may
@@ -1668,7 +1675,7 @@ row_upd_clust_step(
 	and inserted a record with the same ordering fields, but in
 	that case we know that the transaction has at least an
 	implicit x-lock on the record. */
-	
+
 	ut_a(pcur->rel_pos == BTR_PCUR_ON);

 	success = btr_pcur_restore_position(BTR_MODIFY_LEAF, pcur, mtr);
@@ -1686,7 +1693,7 @@ row_upd_clust_step(
 	with the index */

 	if (node->is_delete
-	    && ut_dulint_cmp(node->table->id, DICT_INDEXES_ID) == 0) {
+		&& ut_dulint_cmp(node->table->id, DICT_INDEXES_ID) == 0) {

 		dict_drop_index_tree(btr_pcur_get_rec(pcur), mtr);

@@ -1703,7 +1710,7 @@ row_upd_clust_step(

 			return(err);
 		}
-	} 
+	}

 	rec = btr_pcur_get_rec(pcur);
 	offsets = rec_get_offsets(rec, index, offsets_,
@@ -1733,10 +1740,10 @@ row_upd_clust_step(
 		}
 		return(err);
 	}
-	
+
 	/* If the update is made for MySQL, we already have the update vector
 	ready, else we have to do some evaluation: */
- 
+
 	if (!node->in_mysql_interface) {
 		/* Copy the necessary columns from clust_rec and calculate the
 		new values to set */
@@ -1748,13 +1755,13 @@ row_upd_clust_step(
 	if (UNIV_LIKELY_NULL(heap)) {
 		mem_heap_free(heap);
 	}
-		
+
 	if (node->cmpl_info & UPD_NODE_NO_ORD_CHANGE) {

 		err = row_upd_clust_rec(node, index, thr, mtr);
 		return(err);
 	}
-	
+
 	row_upd_store_row(node);

 	if (row_upd_changes_ord_field_binary(node->row, index, node->update)) {
@@ -1808,18 +1815,18 @@ row_upd(
 	que_thr_t*	thr)	/* in: query thread */
 {
 	ulint	err	= DB_SUCCESS;
-	
+
 	ut_ad(node && thr);

 	if (node->in_mysql_interface) {
-	
+
 		/* We do not get the cmpl_info value from the MySQL
 		interpreter: we must calculate it on the fly: */
-		
+
 		if (node->is_delete ||
 			row_upd_changes_some_index_ord_field_binary(
 					node->table, node->update)) {
-			node->cmpl_info = 0; 
+			node->cmpl_info = 0;
 		} else {
 			node->cmpl_info = UPD_NODE_NO_ORD_CHANGE;
 		}
@@ -1829,7 +1836,7 @@ row_upd(
 				|| node->state == UPD_NODE_INSERT_CLUSTERED) {

 		err = row_upd_clust_step(node, thr);
-		
+
 		if (err != DB_SUCCESS) {

 			goto function_exit;
@@ -1850,7 +1857,7 @@ row_upd(
 		}

 		node->index = dict_table_get_next_index(node->index);
-        }
+	}

 function_exit:
 	if (err == DB_SUCCESS) {
@@ -1865,7 +1872,7 @@ function_exit:
 		node->state = UPD_NODE_UPDATE_CLUSTERED;
 	}

-        return(err);
+	return(err);
 }

 /***************************************************************
@@ -1885,19 +1892,19 @@ row_upd_step(
 	trx_t*		trx;

 	ut_ad(thr);
-	
+
 	trx = thr_get_trx(thr);

 	trx_start_if_not_started(trx);

 	node = thr->run_node;
-	
+
 	sel_node = node->select;

 	parent = que_node_get_parent(node);
-	
+
 	ut_ad(que_node_get_type(node) == QUE_NODE_UPDATE);
-	
+
 	if (thr->prev_node == parent) {
 		node->state = UPD_NODE_SET_IX_LOCK;
 	}
@@ -1915,23 +1922,23 @@ row_upd_step(
 				goto error_handling;
 			}
 		}
-	
+
 		node->state = UPD_NODE_UPDATE_CLUSTERED;

 		if (node->searched_update) {
 			/* Reset the cursor */
 			sel_node->state = SEL_NODE_OPEN;
-		
+
 			/* Fetch a row to update */
-		
+
 			thr->run_node = sel_node;
-	
+
 			return(thr);
 		}
 	}

 	/* sel_node is NULL if we are in the MySQL interface */
-	
+
 	if (sel_node && (sel_node->state != SEL_NODE_FETCH)) {

 		if (!node->searched_update) {
@@ -1939,7 +1946,7 @@ row_upd_step(
 			to update */

 			ut_error;
-			
+
 			err = DB_ERROR;

 			goto error_handling;
@@ -1951,12 +1958,12 @@ row_upd_step(
 		updates directly in-place */

 		thr->run_node = parent;
-	
+
 		return(thr);
 	}

 	/* DO THE CHECKS OF THE CONSISTENCY CONSTRAINTS HERE */
-	
+
 	err = row_upd(node, thr);

 error_handling:
@@ -1986,7 +1993,7 @@ error_handling:
 	node->state = UPD_NODE_UPDATE_CLUSTERED;

 	return(thr);
-} 
+}

 /*************************************************************************
 Performs an in-place update for the current clustered index record in
@@ -2031,8 +2038,8 @@ row_upd_in_place_in_select(
 	row_upd_eval_new_vals(node->update);

 	ut_ad(!rec_get_deleted_flag(btr_pcur_get_rec(pcur),
-					btr_cur->index->table->comp));
-	
+			dict_table_is_comp(btr_cur->index->table)));
+
 	ut_ad(node->cmpl_info & UPD_NODE_NO_SIZE_CHANGE);
 	ut_ad(node->cmpl_info & UPD_NODE_NO_ORD_CHANGE);
 	ut_ad(node->select_will_do_update);