~drizzle-trunk/drizzle/development : changes

~drizzle-trunk/drizzle/development » Changes from revision 1819.5.262

Rev	Summary	Authors	Date
1819.5.242	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6800 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6800 Original Authors: marko Original commit message: branches/zip: Add ut_ad(mtr->state == MTR_ACTIVE) to various places.	marko	14 years ago
1819.5.241	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6799 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6799 Original Authors: jyang Original commit message: branches/zip: Once change in bug #47621 merges into zip branch, zip only test innodb_bug44571 needs to be updated to reflect the column name change would be successful be done in InnoDB as well.	jyang	14 years ago
1819.5.240	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6798 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6798 Original Authors: marko Original commit message: branches/zip: Fix and clarify the latching of some buf_block_t members. buf_block_t::check_index_page_at_flush: Note that this field is not protected by any mutex. Make it a separate field, not a bitfield that could share the machine word with other fields. buf_block_t::lock_hash_val: Note that this field is protected by buf_block_t::lock (or during block creation, by buf_pool_mutex and buf_block_t::mutex). buf_block_get_lock_hash_val(): Assert that block->lock is held by the current thread. Issue #465, rb://267 approved by Inaam Rana	marko	14 years ago
1819.5.239	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6793 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6793 the handler patch doesn't apply to Drizzle: alter table codepath is different. However, we should stil have the test. Original Authors: marko Original commit message: branches/zip: Merge revisions 6669:6788 from branches/5.1: ------------------------------------------------------------------------ r6774 \| calvin \| 2010-03-03 23:56:10 +0200 (Wed, 03 Mar 2010) \| 2 lines Changed paths: M /branches/5.1/trx/trx0sys.c branches/5.1: fix bug#51653: outdated reference to set-variable Non functional change. ------------------------------------------------------------------------ r6780 \| vasil \| 2010-03-08 19:13:20 +0200 (Mon, 08 Mar 2010) \| 4 lines Changed paths: M /branches/5.1/plug.in branches/5.1: Whitespace fixup. ------------------------------------------------------------------------ r6783 \| jyang \| 2010-03-09 17:54:14 +0200 (Tue, 09 Mar 2010) \| 9 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/mysql-test/innodb_bug21704.result A /branches/5.1/mysql-test/innodb_bug47621.result A /branches/5.1/mysql-test/innodb_bug47621.test branches/5.1: Fix bug #47621 "MySQL and InnoDB data dictionaries will become out of sync when renaming columns". MySQL does not provide new column name information to storage engine to update the system table. To avoid column name mismatch, we shall just request a table copy for now. rb://246 approved by Marko. ------------------------------------------------------------------------ r6785 \| vasil \| 2010-03-10 09:04:38 +0200 (Wed, 10 Mar 2010) \| 11 lines Changed paths: M /branches/5.1/mysql-test/innodb_bug38231.test branches/5.1: Add the missing --reap statements in innodb_bug38231.test. Probably MySQL enforced the presence of those recently and the test started failing like: main.innodb_bug38231 [ fail ] Test ended at 2010-03-10 08:48:32 CURRENT_TEST: main.innodb_bug38231 mysqltest: At line 49: Cannot run query on connection between send and reap ------------------------------------------------------------------------ r6788 \| vasil \| 2010-03-10 10:53:21 +0200 (Wed, 10 Mar 2010) \| 8 lines Changed paths: M /branches/5.1/mysql-test/innodb_bug38231.test branches/5.1: In innodb_bug38231.test: replace the fragile sleep 0.2 that depends on timing with a more robust condition which waits for the TRUNCATE and LOCK commands to appear in information_schema.processlist. This could also break if there are other sessions executing the same SQL commands, but there are none during the execution of the mysql test. ------------------------------------------------------------------------	marko	14 years ago
1819.5.238	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6792 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6792 Original Authors: marko Original commit message: branches/zip: Copy tests from branches/5.1 that were lost in some merge.	marko	14 years ago
1819.5.237	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6791 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6791 Original Authors: marko Original commit message: branches/zip: Add ChangeLog entries for r6789, r6790.	marko	14 years ago
1819.5.236	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6790 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6790 Original Authors: jyang Original commit message: branches/zip: Fix bug #51356: "many valgrind errors in error messages with concurrent ddl". Null terminate the name string returned from innobase_convert_identifier() call when reporting DB_DUPLICATE_KEY error in create_table_def(). rb://266 approved by Marko	jyang	14 years ago
1819.5.235	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6789 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6789 Original Authors: jyang Original commit message: branches/zip: If a unique index is on a column prefix, such unique index cannot be upgrade to primary index even if there is no primary index already defined. Also fix possible corruption when initialize "ref_length" value in case there is a mismatch between MySQL and InnoDB primary key. Fix bug #51378: "Init 'ref_length' to correct value, in case an out of bound MySQL primary_key". rb://262 approved by Marko.	jyang	14 years ago
1819.5.234	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6787 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6787 Original Authors: marko Original commit message: branches/zip: recv_parse_log_rec(): Remove a bogus assertion about page_no. TODO: We might also consider removing recv_max_parsed_page_no, because it does not make much sense with *.ibd files. recv_report_corrupt_log(), recv_scan_log_recs(): Abort when a corrupted log record has been found, unless innodb_force_recovery has been set. This fixes Issue #464. rb://265 approved by Heikki Tuuri	marko	14 years ago
1819.5.233	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6786 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6786 Currently doesn't apply to drizzle: we need to merge these tests. Original Authors: vasil Original commit message: branches/zip: Fix typo in comment	vasil	14 years ago
1819.5.232	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6782 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6782 Original Authors: marko Original commit message: branches/zip: fil0fil.c: Update comments on table->flags as of r6252.	marko	14 years ago
1819.5.231	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6781 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6781 Original Authors: marko Original commit message: branches/zip: Make SHOW ENGINE INNODB MUTEX display SUM(os_waits) for block mutexes and blocks. Designed by Michael and Marko. rb://188, Issue #358	marko	14 years ago
1819.5.230	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6779 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6779 Original Authors: marko Original commit message: branches/zip: Fix IMPORT TABLESPACE of compressed tables. Previously, a wrong parameter was passed to buf_flush_init_for_writing(). fil_reset_too_high_lsns(): Set up page_zip and use it if needed. rb://264, Issue #352	marko	14 years ago
1819.5.229	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6777 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6777 Original Authors: marko Original commit message: branches/zip: trx_undo_update_rec_get_update(): Silence a bogus GCC warning about a possibly uninitialized variable.	marko	14 years ago
1819.5.228	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6773 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6773 Original Authors: marko Original commit message: branches/zip: row_raw_format(): Silence a GCC 4.4.2 warning of possibly uninitialized variable format_in_hex.	marko	14 years ago
1819.5.227	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6771 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6771 Original Authors: marko Original commit message: Document r6770.	marko	14 years ago
1819.5.226	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6770 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6770 Original Authors: marko Original commit message: branches/zip: Disallow duplicate index name when creating an index. This should fix Mantis Issue #461. innodb.test, innodb.result, innodb-index.test, innodb-index.result: Adjust the test result and mention that the introduced restriction has been reported as MySQL Bug #51451. innobase_check_index_keys(): Add a parameter for the InnoDB table and check that no duplicate index name is added. Report errors by my_error() instead of sql_print_error(). rb://260 approved by Sunny Bains	marko	14 years ago
1819.5.225	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6768 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6768 Original Authors: vasil Original commit message: branches/zip: Add a NOTE to the comment of btr_node_ptr_get_child_page_no() to prevent mysterious bugs.	vasil	14 years ago
1819.5.224	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6767 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6767 Original Authors: calvin Original commit message: branches/zip: fix bug#51587 Non-functional change.	calvin	14 years ago
1819.5.223	Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a3... Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6754 from MySQL InnoDB Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6754 Original Authors: marko Original commit message: branches/zip: Allocate the merge sort buffers from a heap, not stack. The merge sort can use up to 48KiB of buffers when merging blocks. That can cause a stack overflow, especially on 64-bit systems when not building with inlined functions. This was reported as Issue #462. row_merge_dup_report(): Allocate buf and offsets from a heap. row_merge_heap_create(): Allocate space for buf[3] too. Fix bogus sizeof arithmetics that happened to work, because sizeof(ulint)==sizeof(void*). row_merge_blocks(), row_merge_blocks_copy(): Allocate buf[3] from heap. row_merge_insert_index_tuples(): Allocate buf from graph_heap. rb://258 approved and tested by Sunny Bains	marko	14 years ago