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''
author: unknown <aivanov@mysql.com> 2006-03-10 19:22:21 +0300
committer: unknown <aivanov@mysql.com> 2006-03-10 19:22:21 +0300
commit: 050f14ac371e03dc96b96e8a9b0cd8fa8e3a23e0 (patch)
tree: 8105d79f7267d8af93861befd1899063f1ad42c2 /storage/innobase/ut
parent: 1cef1679a47bfbf744d656646770193ba07c30fe (diff)
download: mariadb-git-050f14ac371e03dc96b96e8a9b0cd8fa8e3a23e0.tar.gz
5 files changed, 112 insertions, 111 deletions
diff --git a/storage/innobase/ut/ut0byte.c b/storage/innobase/ut/ut0byte.c
index cc83aacc90b..18f57181827 100644
--- a/storage/innobase/ut/ut0byte.c
+++ b/storage/innobase/ut/ut0byte.c
@@ -15,10 +15,10 @@ Created 5/11/1994 Heikki Tuuri
 #include "ut0sort.h"
 
 /* Zero value for a dulint */
-dulint	ut_dulint_zero 		= {0, 0};
+dulint	ut_dulint_zero		= {0, 0};
 
 /* Maximum value for a dulint */
-dulint	ut_dulint_max 		= {0xFFFFFFFFUL, 0xFFFFFFFFUL};
+dulint	ut_dulint_max		= {0xFFFFFFFFUL, 0xFFFFFFFFUL};
 
 /****************************************************************
 Sort function for dulint arrays. */
diff --git a/storage/innobase/ut/ut0dbg.c b/storage/innobase/ut/ut0dbg.c
index e810d8dead7..2157a71116a 100644
--- a/storage/innobase/ut/ut0dbg.c
+++ b/storage/innobase/ut/ut0dbg.c
@@ -17,8 +17,8 @@ ulint	ut_dbg_zero	= 0;
 /* If this is set to TRUE all threads will stop into the next assertion
 and assert */
 ibool	ut_dbg_stop_threads	= FALSE;
-#ifdef __NETWARE__ 
-ibool panic_shutdown = FALSE;  	/* This is set to TRUE when on NetWare there
+#ifdef __NETWARE__
+ibool panic_shutdown = FALSE;	/* This is set to TRUE when on NetWare there
 				happens an InnoDB assertion failure or other
 				fatal error condition that requires an
 				immediate shutdown. */
diff --git a/storage/innobase/ut/ut0mem.c b/storage/innobase/ut/ut0mem.c
index 47b1e24e5e1..345c14e00f9 100644
--- a/storage/innobase/ut/ut0mem.c
+++ b/storage/innobase/ut/ut0mem.c
@@ -23,7 +23,7 @@ typedef struct ut_mem_block_struct ut_mem_block_t;
 ulint	ut_total_allocated_memory	= 0;
 
 struct ut_mem_block_struct{
-        UT_LIST_NODE_T(ut_mem_block_t) mem_block_list;
+	UT_LIST_NODE_T(ut_mem_block_t) mem_block_list;
 			/* mem block list node */
 	ulint	size;	/* size of allocated memory */
 	ulint	magic_n;
@@ -35,7 +35,7 @@ struct ut_mem_block_struct{
 with malloc */
 UT_LIST_BASE_NODE_T(ut_mem_block_t)   ut_mem_block_list;
 
-os_fast_mutex_t ut_list_mutex;  /* this protects the list */
+os_fast_mutex_t ut_list_mutex;	/* this protects the list */
 
 ibool  ut_mem_block_list_inited = FALSE;
 
@@ -48,8 +48,8 @@ void
 ut_mem_block_list_init(void)
 /*========================*/
 {
-        os_fast_mutex_init(&ut_list_mutex);
-        UT_LIST_INIT(ut_mem_block_list);
+	os_fast_mutex_init(&ut_list_mutex);
+	UT_LIST_INIT(ut_mem_block_list);
 	ut_mem_block_list_inited = TRUE;
 }
 
@@ -60,12 +60,13 @@ defined and set_to_zero is TRUE. */
 void*
 ut_malloc_low(
 /*==========*/
-	                     /* out, own: allocated memory */
-        ulint   n,           /* in: number of bytes to allocate */
-	ibool   set_to_zero, /* in: TRUE if allocated memory should be set
-			     to zero if UNIV_SET_MEM_TO_ZERO is defined */
-	ibool	assert_on_error) /* in: if TRUE, we crash mysqld if the memory
-				cannot be allocated */
+				/* out, own: allocated memory */
+	ulint	n,		/* in: number of bytes to allocate */
+	ibool	set_to_zero,	/* in: TRUE if allocated memory should be
+				set to zero if UNIV_SET_MEM_TO_ZERO is
+				defined */
+	ibool	assert_on_error)/* in: if TRUE, we crash mysqld if the
+				memory cannot be allocated */
 {
 	ulint	retry_count	= 0;
 	void*	ret;
@@ -73,7 +74,7 @@ ut_malloc_low(
 	ut_ad((sizeof(ut_mem_block_t) % 8) == 0); /* check alignment ok */
 
 	if (!ut_mem_block_list_inited) {
-	        ut_mem_block_list_init();
+		ut_mem_block_list_init();
 	}
 retry:
 	os_fast_mutex_lock(&ut_list_mutex);
@@ -95,7 +96,7 @@ retry:
 		"InnoDB: Note that in most 32-bit computers the process\n"
 		"InnoDB: memory space is limited to 2 GB or 4 GB.\n"
 		"InnoDB: We keep retrying the allocation for 60 seconds...\n",
-		                  (ulong) n, (ulong) ut_total_allocated_memory,
+				  (ulong) n, (ulong) ut_total_allocated_memory,
 #ifdef __WIN__
 			(ulong) GetLastError()
 #else
@@ -110,7 +111,7 @@ retry:
 		just a temporary shortage of memory */
 
 		os_thread_sleep(1000000);
-		
+
 		retry_count++;
 
 		goto retry;
@@ -123,13 +124,13 @@ retry:
 
 		fflush(stderr);
 
-	        os_fast_mutex_unlock(&ut_list_mutex);
+		os_fast_mutex_unlock(&ut_list_mutex);
 
 		/* Make an intentional seg fault so that we get a stack
 		trace */
-		/* Intentional segfault on NetWare causes an abend. Avoid this 
+		/* Intentional segfault on NetWare causes an abend. Avoid this
 		by graceful exit handling in ut_a(). */
-#if (!defined __NETWARE__) 
+#if (!defined __NETWARE__)
 		if (assert_on_error) {
 			ut_print_timestamp(stderr);
 
@@ -144,11 +145,11 @@ retry:
 #else
 		ut_a(0);
 #endif
-	}		
+	}
 
 	if (set_to_zero) {
 #ifdef UNIV_SET_MEM_TO_ZERO
-	        memset(ret, '\0', n + sizeof(ut_mem_block_t));
+		memset(ret, '\0', n + sizeof(ut_mem_block_t));
 #endif
 	}
 
@@ -156,9 +157,9 @@ retry:
 	((ut_mem_block_t*)ret)->magic_n = UT_MEM_MAGIC_N;
 
 	ut_total_allocated_memory += n + sizeof(ut_mem_block_t);
-	
+
 	UT_LIST_ADD_FIRST(mem_block_list, ut_mem_block_list,
-			                         ((ut_mem_block_t*)ret));
+						 ((ut_mem_block_t*)ret));
 	os_fast_mutex_unlock(&ut_list_mutex);
 
 	return((void*)((byte*)ret + sizeof(ut_mem_block_t)));
@@ -171,10 +172,10 @@ defined. */
 void*
 ut_malloc(
 /*======*/
-	                /* out, own: allocated memory */
-        ulint   n)      /* in: number of bytes to allocate */
+			/* out, own: allocated memory */
+	ulint	n)	/* in: number of bytes to allocate */
 {
-        return(ut_malloc_low(n, TRUE, TRUE));
+	return(ut_malloc_low(n, TRUE, TRUE));
 }
 
 /**************************************************************************
@@ -202,8 +203,8 @@ ut_test_malloc(
 		"InnoDB: ulimits of your operating system.\n"
 		"InnoDB: On FreeBSD check you have compiled the OS with\n"
 		"InnoDB: a big enough maximum process size.\n",
-		                  (ulong) n,
-			          (ulong) ut_total_allocated_memory,
+				  (ulong) n,
+				  (ulong) ut_total_allocated_memory,
 				  (int) errno);
 		return(FALSE);
 	}
@@ -211,7 +212,7 @@ ut_test_malloc(
 	free(ret);
 
 	return(TRUE);
-}	
+}
 
 /**************************************************************************
 Frees a memory block allocated with ut_malloc. */
@@ -221,7 +222,7 @@ ut_free(
 /*====*/
 	void* ptr)  /* in, own: memory block */
 {
-        ut_mem_block_t* block;
+	ut_mem_block_t* block;
 
 	block = (ut_mem_block_t*)((byte*)ptr - sizeof(ut_mem_block_t));
 
@@ -231,10 +232,10 @@ ut_free(
 	ut_a(ut_total_allocated_memory >= block->size);
 
 	ut_total_allocated_memory -= block->size;
-	
+
 	UT_LIST_REMOVE(mem_block_list, ut_mem_block_list, block);
 	free(block);
-	
+
 	os_fast_mutex_unlock(&ut_list_mutex);
 }
 
@@ -248,10 +249,10 @@ man realloc in Linux, 2004:
        realloc()  changes the size of the memory block pointed to
        by ptr to size bytes.  The contents will be  unchanged  to
        the minimum of the old and new sizes; newly allocated mem�
-       ory will be uninitialized.  If ptr is NULL,  the  call  is
+       ory will be uninitialized.  If ptr is NULL,  the	 call  is
        equivalent  to malloc(size); if size is equal to zero, the
-       call is equivalent to free(ptr).  Unless ptr is  NULL,  it
-       must  have  been  returned by an earlier call to malloc(),
+       call is equivalent to free(ptr).	 Unless ptr is	NULL,  it
+       must  have  been	 returned by an earlier call to malloc(),
        calloc() or realloc().
 
 RETURN VALUE
@@ -259,8 +260,8 @@ RETURN VALUE
        which is suitably aligned for any kind of variable and may
        be different from ptr, or NULL if the  request  fails.  If
        size  was equal to 0, either NULL or a pointer suitable to
-       be passed to free() is returned.  If realloc()  fails  the
-       original  block  is  left  untouched  - it is not freed or
+       be passed to free() is returned.	 If realloc()  fails  the
+       original	 block	is  left  untouched  - it is not freed or
        moved. */
 
 void*
@@ -270,7 +271,7 @@ ut_realloc(
 	void*	ptr,	/* in: pointer to old block or NULL */
 	ulint	size)	/* in: desired size */
 {
-        ut_mem_block_t* block;
+	ut_mem_block_t* block;
 	ulint		old_size;
 	ulint		min_size;
 	void*		new_ptr;
@@ -297,20 +298,20 @@ ut_realloc(
 	} else {
 		min_size = old_size;
 	}
-		
+
 	new_ptr = ut_malloc(size);
 
 	if (new_ptr == NULL) {
 
 		return(NULL);
-	}				
+	}
 
 	/* Copy the old data from ptr */
 	ut_memcpy(new_ptr, ptr, min_size);
 
 	ut_free(ptr);
 
-	return(new_ptr);		
+	return(new_ptr);
 }
 
 /**************************************************************************
@@ -320,9 +321,9 @@ void
 ut_free_all_mem(void)
 /*=================*/
 {
-        ut_mem_block_t* block;
+	ut_mem_block_t* block;
 
-        os_fast_mutex_free(&ut_list_mutex);
+	os_fast_mutex_free(&ut_list_mutex);
 
 	while ((block = UT_LIST_GET_FIRST(ut_mem_block_list))) {
 
@@ -330,11 +331,11 @@ ut_free_all_mem(void)
 		ut_a(ut_total_allocated_memory >= block->size);
 
 		ut_total_allocated_memory -= block->size;
-	
-	        UT_LIST_REMOVE(mem_block_list, ut_mem_block_list, block);
-	        free(block);
+
+		UT_LIST_REMOVE(mem_block_list, ut_mem_block_list, block);
+		free(block);
 	}
-		                      
+
 	if (ut_total_allocated_memory != 0) {
 		fprintf(stderr,
 "InnoDB: Warning: after shutdown total allocated memory is %lu\n",
@@ -359,7 +360,7 @@ ut_strlcpy(
 
 	if (size != 0) {
 		ulint	n = ut_min(src_size, size - 1);
-		
+
 		memcpy(dst, src, n);
 		dst[n] = '\0';
 	}
@@ -391,7 +392,7 @@ ut_strlcpy_rev(
 }
 
 /**************************************************************************
-Make a quoted copy of a NUL-terminated string.  Leading and trailing
+Make a quoted copy of a NUL-terminated string.	Leading and trailing
 quotes will not be included; only embedded quotes will be escaped.
 See also ut_strlenq() and ut_memcpyq(). */
 
diff --git a/storage/innobase/ut/ut0rnd.c b/storage/innobase/ut/ut0rnd.c
index 85d2e6094c3..016809e0474 100644
--- a/storage/innobase/ut/ut0rnd.c
+++ b/storage/innobase/ut/ut0rnd.c
@@ -32,9 +32,9 @@ ut_find_prime(
 {
 	ulint	pow2;
 	ulint	i;
-	
+
 	n += 100;
-	
+
 	pow2 = 1;
 	while (pow2 * 2 < n) {
 		pow2 = 2 * pow2;
@@ -43,23 +43,23 @@ ut_find_prime(
 	if ((double)n < 1.05 * (double)pow2) {
 		n = (ulint) ((double)n * UT_RANDOM_1);
 	}
-	
+
 	pow2 = 2 * pow2;
-	
+
 	if ((double)n > 0.95 * (double)pow2) {
 		n = (ulint) ((double)n * UT_RANDOM_2);
 	}
-	
+
 	if (n > pow2 - 20) {
 		n += 30;
 	}
 
 	/* Now we have n far enough from powers of 2. To make
-	n more random (especially, if it was not near 
-	a power of 2), we then multiply it by a random number. */ 
+	n more random (especially, if it was not near
+	a power of 2), we then multiply it by a random number. */
 
 	n = (ulint) ((double)n * UT_RANDOM_3);
-	
+
 	for (;; n++) {
 		i = 2;
 		while (i * i <= n) {
@@ -68,11 +68,11 @@ ut_find_prime(
 			}
 			i++;
 		}
-		
+
 		/* Found a prime */
 		break;
-next_n: 	;
+next_n:		;
 	}
-	
+
 	return(n);
 }
diff --git a/storage/innobase/ut/ut0ut.c b/storage/innobase/ut/ut0ut.c
index 1be5939303a..48435fe6155 100644
--- a/storage/innobase/ut/ut0ut.c
+++ b/storage/innobase/ut/ut0ut.c
@@ -117,11 +117,11 @@ ut_print_timestamp(
 	FILE*  file) /* in: file where to print */
 {
 #ifdef __WIN__
-  	SYSTEMTIME cal_tm;
+	SYSTEMTIME cal_tm;
 
-  	GetLocalTime(&cal_tm);
+	GetLocalTime(&cal_tm);
 
-  	fprintf(file,"%02d%02d%02d %2d:%02d:%02d",
+	fprintf(file,"%02d%02d%02d %2d:%02d:%02d",
 	  (int)cal_tm.wYear % 100,
 	  (int)cal_tm.wMonth,
 	  (int)cal_tm.wDay,
@@ -130,18 +130,18 @@ ut_print_timestamp(
 	  (int)cal_tm.wSecond);
 #else
 	struct tm  cal_tm;
-  	struct tm* cal_tm_ptr;
-  	time_t     tm;
+	struct tm* cal_tm_ptr;
+	time_t	   tm;
 
-  	time(&tm);
+	time(&tm);
 
 #ifdef HAVE_LOCALTIME_R
-  	localtime_r(&tm, &cal_tm);
-  	cal_tm_ptr = &cal_tm;
+	localtime_r(&tm, &cal_tm);
+	cal_tm_ptr = &cal_tm;
 #else
-  	cal_tm_ptr = localtime(&tm);
+	cal_tm_ptr = localtime(&tm);
 #endif
-  	fprintf(file,"%02d%02d%02d %2d:%02d:%02d",
+	fprintf(file,"%02d%02d%02d %2d:%02d:%02d",
 	  cal_tm_ptr->tm_year % 100,
 	  cal_tm_ptr->tm_mon + 1,
 	  cal_tm_ptr->tm_mday,
@@ -160,11 +160,11 @@ ut_sprintf_timestamp(
 	char*	buf) /* in: buffer where to sprintf */
 {
 #ifdef __WIN__
-  	SYSTEMTIME cal_tm;
+	SYSTEMTIME cal_tm;
 
-  	GetLocalTime(&cal_tm);
+	GetLocalTime(&cal_tm);
 
-  	sprintf(buf, "%02d%02d%02d %2d:%02d:%02d",
+	sprintf(buf, "%02d%02d%02d %2d:%02d:%02d",
 	  (int)cal_tm.wYear % 100,
 	  (int)cal_tm.wMonth,
 	  (int)cal_tm.wDay,
@@ -173,18 +173,18 @@ ut_sprintf_timestamp(
 	  (int)cal_tm.wSecond);
 #else
 	struct tm  cal_tm;
-  	struct tm* cal_tm_ptr;
-  	time_t     tm;
+	struct tm* cal_tm_ptr;
+	time_t	   tm;
 
-  	time(&tm);
+	time(&tm);
 
 #ifdef HAVE_LOCALTIME_R
-  	localtime_r(&tm, &cal_tm);
-  	cal_tm_ptr = &cal_tm;
+	localtime_r(&tm, &cal_tm);
+	cal_tm_ptr = &cal_tm;
 #else
-  	cal_tm_ptr = localtime(&tm);
+	cal_tm_ptr = localtime(&tm);
 #endif
-  	sprintf(buf, "%02d%02d%02d %2d:%02d:%02d",
+	sprintf(buf, "%02d%02d%02d %2d:%02d:%02d",
 	  cal_tm_ptr->tm_year % 100,
 	  cal_tm_ptr->tm_mon + 1,
 	  cal_tm_ptr->tm_mday,
@@ -204,11 +204,11 @@ ut_sprintf_timestamp_without_extra_chars(
 	char*	buf) /* in: buffer where to sprintf */
 {
 #ifdef __WIN__
-  	SYSTEMTIME cal_tm;
+	SYSTEMTIME cal_tm;
 
-  	GetLocalTime(&cal_tm);
+	GetLocalTime(&cal_tm);
 
-  	sprintf(buf, "%02d%02d%02d_%2d_%02d_%02d",
+	sprintf(buf, "%02d%02d%02d_%2d_%02d_%02d",
 	  (int)cal_tm.wYear % 100,
 	  (int)cal_tm.wMonth,
 	  (int)cal_tm.wDay,
@@ -217,18 +217,18 @@ ut_sprintf_timestamp_without_extra_chars(
 	  (int)cal_tm.wSecond);
 #else
 	struct tm  cal_tm;
-  	struct tm* cal_tm_ptr;
-  	time_t     tm;
+	struct tm* cal_tm_ptr;
+	time_t	   tm;
 
-  	time(&tm);
+	time(&tm);
 
 #ifdef HAVE_LOCALTIME_R
-  	localtime_r(&tm, &cal_tm);
-  	cal_tm_ptr = &cal_tm;
+	localtime_r(&tm, &cal_tm);
+	cal_tm_ptr = &cal_tm;
 #else
-  	cal_tm_ptr = localtime(&tm);
+	cal_tm_ptr = localtime(&tm);
 #endif
-  	sprintf(buf, "%02d%02d%02d_%2d_%02d_%02d",
+	sprintf(buf, "%02d%02d%02d_%2d_%02d_%02d",
 	  cal_tm_ptr->tm_year % 100,
 	  cal_tm_ptr->tm_mon + 1,
 	  cal_tm_ptr->tm_mday,
@@ -249,29 +249,29 @@ ut_get_year_month_day(
 	ulint*	day)	/* out: day */
 {
 #ifdef __WIN__
-  	SYSTEMTIME cal_tm;
+	SYSTEMTIME cal_tm;
 
-  	GetLocalTime(&cal_tm);
+	GetLocalTime(&cal_tm);
 
-  	*year = (ulint)cal_tm.wYear;
-  	*month = (ulint)cal_tm.wMonth;
-  	*day = (ulint)cal_tm.wDay;
+	*year = (ulint)cal_tm.wYear;
+	*month = (ulint)cal_tm.wMonth;
+	*day = (ulint)cal_tm.wDay;
 #else
 	struct tm  cal_tm;
-  	struct tm* cal_tm_ptr;
-  	time_t     tm;
+	struct tm* cal_tm_ptr;
+	time_t	   tm;
 
-  	time(&tm);
+	time(&tm);
 
 #ifdef HAVE_LOCALTIME_R
-  	localtime_r(&tm, &cal_tm);
-  	cal_tm_ptr = &cal_tm;
+	localtime_r(&tm, &cal_tm);
+	cal_tm_ptr = &cal_tm;
 #else
-  	cal_tm_ptr = localtime(&tm);
+	cal_tm_ptr = localtime(&tm);
 #endif
-  	*year = (ulint)cal_tm_ptr->tm_year + 1900;
-  	*month = (ulint)cal_tm_ptr->tm_mon + 1;
-  	*day = (ulint)cal_tm_ptr->tm_mday;
+	*year = (ulint)cal_tm_ptr->tm_year + 1900;
+	*month = (ulint)cal_tm_ptr->tm_mon + 1;
+	*day = (ulint)cal_tm_ptr->tm_mday;
 #endif
 }
 
@@ -296,9 +296,9 @@ ut_delay(
 	if (ut_always_false) {
 		ut_always_false = (ibool) j;
 	}
-	
+
 	return(j);
-}	
+}
 
 /*****************************************************************
 Prints the contents of a memory buffer in hex and ascii. */
@@ -307,7 +307,7 @@ void
 ut_print_buf(
 /*=========*/
 	FILE*		file,	/* in: file where to print */
-	const byte*	buf,	/* in: memory buffer */
+	const void*	buf,	/* in: memory buffer */
 	ulint		len)	/* in: length of the buffer */
 {
 	const byte*	data;
@@ -315,13 +315,13 @@ ut_print_buf(
 
 	fprintf(file, " len %lu; hex ", len);
 
-	for (data = buf, i = 0; i < len; i++) {
+	for (data = (const byte*)buf, i = 0; i < len; i++) {
 		fprintf(file, "%02lx", (ulong)*data++);
 	}
 
 	fputs("; asc ", file);
 
-	data = buf;
+	data = (const byte*)buf;
 
 	for (i = 0; i < len; i++) {
 		int	c = (int) *data++;
@@ -408,7 +408,7 @@ Outputs a fixed-length string, quoted as an SQL identifier. */
 
 void
 ut_print_namel(
-/*==========*/
+/*===========*/
 	FILE*		f,	/* in: output stream */
 	trx_t*		trx,	/* in: transaction (NULL=no quotes) */
 	const char*	name,	/* in: name to print */
author	unknown <aivanov@mysql.com>	2006-03-10 19:22:21 +0300
committer	unknown <aivanov@mysql.com>	2006-03-10 19:22:21 +0300
commit	050f14ac371e03dc96b96e8a9b0cd8fa8e3a23e0 (patch)
tree	8105d79f7267d8af93861befd1899063f1ad42c2 /storage/innobase/ut
parent	1cef1679a47bfbf744d656646770193ba07c30fe (diff)
download	mariadb-git-050f14ac371e03dc96b96e8a9b0cd8fa8e3a23e0.tar.gz