mariadb

Commit Graph

Author	SHA1	Message	Date
marko	a4f279a2e9	branches/innodb+: Merge revisions 3579:3599 from branches/zip: ------------------------------------------------------------------------ r3589 \| marko \| 2008-12-18 15:24:44 +0200 (Thu, 18 Dec 2008) \| 2 lines branches/zip: ha_innodb.cc: Do not include some unnecessary MySQL header files. ------------------------------------------------------------------------ r3594 \| marko \| 2008-12-19 13:58:13 +0200 (Fri, 19 Dec 2008) \| 4 lines branches/zip: HASH_INSERT, HASH_DELETE: Add explicit type conversions, so that the macros will expand to valid C++. Unlike C++, C allows implicit type conversions from void* to other pointer types. ------------------------------------------------------------------------ r3597 \| marko \| 2008-12-22 12:27:16 +0200 (Mon, 22 Dec 2008) \| 3 lines branches/zip: Pass the caller's file name and line number to row_mysql_lock_data_dictionary(), row_mysql_freeze_data_dictionary(), to better track down locking issues that involve dict_operation_lock. ------------------------------------------------------------------------ r3599 \| marko \| 2008-12-22 15:41:47 +0200 (Mon, 22 Dec 2008) \| 36 lines branches/zip: Merge revisions 3479:3598 from branches/5.1: ------------------------------------------------------------------------ r3588 \| inaam \| 2008-12-18 14:26:54 +0200 (Thu, 18 Dec 2008) \| 8 lines branches/5.1 It is a bug in unused code. If we don't calculate the hash value when calculating the mutex number then two pages which map to same hash value can get two different mutex numbers. Approved by: Marko ------------------------------------------------------------------------ r3590 \| marko \| 2008-12-18 15:33:36 +0200 (Thu, 18 Dec 2008) \| 11 lines branches/5.1: When converting a record to MySQL format, copy the default column values for columns that are SQL NULL. This addresses failures in row-based replication (Bug #39648). row_prebuilt_t: Add default_rec, for the default values of the columns in MySQL format. row_sel_store_mysql_rec(): Use prebuilt->default_rec instead of padding columns. rb://64 approved by Heikki Tuuri ------------------------------------------------------------------------ r3598 \| marko \| 2008-12-22 15:28:03 +0200 (Mon, 22 Dec 2008) \| 6 lines branches/5.1: ibuf_delete_rec(): When the record cannot be found and the tablespace has been dropped, commit the mini-transaction, so that InnoDB will not hold the insert buffer tree latch in exclusive mode, causing a potential deadlock. This bug was introduced in the fix of Bug #27276 in r2924. ------------------------------------------------------------------------ ------------------------------------------------------------------------	17 years ago
marko	5da5707b11	branches/innodb+: Merge revisions 3575:3579 from branches/zip: ------------------------------------------------------------------------ r3577 \| vasil \| 2008-12-17 14:58:26 +0200 (Wed, 17 Dec 2008) \| 6 lines branches/zip: Remove 2 entries from the ChangeLog about changes not big enough. Discussed with: Marko ------------------------------------------------------------------------ r3579 \| marko \| 2008-12-17 22:40:38 +0200 (Wed, 17 Dec 2008) \| 3 lines branches/zip: row_sel_try_search_shortcut(), row_sel(): Adjust two debug assertions that should have been adjusted in r3575. ------------------------------------------------------------------------	17 years ago
marko	82cfb40dab	branches/innodb+: Merge revisions 3544:3575 from branches/zip: ------------------------------------------------------------------------ r3572 \| marko \| 2008-12-17 11:19:56 +0200 (Wed, 17 Dec 2008) \| 3 lines Changed paths: M /branches/zip/ChangeLog M /branches/zip/btr/btr0sea.c M /branches/zip/buf/buf0buf.c M /branches/zip/buf/buf0lru.c M /branches/zip/ha/ha0ha.c M /branches/zip/ha/hash0hash.c M /branches/zip/include/buf0buf.h M /branches/zip/include/ha0ha.h M /branches/zip/include/ha0ha.ic M /branches/zip/include/hash0hash.h M /branches/zip/include/univ.i branches/zip: Introduce UNIV_AHI_DEBUG for debugging the adaptive hash index without enabling UNIV_DEBUG. ------------------------------------------------------------------------ r3574 \| marko \| 2008-12-17 12:44:31 +0200 (Wed, 17 Dec 2008) \| 2 lines Changed paths: M /branches/zip/ChangeLog branches/zip: ChangeLog: Document recent changes that were not included in InnoDB Plugin 1.0.2, except changes to source code comments. ------------------------------------------------------------------------ r3575 \| marko \| 2008-12-17 14:40:58 +0200 (Wed, 17 Dec 2008) \| 12 lines Changed paths: M /branches/zip/ChangeLog M /branches/zip/include/row0sel.h M /branches/zip/include/row0upd.h M /branches/zip/pars/pars0pars.c M /branches/zip/row/row0mysql.c M /branches/zip/row/row0sel.c M /branches/zip/row/row0upd.c branches/zip: Remove update-in-place-in-select from the internal SQL interpreter. It was only used for updating the InnoDB internal data dictionary when renaming or dropping tables. It could have caused deadlocks after acquiring latches on insert buffer bitmap pages. This and r3544 should fix Issue #135. Furthermore, the update-in-place-in-select does not account for compression failure. That was not a problem yet, since the InnoDB SQL interpreter has so far assumed ROW_FORMAT=REDUNDANT. rb://63 approved by Heikki Tuuri ------------------------------------------------------------------------	17 years ago
marko	2d403a4d2c	branches/innodb+: row_ins_index_entry_low(): Do not attempt to buffer inserts into the clustered index, so that the ut_ad() introduced in r3475 will not fail.	17 years ago
marko	880a55f779	branches/innodb+: Merge revisions 3541:3544 from branches/zip: ------------------------------------------------------------------------ r3541 \| marko \| 2008-12-16 12:14:58 +0200 (Tue, 16 Dec 2008) \| 3 lines branches/zip: btr_cur_optimistic_delete(): Note that no further pages must be latched before calling mtr_commit(mtr) if the function returns TRUE. ------------------------------------------------------------------------ r3544 \| marko \| 2008-12-16 15:52:36 +0200 (Tue, 16 Dec 2008) \| 20 lines branches/zip: Do not update the free bits in the insert buffer bitmap when inserting or deleting from the insert buffer B-tree. Assert that records in the insert buffer B-tree are never updated. This could cure Issue #135. btr_cur_optimistic_insert(): Do not update the insert buffer bitmap when inserting to the insert buffer tree. btr_cur_optimistic_delete(): Do not update the insert buffer bitmap when deleting from the insert buffer tree. This could be the cause of the assertion failure that was reported in Issue #135. btr_cur_update_alloc_zip(): Assert that the index is not the insert buffer. The insert buffer will never be stored in compressed format. btr_cur_update_in_place(), btr_cur_optimistic_update(), btr_cur_pessimistic_update(): Assert that these functions are never invoked on the insert buffer tree. The insert buffer only supports the insertion and deletion of records. ------------------------------------------------------------------------	17 years ago
marko	0a8380ab4a	branches/innodb+: Merge revisions 3519:3541 from branches/zip: ------------------------------------------------------------------------ r3537 \| marko \| 2008-12-16 10:24:03 +0200 (Tue, 16 Dec 2008) \| 3 lines branches/zip: sync_thread_add_level(): Add a comment explaining the assertion about SYNC_BUF_POOL and SYNC_BUF_BLOCK. ------------------------------------------------------------------------ r3540 \| marko \| 2008-12-16 12:13:31 +0200 (Tue, 16 Dec 2008) \| 2 lines branches/zip: buf_page_init_for_read(): Use common code for error exit. ------------------------------------------------------------------------ r3541 \| marko \| 2008-12-16 12:14:58 +0200 (Tue, 16 Dec 2008) \| 3 lines branches/zip: btr_cur_optimistic_delete(): Note that no further pages must be latched before calling mtr_commit(mtr) if the function returns TRUE. ------------------------------------------------------------------------	17 years ago
marko	79e5dc96c4	branches/innodb+: ibuf_insert_low(): Use common error handling when holding a latch on the insert buffer bitmap page.	17 years ago
marko	364910b122	branches/innodb+: Merge revisions 3498:3519 from branches/zip: ------------------------------------------------------------------------ r3514 \| marko \| 2008-12-12 13:39:40 +0200 (Fri, 12 Dec 2008) \| 3 lines branches/zip: btr_cur_search_to_nth_level(): Remove a duplicate check for (rw_latch != RW_NO_LATCH) around debug code. ------------------------------------------------------------------------ Other branches/zip revisions in that range were backported from branches/innodb+ and were thus not merged back to branches/innodb+.	17 years ago
marko	f13f514c65	branches/innodb+: ibuf_merge_or_delete_for_page(): Replace a double if with a single functionally equivalent if.	17 years ago
marko	60bbfd6d0b	branches/innodb+: Clean up the buffering of purges. Instead of traversing the index B-tree twice (first in BTR_WATCH_LEAF mode and then in BTR_DELETE mode), let BTR_DELETE take care of checking that the record can be purged, and either buffering or performing the purge. row_purge_poss_sec(): New function, to check if it is possible to purge a secondary index record. Refactored from row_purge_remove_sec_if_poss_low(). row_purge_remove_sec_if_poss_nonbuffered(): Rename to row_purge_remove_sec_if_poss_tree(). Remove the parameter mode (always use BTR_MODIFY_TREE). Use row_purge_poss_sec(). row_purge_remove_sec_if_poss_low(): Rename to row_purge_remove_sec_if_poss_leaf(). Remove the parameter mode (always use BTR_MODIFY_LEAF). Let row_search_index_entry() do all the hard work. btr_cur_t: Add purge_node, which will be needed by btr_cur_search_to_nth_level() for BTR_DELETE. Replace the flag value BTR_CUR_ABORTED with BTR_CUR_DELETE_REF and BTR_CUR_DELETE_FAILED. enum row_search_result, row_search_index_entry(): Replace ROW_NOT_IN_POOL with ROW_NOT_DELETED_REF and ROW_NOT_DELETED. btr_cur_search_to_nth_level(): Remove BTR_WATCH_LEAF. As a side effect, the adaptive hash index can be used in purge as well. If BTR_DELETE cannot be buffered, attempt btr_cur_optimistic_delete(). Either way, check row_purge_poss_sec(). Move the code to set cursor->ibuf_count to get rid of another if (height == 0) check. Eliminate the label loop_end. Do not call ibuf_should_try() twice. ibuf_should_try(): Now that the successful calls to this function will be halved, halve the magic constant that ibuf_flush_count will be compared to, accordingly. The changes regarding ibuf_should_try() were merged from branches/zip r3515. rb://60 approved by Heikki over IM	17 years ago
marko	bc452636db	branches/innodb+: btr_cur_search_to_nth_level(): Move some code before the only goto loop_end after the loop_end: label to improve readability.	17 years ago
marko	a78bf6ddda	branches/innodb+: ibuf_insert_low(): Combine two nested if statements to one. Note that buf_pool_watch_occurred(space, page_no) could start to hold again and explain why it is not a problem.	17 years ago
marko	7d55225783	branches/innodb+: btr_cur_search_to_nth_level(): Check for BTR_INSERT, BTR_DELETE, and BTR_DELETE_MARK in a single switch, and assert that at most one is specified at a time.	17 years ago
marko	127664ebc6	branches/innodb+: Merge revisions 3459:3498 from branches/zip: ------------------------------------------------------------------------ r3459 \| vasil \| 2008-12-09 11:49:03 +0200 (Tue, 09 Dec 2008) \| 152 lines branches/zip: Merge 2929:3458 from branches/5.1 (resolving conflict in c3257, note also that r3363 reverted r2933 so there are not changes in mysql-test/innodb-autoinc.result with the current merge): ------------------------------------------------------------------------ r2933 \| calvin \| 2008-10-30 02:57:31 +0200 (Thu, 30 Oct 2008) \| 10 lines Changed paths: M /branches/5.1/mysql-test/innodb-autoinc.result branches/5.1: correct the result file innodb-autoinc.result Change the followings: auto_increment_increment auto_increment_offset to auto-increment-increment auto-increment-offset ------------------------------------------------------------------------ r2981 \| marko \| 2008-11-07 14:54:10 +0200 (Fri, 07 Nov 2008) \| 5 lines Changed paths: M /branches/5.1/row/row0mysql.c branches/5.0: row_mysql_store_col_in_innobase_format(): Correct a misleading comment. In the UTF-8 encoding, ASCII takes 1 byte per character, while the "latin1" character set (normally ISO-8859-1, but in MySQL it actually refers to the Windows Code Page 1252 a.k.a. CP1252, WinLatin1) takes 1 to 3 bytes (1 to 2 bytes for the ISO-8859-1 subset). ------------------------------------------------------------------------ r3114 \| calvin \| 2008-11-14 20:31:48 +0200 (Fri, 14 Nov 2008) \| 8 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: fix bug#40386: Not flushing query cache after truncate ha_statistics.records can not be 0 unless the table is empty, set to 1 instead. The original problem of bug#29507 is fixed in the server. Additional test was done with the fix of bug#29507 in the server. Approved by: Heikki (on IM) ------------------------------------------------------------------------ r3257 \| inaam \| 2008-11-24 22:06:50 +0200 (Mon, 24 Nov 2008) \| 13 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/srv/srv0srv.c M /branches/5.1/trx/trx0trx.c branches/5.1 bug#40760 The config param innodb_thread_concurrency is dynamically set and is read when a thread enters/exits innodb. If the value is changed between the enter and exit time the behaviour becomes erratic. The fix is not to use srv_thread_concurrency when exiting, instead use the flag trx->declared_to_be_inside_innodb. rb://57 Approved by: Marko ------------------------------------------------------------------------ r3363 \| calvin \| 2008-12-04 19:00:20 +0200 (Thu, 04 Dec 2008) \| 13 lines Changed paths: M /branches/5.1/mysql-test/innodb-autoinc.result branches/5.1: revert the changes in r2933 The changes in r2933 causes test failure on Linux. More investigation is needed for Windows. Change the followings in innodb-autoinc.result: auto-increment-increment auto-increment-offset back to: auto_increment_increment auto_increment_offset ------------------------------------------------------------------------ r3412 \| vasil \| 2008-12-05 10:46:18 +0200 (Fri, 05 Dec 2008) \| 7 lines Changed paths: M /branches/5.1/trx/trx0undo.c branches/5.1: Add the traditional 2 spaces after the timestamp so the message does not look like: 070223 13:26:01InnoDB: Warning: canno.... ------------------------------------------------------------------------ r3458 \| vasil \| 2008-12-09 11:21:08 +0200 (Tue, 09 Dec 2008) \| 51 lines Changed paths: M /branches/5.1/mysql-test/innodb_bug34300.test branches/5.1: Merge a change from MySQL to fix the failing innodb_bug34300 mysql-test: main.innodb_bug34300 [ fail ] mysqltest: At line 11: query 'SET @@max_allowed_packet=16777216' failed: 1621: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value Aborting: main.innodb_bug34300 failed in default mode. The changeset is this: ------------------------------------------------------------ revno: 2709.1.10 committer: Staale Smedseng <staale.smedseng@sun.com> branch nick: b22891-51-bugteam timestamp: Thu 2008-11-20 08:51:48 +0100 message: A fix for Bug#22891 "session level max_allowed_packet can be set but is ignored". This patch makes @@session.max_allowed_packed and @@session.net_buffer_length read-only as suggested in the bug report. The user will have to use SET GLOBAL (and reconnect) to alter the session values of these variables. The error string ER_VARIABLE_IS_READONLY is introduced. Tests are modified accordingly. modified: mysql-test/r/func_compress.result mysql-test/r/max_allowed_packet_basic.result mysql-test/r/max_allowed_packet_func.result mysql-test/r/net_buffer_length_basic.result mysql-test/r/packet.result mysql-test/r/union.result mysql-test/r/variables.result mysql-test/t/func_compress.test mysql-test/t/innodb_bug34300.test mysql-test/t/max_allowed_packet_basic.test mysql-test/t/max_allowed_packet_func.test mysql-test/t/net_buffer_length_basic.test mysql-test/t/packet.test mysql-test/t/union.test mysql-test/t/variables.test sql/set_var.cc sql/set_var.h sql/share/errmsg.txt ------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------------------------------------------ r3480 \| calvin \| 2008-12-10 23:56:00 +0200 (Wed, 10 Dec 2008) \| 11 lines branches/zip: Merge r3458:3479 from branches/5.1: ------------------------------------------------------------------------ r3479 \| calvin \| 2008-12-10 15:30:05 -0600 (Wed, 10 Dec 2008) \| 4 lines branches/5.1: change .result file eol-style to LF mysql-test-run only takes LF style even on Windows. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r3481 \| calvin \| 2008-12-11 00:01:20 +0200 (Thu, 11 Dec 2008) \| 4 lines branches/zip: change diff and result files eol-style to LF The patch utility takes LF style diff, and mysql-test-run also only takes LF style, even on Windows. ------------------------------------------------------------------------ r3482 \| calvin \| 2008-12-11 00:19:07 +0200 (Thu, 11 Dec 2008) \| 9 lines branches/zip: fix Mantis issue #138 InnoDB fails if innodb_buffer_pool_size >= 4096M on x64 Windows All three srv_buf_pool related variables are defined as ulong, which is 32-bit on 64-bit Windows. They are changed to 64-bit ulint. Also system_info.dwPageSize appears to be 32-bit only. Casting to 64-bit is required. Approved by: Marko (on IM) ------------------------------------------------------------------------ r3498 \| marko \| 2008-12-11 17:08:14 +0200 (Thu, 11 Dec 2008) \| 6 lines branches/zip: ibuf_merge_or_delete_for_page(): Restore the seemingly redundant checks for ibuf_fixed_addr_page() \|\| fsp_descr_page() that were removed in r3432, and add a comment explaining why. Thanks to Michael for reporting this bug. ------------------------------------------------------------------------	17 years ago
marko	2bd90b444b	branches/innodb+: When buffering an insert, notify the buffer pool watch. This should fix the race condition that seems to have caused Issue #126: When another thread is buffering an insert for the record that is being purged, it should invoke buf_pool_watch_notify(), so that the purge will not be buffered. Otherwise, the purge would be buffered for the wrong record (one that was inserted after the purge determined that the record can be removed). When deletes are not buffered, the latch on the secondary index page would prevent the insert from occurring. In delete buffering, the buf_pool_watch replaces the page latch when the page is not in the buffer pool. buf_pool_watch_notify(): Make public. ibuf_insert(): Invoke buf_pool_watch_notify() when buffering an insert or a delete-mark operation.	17 years ago
marko	838b690902	branches/innodb+: ibuf_delete(), row_purge_remove_sec_if_poss_low_nonbuffered(): Add debug assertions that records to be purged must have been marked for deletion.	17 years ago
marko	fbb5613551	branches/innodb+: row_upd_sec_index_entry(): Eliminate a goto.	17 years ago
marko	efbc02a9c0	branches/innodb+: btr_cur_search_to_nth_level(): Add debug assertions that operations on clustered indexes or on the insert buffer B-tree must not be buffered.	17 years ago
marko	4c7f7c4248	branches/innodb+: Merge revisions 3312:3459 from branches/zip: ------------------------------------------------------------------------ r3328 \| marko \| 2008-12-02 10:16:05 +0200 (Tue, 02 Dec 2008) \| 7 lines branches/zip: page_cur_insert_rec_zip(): When allocating insert_buf from the free list, zero out the DB_TRX_ID and DB_ROLL_PTR of the deleted record if the new record would not overwrite these fields. This fixes a harmless content mismatch reported by page_zip_validate() that was reported as Issue #111. rb://55 approved by Sunny Bains. ------------------------------------------------------------------------ r3329 \| vasil \| 2008-12-02 12:03:17 +0200 (Tue, 02 Dec 2008) \| 4 lines branches/zip: Add entry in the ChangeLog for the release of 1.0.2. ------------------------------------------------------------------------ r3331 \| vasil \| 2008-12-02 12:09:20 +0200 (Tue, 02 Dec 2008) \| 5 lines branches/zip: Remove an entry from the ChnageLog for a change that was made before the release of 1.0.2 but was not included in that release. ------------------------------------------------------------------------ r3333 \| vasil \| 2008-12-02 12:11:54 +0200 (Tue, 02 Dec 2008) \| 4 lines branches/zip: Now that 1.0.2 is out, the current tree is version 1.0.3. ------------------------------------------------------------------------ r3336 \| vasil \| 2008-12-02 13:34:36 +0200 (Tue, 02 Dec 2008) \| 5 lines branches/zip: Resurrect a ChangeLog entry that I removed in c3331 with a fake date so it does not appear that it has been included in 1.0.2. ------------------------------------------------------------------------ r3361 \| vasil \| 2008-12-04 18:10:08 +0200 (Thu, 04 Dec 2008) \| 9 lines branches/zip: Fix Mantis issue#103 mysql_addons.c depends on THD internals - please remove it Use MySQL's thd_get_thread_id() instead of our own ib_thd_get_thread_id() since MySQL implemented the former, see http://bugs.mysql.com/30930. Approved by: Marko (https://svn.innodb.com/rb/r/40, rb://40) ------------------------------------------------------------------------ r3362 \| vasil \| 2008-12-04 18:49:24 +0200 (Thu, 04 Dec 2008) \| 15 lines branches/zip: Revert our temporary fix for Bug#40360 Binlog related errors with binlog off This bug was fixed in MySQL code. Our fix went into r2944 and r2947, but this patch does not entirely revert those revisions because we want to leave the test case that was introduced and also r2944 itself reverted r2935 and r2936. So if we completely revert r2944 and r2947 then we would loose the test and will restore r2935 and r2936. This resolves Issue#108 We should remove ib_bin_log_is_engaged() once mysql add an equivallent, see Bug#40360 ------------------------------------------------------------------------ r3404 \| marko \| 2008-12-05 10:02:54 +0200 (Fri, 05 Dec 2008) \| 5 lines branches/zip: row_undo_mod_del_mark_or_remove_sec_low(): Do not complain if the record is not found. Explain that this is possible when a deadlock occurs during an update. Heikki investigated this in Issue #134. ------------------------------------------------------------------------ r3432 \| marko \| 2008-12-08 14:14:01 +0200 (Mon, 08 Dec 2008) \| 4 lines branches/zip: ibuf_merge_or_delete_for_page(): Remove the redundant checks for ibuf_fixed_addr_page() \|\| fsp_descr_page(). The one at the beginning of the function is enough. ------------------------------------------------------------------------ r3456 \| marko \| 2008-12-09 10:31:26 +0200 (Tue, 09 Dec 2008) \| 3 lines branches/zip: row_purge_remove_sec_if_poss_low(): Allocate mtr_vers from the stack, not with mem_alloc(). ------------------------------------------------------------------------ r3459 \| vasil \| 2008-12-09 11:49:03 +0200 (Tue, 09 Dec 2008) \| 152 lines branches/zip: Merge 2929:3458 from branches/5.1 (resolving conflict in c3257, note also that r3363 reverted r2933 so there are not changes in mysql-test/innodb-autoinc.result with the current merge): ------------------------------------------------------------------------ r2933 \| calvin \| 2008-10-30 02:57:31 +0200 (Thu, 30 Oct 2008) \| 10 lines Changed paths: M /branches/5.1/mysql-test/innodb-autoinc.result branches/5.1: correct the result file innodb-autoinc.result Change the followings: auto_increment_increment auto_increment_offset to auto-increment-increment auto-increment-offset ------------------------------------------------------------------------ r2981 \| marko \| 2008-11-07 14:54:10 +0200 (Fri, 07 Nov 2008) \| 5 lines Changed paths: M /branches/5.1/row/row0mysql.c branches/5.0: row_mysql_store_col_in_innobase_format(): Correct a misleading comment. In the UTF-8 encoding, ASCII takes 1 byte per character, while the "latin1" character set (normally ISO-8859-1, but in MySQL it actually refers to the Windows Code Page 1252 a.k.a. CP1252, WinLatin1) takes 1 to 3 bytes (1 to 2 bytes for the ISO-8859-1 subset). ------------------------------------------------------------------------ r3114 \| calvin \| 2008-11-14 20:31:48 +0200 (Fri, 14 Nov 2008) \| 8 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: fix bug#40386: Not flushing query cache after truncate ha_statistics.records can not be 0 unless the table is empty, set to 1 instead. The original problem of bug#29507 is fixed in the server. Additional test was done with the fix of bug#29507 in the server. Approved by: Heikki (on IM) ------------------------------------------------------------------------ r3257 \| inaam \| 2008-11-24 22:06:50 +0200 (Mon, 24 Nov 2008) \| 13 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/srv/srv0srv.c M /branches/5.1/trx/trx0trx.c branches/5.1 bug#40760 The config param innodb_thread_concurrency is dynamically set and is read when a thread enters/exits innodb. If the value is changed between the enter and exit time the behaviour becomes erratic. The fix is not to use srv_thread_concurrency when exiting, instead use the flag trx->declared_to_be_inside_innodb. rb://57 Approved by: Marko ------------------------------------------------------------------------ r3363 \| calvin \| 2008-12-04 19:00:20 +0200 (Thu, 04 Dec 2008) \| 13 lines Changed paths: M /branches/5.1/mysql-test/innodb-autoinc.result branches/5.1: revert the changes in r2933 The changes in r2933 causes test failure on Linux. More investigation is needed for Windows. Change the followings in innodb-autoinc.result: auto-increment-increment auto-increment-offset back to: auto_increment_increment auto_increment_offset ------------------------------------------------------------------------ r3412 \| vasil \| 2008-12-05 10:46:18 +0200 (Fri, 05 Dec 2008) \| 7 lines Changed paths: M /branches/5.1/trx/trx0undo.c branches/5.1: Add the traditional 2 spaces after the timestamp so the message does not look like: 070223 13:26:01InnoDB: Warning: canno.... ------------------------------------------------------------------------ r3458 \| vasil \| 2008-12-09 11:21:08 +0200 (Tue, 09 Dec 2008) \| 51 lines Changed paths: M /branches/5.1/mysql-test/innodb_bug34300.test branches/5.1: Merge a change from MySQL to fix the failing innodb_bug34300 mysql-test: main.innodb_bug34300 [ fail ] mysqltest: At line 11: query 'SET @@max_allowed_packet=16777216' failed: 1621: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value Aborting: main.innodb_bug34300 failed in default mode. The changeset is this: ------------------------------------------------------------ revno: 2709.1.10 committer: Staale Smedseng <staale.smedseng@sun.com> branch nick: b22891-51-bugteam timestamp: Thu 2008-11-20 08:51:48 +0100 message: A fix for Bug#22891 "session level max_allowed_packet can be set but is ignored". This patch makes @@session.max_allowed_packed and @@session.net_buffer_length read-only as suggested in the bug report. The user will have to use SET GLOBAL (and reconnect) to alter the session values of these variables. The error string ER_VARIABLE_IS_READONLY is introduced. Tests are modified accordingly. modified: mysql-test/r/func_compress.result mysql-test/r/max_allowed_packet_basic.result mysql-test/r/max_allowed_packet_func.result mysql-test/r/net_buffer_length_basic.result mysql-test/r/packet.result mysql-test/r/union.result mysql-test/r/variables.result mysql-test/t/func_compress.test mysql-test/t/innodb_bug34300.test mysql-test/t/max_allowed_packet_basic.test mysql-test/t/max_allowed_packet_func.test mysql-test/t/net_buffer_length_basic.test mysql-test/t/packet.test mysql-test/t/union.test mysql-test/t/variables.test sql/set_var.cc sql/set_var.h sql/share/errmsg.txt ------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------------------------------------------	17 years ago
marko	6c3a99a738	branches/innodb+: btr_cur_t: Remove leaf_in_buf_pool. The flag can be determined from flag == BTR_CUR_ABORTED. This flag value was previously never tested for. It was only assigned to, in the only place where leaf_in_buf_pool would be set FALSE. btr_cur_search_to_nth_level(): Do not initialize cursor->leaf_in_buf_pool. btr_pcur_was_buffered(): Remove. The only caller, row_search_index_entry(), will switch (cursor->flag) and handle BTR_CUR_ABORTED as well. row_purge_remove_sec_if_poss_low(): Remove the assertions on leaf_in_buf_pool.	17 years ago
inaam	dedade9f2e	branches/innodb+ I have added some too strict assertions on Marko's suggestion in r3355. This patch removes those assertions.	17 years ago
inaam	d81f82284d	branches/innodb+ issue#115 This is to fix issues introduced by recovery enhancements committed through r2993. The fix is to update flush_rbt whenever flush_list is manipulated because of buf_page/buf_block relocation. rb://54 Reviewed by: Marko	17 years ago
marko	8b4a0686a8	branches/innodb+: ibuf_insert_low(): Remove a race condition related to buf_pool_watch_occurred() and add explaining comments.	17 years ago
marko	13ee04a24c	branches/innodb+: ibuf_insert_low(): Revert the changes that were accidentally committed in r3350. The changes were a failed attempt to fix Issue #126.	17 years ago
marko	29a777d62d	branches/innodb+: Remove redundant buf_pool_watch_notify() calls after buf_page_init().	17 years ago
marko	100b7265da	branches/innodb+: row_purge_remove_sec_if_poss_low(): If the index entry does not exist, return TRUE without retrying unbuffered operation (which should notice the same).	17 years ago
marko	e34c6d563f	branches/innodb+: ibuf_get_volume_buffered_count(), ibuf_get_volume_buffered(): Make n_recs signed. When the records are processed backwards and the last buffered operations are deletes, this allows *n_recs to become negative, as it should. This should finally put Issue #117 to rest.	17 years ago
marko	b6679b1d14	branches/innodb+: Merge revisions 3180:3312 from branches/zip: ------------------------------------------------------------------------ r3254 \| marko \| 2008-11-24 18:01:42 +0200 (Mon, 24 Nov 2008) \| 4 lines branches/zip: Note that it is legitimate for a secondary index record not to be found during purge. This tries to address Issue #129. The comments were supplied by Heikki. ------------------------------------------------------------------------ r3286 \| marko \| 2008-11-26 10:00:28 +0200 (Wed, 26 Nov 2008) \| 18 lines branches/zip: row_merge_drop_temp_indexes(): Replace the WHILE 1 with WHILE 1=1 in the SQL procedure, so that the loop will actually be entered and temporary indexes be dropped during crash recovery. Thanks to Sunny Bains for pointing this out. Tested as follows: Set a breakpoint in row_merge_rename_indexes. CREATE TABLE t(a INT)ENGINE=InnoDB; CREATE INDEX a ON t(a); -- The breakpoint will be reached. Kill and restart mysqld. SHOW CREATE TABLE t; -- This shows the MySQL .frm file, without and index. CREATE TABLE innodb_table_monitor(a INT)ENGINE=InnoDB; -- This will dump the InnoDB dictionary to the error log, without the index. ------------------------------------------------------------------------ r3302 \| vasil \| 2008-11-27 23:26:39 +0200 (Thu, 27 Nov 2008) \| 12 lines branches/zip: Fix Mantis issue#130 wdl: does not handle 64-bit address - Change the call from strtoul() to strtoull() - Change "%16X" to "%16llx" when scanning preferred load address rb://58 Submitted by: Calvin Approved by: Marko ------------------------------------------------------------------------ r3303 \| vasil \| 2008-11-27 23:31:18 +0200 (Thu, 27 Nov 2008) \| 10 lines branches/zip: * Remove a change from win-plugin/win-plugin.diff about time_t because MySQL has used VS2005 for building 5.1.30. * Adjust the line numbers so the patch applies cleanly without fuzz and offset messages. Submitted by: Calvin ------------------------------------------------------------------------ r3304 \| vasil \| 2008-11-27 23:33:48 +0200 (Thu, 27 Nov 2008) \| 6 lines branches/zip: Non-functional change in win-plugin/win-plugin.diff: fix the file name before the diff, this is irrelevant but it is nice to be the same as the file name on the following line. ------------------------------------------------------------------------ r3312 \| marko \| 2008-11-28 16:18:43 +0200 (Fri, 28 Nov 2008) \| 5 lines branches/zip: row_undo_mod_del_mark_or_remove_sec_low(): Complain if the secondary index entry cannot be found, and this is not an incomplete transaction that is being rolled back in crash recovery. The source code comments were suggested by Heikki. ------------------------------------------------------------------------	17 years ago
marko	87c9f0fcb5	branches/innodb+: Merge revisions 3177:3180 from branches/zip: ------------------------------------------------------------------------ r3180 \| marko \| 2008-11-21 16:36:18 +0200 (Fri, 21 Nov 2008) \| 3 lines branches/zip: buf_LRU_free_block(): Do not assert on ibuf_count until after it has been determined that the block is not being I/O-fixed. This corrects the mistake that was made in r3177. ------------------------------------------------------------------------	17 years ago
marko	7172c215ac	branches/innodb+: Merge revisions 3152:3177 from branches/zip: ------------------------------------------------------------------------ r3170 \| marko \| 2008-11-21 10:11:18 +0200 (Fri, 21 Nov 2008) \| 4 lines branches/zip: dtuple_print(): Dump each field in a separate line, so that the dumps can be read and compared more easily. This is related to the change to rec_print_old() and rec_print_comp() in r3148. ------------------------------------------------------------------------ r3177 \| marko \| 2008-11-21 16:24:31 +0200 (Fri, 21 Nov 2008) \| 3 lines branches/zip: buf_LRU_free_block(), buf_page_try_get_func(): Assert that there is nothing in the insert buffer for the page. This is for tracking down Issue #128. ------------------------------------------------------------------------	17 years ago
marko	f5cd22f3cc	branches/innodb+: ibuf_get_volume_buffered_count(): Compute also the space taken by merging the buffered record to the index page. Assert that the record is in the "multiple tablespaces" format. ibuf_get_volume_buffered(): Remove the calls to ibuf_rec_get_volume() and use the return value of ibuf_get_volume_buffered_count() instead.	17 years ago
marko	ace10f32a0	branches/innodb+: Merge revisions 2986:3152 from branches/zip: ------------------------------------------------------------------------ r3036 \| marko \| 2008-11-12 12:34:30 +0200 (Wed, 12 Nov 2008) \| 4 lines branches/zip: dtuple_validate(): When UNIV_DEBUG_VALGRIND is defined, rely solely on the UNIV_MEM_ASSERT_RW() check and disable the for loop that would only cause additional noise. ------------------------------------------------------------------------ r3037 \| marko \| 2008-11-12 13:52:57 +0200 (Wed, 12 Nov 2008) \| 6 lines branches/zip: row_vers_impl_x_locked_off_kernel(): Remove compilation warnings about prev_trx_id and vers_del being possibly uninitialized, by handling the case prev_version == NULL in a single if block. rb://45 approved by Inaam Rana. ------------------------------------------------------------------------ r3131 \| michael \| 2008-11-17 14:56:56 +0200 (Mon, 17 Nov 2008) \| 9 lines branches/zip: rb://53 Improve innodb_supports_xa system variable handling and reduces the number of retrievals of the value from MySQL. Approved by: Marko, over IM ------------------------------------------------------------------------ r3132 \| michael \| 2008-11-17 16:02:01 +0200 (Mon, 17 Nov 2008) \| 5 lines branches/zip: rb://53 Final version of rb://53, fixes the styling of a comment, makes the definition and the declaration of thd_supports_xa() identical commentwise. ------------------------------------------------------------------------ r3141 \| marko \| 2008-11-19 16:39:55 +0200 (Wed, 19 Nov 2008) \| 1 line branches/zip: buf_LRU_free_block(): Clarify the function comment. ------------------------------------------------------------------------ r3144 \| marko \| 2008-11-20 11:39:49 +0200 (Thu, 20 Nov 2008) \| 2 lines branches/zip: rec_get_nth_field_offs_old(): Add UNIV_UNLIKELY hints to assertion-like tests. ------------------------------------------------------------------------ r3145 \| marko \| 2008-11-20 12:22:40 +0200 (Thu, 20 Nov 2008) \| 20 lines branches/zip: Always check for "row too large" when executing SQL to create an index or table. We have to skip this check when loading table definitions from the data dictionary, because we could otherwise refuse to load old tables (even uncompressed ones). This addresses Issue #119. The first "row too large" check was implemented in MySQL 5.0.3 to address MySQL Bug #5682. In the InnoDB Plugin 1.0.2, a more accurate check was implemented in innodb_strict_mode. We now make the check unconditional. dict_create_index_step(): Pass strict=TRUE to dict_index_add_to_cache(). trx_is_strict(), thd_is_strict(): Remove. innodb-zip.test: Test in innodb_strict_mode=OFF. innodb_bug36169.test: Ensure that none of the tables can be created. rb://56 approved by Sunny Bains. ------------------------------------------------------------------------ r3148 \| marko \| 2008-11-20 13:27:27 +0200 (Thu, 20 Nov 2008) \| 3 lines branches/zip: rec_print_old(), rec_print_comp(): Dump each field in a separate line, so that the dumps can be read and compared more easily. ------------------------------------------------------------------------	17 years ago
marko	fca2e168a3	branches/innodb+: ibuf_get_volume_buffered(): Do not clear the hash_bitmap a second time. Only clear it if n_recs has been set.	17 years ago
marko	01339a767c	branches/innodb+: ibuf_insert_low(): Correct an off-by-one error that caused Issue #117. Before buffering IBUF_OP_DELETE, require that there be at least two records on the page. In that way, at least one record will remain after the delete operation has been merged.	17 years ago
marko	8437e7c140	branches/innodb+: ibuf_delete(): Add an assertion to track down Issue #117 .	17 years ago
inaam	914923fe70	branches/innodb+ rb://48 This patch is to improve recovery performance in InnoDB+. It includes introduction of red-black tree for sorted insertion into the flush_list and couple of other quirks. More can be found at: https://svn.innodb.com/innobase/Recovery_Performance_Improvements Reviewed by: Marko	17 years ago
marko	810efe1245	branches/innodb+: Merge revisions 2867:2986 from branches/zip: ------------------------------------------------------------------------ r2867 \| marko \| 2008-10-24 10:24:17 +0300 (Fri, 24 Oct 2008) \| 2 lines branches/zip: ChangeLog: Document r2763, r2794, r2683, r2799, r2809, r2866. ------------------------------------------------------------------------ r2869 \| vasil \| 2008-10-24 11:14:16 +0300 (Fri, 24 Oct 2008) \| 4 lines branches/zip: White space cleanup in ChangeLog ------------------------------------------------------------------------ r2870 \| vasil \| 2008-10-24 13:36:14 +0300 (Fri, 24 Oct 2008) \| 8 lines branches/zip: Remove a statement that causes the innodb-index test to fail. The change in behavior was introduced in MySQL BZR-r2738. Suggested by: Marko ------------------------------------------------------------------------ r2871 \| vasil \| 2008-10-24 13:48:38 +0300 (Fri, 24 Oct 2008) \| 5 lines branches/zip: Adjust mysql-test/patches/innodb-index.diff after the change to mysql-test/innodb-index.(test\|result) in r2870. ------------------------------------------------------------------------ r2878 \| calvin \| 2008-10-27 11:05:42 +0200 (Mon, 27 Oct 2008) \| 8 lines branches/zip: port the fix of Bug#19424 - InnoDB: Possibly a memory overrun of the buffer being freed with 64-bit Microsoft Visual C++. The changed file: CMakeLists.txt: Removing Win64 compiler optimizations for all innodb/mem/* files. ------------------------------------------------------------------------ r2884 \| vasil \| 2008-10-27 11:48:46 +0200 (Mon, 27 Oct 2008) \| 7 lines branches/zip: ChangeLog: Add entry for the fix of Bug#19424 InnoDB: Possibly a memory overrun of the buffer being freed (64-bit Visual C) ------------------------------------------------------------------------ r2886 \| calvin \| 2008-10-27 22:39:11 +0200 (Mon, 27 Oct 2008) \| 8 lines branches/zip: This patch is to solve the issue that file handles can not cross DLL/EXE boundaries on Windows. In builtin InnoDB, it makes call to MySQL server for creating tmp files. innobase_mysql_tmpfile is now rewritten for the plugin. rb://5 Approved by: Marko ------------------------------------------------------------------------ r2887 \| calvin \| 2008-10-27 22:48:29 +0200 (Mon, 27 Oct 2008) \| 44 lines branches/zip: implement the delayloading of externals for the plugin on Windows, which includes: * Load mysqld.map and insert all symbol/address pairs into hash for quick access * Resolves all external data variables. The delayloading mechanism in MSVC does not support automatic imports of data variables. A workaround is to explicitly handle the data import using the delay loader during the initialization of the plugin. * Resolves all external functions during run-time, by implementing the delayed loading helper function delayLoadHelper2, which is called by run-time as well as HrLoadAllImportsForDll. The delay loader reuses the hash implementation in InnoDB. The normal hash_create (in hash0hash.c) creates hash tables in buffer pool. But the delay loader is invoked before the engine is initialized, and buffer pools are not ready yet. Instead, the delay loader has its own implementation of hash_create() and hash_table_free(), called wdl_hash_create() and wdl_hash_table_free(). This patch should be used with other two patches in order to build a dynamically linked plugin on Windows: * patch for tmpfile functions (r2886) * patch for "build" files (to be committed) The list of file changed: handler/handler0vars.h: new file, defines a list of external data variables (no external functions). handler/win_delay_loader.cc: new file, the implementation of the delay loader for Windows plugin. handler/ha_innodb.cc: add a header file, and changes for copying the system variables. handler/handler0alter.cc: add a header file handler/i_s.cc: add a header file rb://27 Reviewed by: Sunny, Marko Approved by: Sunny ------------------------------------------------------------------------ r2888 \| calvin \| 2008-10-28 01:51:49 +0200 (Tue, 28 Oct 2008) \| 25 lines branches/zip: for building dynamic plugin on Windows, ha_innodb.dll, when INNODB_DYNAMIC_PLUGIN is specified. The changes are: CMakeLists.txt: add project ha_innodb for dynamic plugin on Windows. ha_innodb depends on project mysqld. ha_innodb.def: a new file with standard exports for a dynamic plugin. Two new files will be added: * sql/mysqld.def: .def file for 32-bit compiler * sql/mysqld_x64.def: .def file for x64 compiler It is also required to apply a patch to the MySQL source tree. The patch is described in win-plugin/README: win-plugin/win-plugin.diff - a patch to be applied to MySQL source tree. When applied, the following files will be modified: * CMakeLists.txt: add INNODB_DYNAMIC_PLUGIN and _USE_32BIT_TIME_T * sql/CMakeLists.txt: add mysqld.def or mysqld_x64.def for mysqld * win/configure.js: add INNODB_DYNAMIC_PLUGIN * win/build-vs71.bat: provide an option to specify CMAKE_BUILD_TYPE * win/build-vs8.bat: provide an option to specify CMAKE_BUILD_TYPE * win/build-vs8_x64.bat: provide an option to specify CMAKE_BUILD_TYPE ------------------------------------------------------------------------ r2894 \| marko \| 2008-10-28 08:36:39 +0200 (Tue, 28 Oct 2008) \| 4 lines branches/zip: dict_str_starts_with_keyword(): Removed this unused function. Spotted by Sunny. ------------------------------------------------------------------------ r2895 \| vasil \| 2008-10-28 08:40:45 +0200 (Tue, 28 Oct 2008) \| 6 lines branches/zip: ChangeLog: add entry for the Windows plugin. ------------------------------------------------------------------------ r2917 \| marko \| 2008-10-28 23:53:23 +0200 (Tue, 28 Oct 2008) \| 3 lines branches/zip: innodb_plugin_init(): Do not copy session variables, even when the variable is a global variable in the built-in InnoDB. ------------------------------------------------------------------------ r2918 \| calvin \| 2008-10-29 00:08:11 +0200 (Wed, 29 Oct 2008) \| 2 lines branches/zip: fix a problem introduced in r2917 - dyn is not initialized. Move the check into for(). ------------------------------------------------------------------------ r2922 \| calvin \| 2008-10-29 08:29:01 +0200 (Wed, 29 Oct 2008) \| 16 lines branches/zip: fix issue #102 - Windows plugin: resolve dbug functions during run-time. Implement wrapper functions in the plugin. The plugin will get the function entries from mysqld.exe during the init, and invoke the corresponding functions (in mysqld.exe). The list of functions are: _db_pargs_ _db_doprnt_ _db_enter_ _db_return_ _db_dump_ rb://38 Approved by: Marko ------------------------------------------------------------------------ r2923 \| marko \| 2008-10-29 09:52:30 +0200 (Wed, 29 Oct 2008) \| 1 line branches/zip: ChangeLog: Mention Bug #27276. ------------------------------------------------------------------------ r2925 \| calvin \| 2008-10-29 10:09:41 +0200 (Wed, 29 Oct 2008) \| 16 lines branches/zip: change function names in sql/mysqld.def in order to work with 5.1.29-rc. In 5.1.29, the following function names are changed: _hash_init hash_free hash_search hash_delete changed to _my_hash_init my_hash_free my_hash_search my_hash_delete Approved by: Marko (on IM) ------------------------------------------------------------------------ r2927 \| marko \| 2008-10-29 11:43:23 +0200 (Wed, 29 Oct 2008) \| 4 lines branches/zip: ha_innodb.cc: Make some functions static, so that they will not be compiled as weak global symbols. These functions must not be redirected to the built-in InnoDB. ------------------------------------------------------------------------ r2928 \| michael \| 2008-10-29 19:20:10 +0200 (Wed, 29 Oct 2008) \| 4 lines Remove unnecessary assert Approved by: Heikki, over IM ------------------------------------------------------------------------ r2930 \| marko \| 2008-10-29 21:39:24 +0200 (Wed, 29 Oct 2008) \| 33 lines branches/zip: Merge revisions 2854:2929 from branches/5.1, except r2924, which was merged from branches/zip r2866 to branches/5.1 and except r2879 which was merged separately by Calvin: ------------------------------------------------------------------------ r2902 \| vasil \| 2008-10-28 12:10:25 +0200 (Tue, 28 Oct 2008) \| 10 lines branches/5.1: Fix Bug#38189 innodb_stats_on_metadata missing Make the variable innodb_stats_on_metadata visible to the users and also settable at runtime. Previously it was only "visible" as a command line startup option to mysqld. Approved by: Marko (https://svn.innodb.com/rb/r/36) ------------------------------------------------------------------------ r2929 \| marko \| 2008-10-29 21:26:14 +0200 (Wed, 29 Oct 2008) \| 13 lines branches/5.1: dtype_get_sql_null_size(): return the correct storage size of a SQL NULL column. (Bug #40369) When MySQL Bug #20877 was fixed in r834, this function was accidentally modified to return 0 or 1. Apparently, the only impact of this bug is that fixed-length columns cannot be updated in-place from or to SQL NULL, even in ROW_FORMAT=REDUNDANT. After this fix, fixed-length columns in ROW_FORMAT=REDUNDANT will have a constant storage size as they should, no matter if NULL or non-NULL. The bug caused fixed-length NULL columns to occupy 1 byte. rb://37 approved by Heikki over IM. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r2931 \| vasil \| 2008-10-29 22:10:40 +0200 (Wed, 29 Oct 2008) \| 4 lines branches/zip: Add 2 ChangeLog entries for the 2 bugfixes that were merged from branches/5.1. ------------------------------------------------------------------------ r2935 \| vasil \| 2008-10-30 12:17:23 +0200 (Thu, 30 Oct 2008) \| 17 lines branches/zip: Fix "Bug#40360 Binlog related errors with binlog off" in InnoDB code in order to have a Bug#40360-free InnoDB Plugin 1.0.2. The fix does check whether binary logging is enabled in MySQL by accessing the opt_bin_log global variable that is defined in sql/mysqld.cc. In case MySQL does develop another solution to this via Bug#40360 then we can revert this patch (except the mysql-tests). The windows-plugin part of this fix will be committed as a separate commit to ease eventual merge into branches/5.1 [note from the future: the separate commit went into r2936]. Approved by: Marko (https://svn.innodb.com/rb/r/39) ------------------------------------------------------------------------ r2936 \| vasil \| 2008-10-30 12:24:09 +0200 (Thu, 30 Oct 2008) \| 7 lines branches/zip: Followup to r2935: add the Windows Delay Loader stuff for the MySQL variable that we are accessing. If someday we have another solution for Bug#40360 Binlog related errors with binlog off then this should also be reverted. ------------------------------------------------------------------------ r2937 \| vasil \| 2008-10-30 12:28:47 +0200 (Thu, 30 Oct 2008) \| 4 lines branches/zip: Add ChangeLog entry for Bug#40360 Binlog related errors with binlog off ------------------------------------------------------------------------ r2938 \| vasil \| 2008-10-30 12:33:28 +0200 (Thu, 30 Oct 2008) \| 5 lines branches/zip: Non-functional change: convert handler/handler0vars.h and handler/win_delay_loader.cc from \r\n (dos) to \n (unix) line terminators. ------------------------------------------------------------------------ r2939 \| marko \| 2008-10-30 12:38:18 +0200 (Thu, 30 Oct 2008) \| 2 lines branches/zip: Set svn:eol-style native on some recently added text files. ------------------------------------------------------------------------ r2940 \| marko \| 2008-10-30 12:46:21 +0200 (Thu, 30 Oct 2008) \| 1 line branches/zip: ChangeLog, ha_innodb.def: Set svn:eol-style native ------------------------------------------------------------------------ r2941 \| vasil \| 2008-10-30 19:34:27 +0200 (Thu, 30 Oct 2008) \| 4 lines branches/zip: Increment the InnoDB Plugin version from 1.0.1 to 1.0.2. ------------------------------------------------------------------------ r2943 \| sunny \| 2008-10-31 09:40:29 +0200 (Fri, 31 Oct 2008) \| 15 lines branches/zip: 1. We add a vector of locks to trx_t. This array contains the autoinc locks granted to a transaction. There is one per table. 2. We enforce releasing of these locks in the reverse order from the one in which they are acquired. The assumption is that since the AUTOINC locks are statement level locks. Nested statements introduced by triggers are stacked it should hold. There was some cleanup done to the vector code too by adding const and some new functions. Rename dict_table_t::auto_inc_lock to autoinc_lock. Fix Bug#26316 Triggers create duplicate entries on auto-increment columns rb://22 ------------------------------------------------------------------------ r2944 \| vasil \| 2008-10-31 09:44:16 +0200 (Fri, 31 Oct 2008) \| 12 lines branches/zip: Revert our temporary fix for "Bug#40360 Binlog related errors with binlog off" (r2935, r2936) and deploy MySQL's one, but put the function mysql_bin_log_is_engaged() inside mysql_addons.cc instead of in mysql's log.cc and use a different name for it so there is no collision when MySQL adds this function in log.cc. [note from the future: the windows part of this patch went into r2947] Approved by: Marko (https://svn.innodb.com/rb/r/41/) ------------------------------------------------------------------------ r2945 \| sunny \| 2008-10-31 09:44:45 +0200 (Fri, 31 Oct 2008) \| 2 lines branches/zip: Update ChangeLog with r2943 info. ------------------------------------------------------------------------ r2946 \| marko \| 2008-10-31 10:18:47 +0200 (Fri, 31 Oct 2008) \| 2 lines branches/zip: Revert the unintended change to univ.i that was made in r2943. ------------------------------------------------------------------------ r2947 \| calvin \| 2008-10-31 10:38:26 +0200 (Fri, 31 Oct 2008) \| 6 lines branches/zip: Windows plugin part of r2944 r2944 has reference to mysql_bin_log.is_open(), which is new in InnoDB. Add two new entries and remove one duplicate in mysqld.def & mysqld_x64.def. ------------------------------------------------------------------------ r2948 \| vasil \| 2008-10-31 11:39:07 +0200 (Fri, 31 Oct 2008) \| 9 lines branches/zip: Fix Mantis issue#106 plugin init error:InnoDB: stats_on_metadata in static InnoDB (flags=0x2401) differs from stats_on_metadata in dynamic InnoDB (fl Ignore the NOSYSVAR flag in addition to ignoring the READONLY flag. Approved by: Marko (https://svn.innodb.com/rb/r/42/) ------------------------------------------------------------------------ r2949 \| vasil \| 2008-10-31 11:47:56 +0200 (Fri, 31 Oct 2008) \| 4 lines branches/zip: White-space cleanup in ChangeLog. ------------------------------------------------------------------------ r2951 \| marko \| 2008-10-31 14:21:43 +0200 (Fri, 31 Oct 2008) \| 4 lines branches/zip: scripts/install_innodb_plugins_win.sql: New script, for installing the InnoDB plugins in Windows. Copied from scripts/install_innodb_plugins.sql. ------------------------------------------------------------------------ r2954 \| calvin \| 2008-11-04 09:15:26 +0200 (Tue, 04 Nov 2008) \| 8 lines branches/zip: ignore the failure when builtin_innobase_plugin is not available. External variable builtin_innobase_plugin is not available when mysqld does not have a builtin InnoDB. The init of the Windows plugin should not fail in this case. Approved by: Marko (on IM) ------------------------------------------------------------------------ r2955 \| calvin \| 2008-11-04 12:43:14 +0200 (Tue, 04 Nov 2008) \| 11 lines branches/zip: windows plugin - fix references to array variables. This problem surfaced when running new test innodb_bug40360.test. Both tx_isolation_names and binlog_format_names are name arrays, and should be defined as wdl_tx_isolation_names and wdl_binlog_format_names, not wdl_tx_isolation_names and wdl_binlog_format_names. Another array variable is all_charsets, which is already correctly defined. Approved by: Marko (on IM) ------------------------------------------------------------------------ r2986 \| marko \| 2008-11-11 09:28:37 +0200 (Tue, 11 Nov 2008) \| 11 lines branches/zip: ha_innobase::create(): Remove the dependences on DICT_TF_ZSSIZE_MAX, so that the code can be compiled with a different uncompressed page size by redefining UNIV_PAGE_SIZE_SHIFT in univ.i. Currently, the allowed values are 12, 13, or 14 (4k, 8k, 16k). Make the default compressed page size half the uncompressed page size. The previous default was 8 kilobytes, which is the same when compiling with the default 16k uncompressed page size. rb://50 approved by Pekka Lampio and Sunny Bains. ------------------------------------------------------------------------	17 years ago
marko	72e3f38fbe	branches/innodb+: ibuf_insert_low(): When buffering an insert or a delete-mark operation, do not count the buffered records. The count is only relevant for buffering IBUF_OP_DELETE operations. ibuf_get_volume_buffered(): Do not count the records if n_recs is NULL. Do not zero out *n_recs, but let the caller do that. ibuf_get_volume_buffered_count(): Do nothing if n_recs == NULL.	17 years ago
marko	95d7d87c42	branches/innodb+: Fix Issue #112 , which was introduced in r2962 and reintroduced in r2970. ibuf_get_volume_buffered_hash(): Add the parameters "types" and "data". The bug was that "types" lacked the offset IBUF_REC_INFO_SIZE, and the type information would be read from the wrong place.	17 years ago
marko	58d342c90a	branches/innodb+: Revert some debugging-related changes that were accidentally committed in r2971: univ.i, ha_innobase::create(): Reduce the uncompressed page size from 16 to 4 kilobytes. btr_cur_search_to_nth_level(): Print a diagnostic message when the leaf page of a secondary index is being requested from the disk. buf_read_ahead_random(), buf_read_ahead_linear(): Disable.	17 years ago
marko	7c37bc941f	branches/innodb+: ibuf_get_volume_buffered(): Invoke ibuf_get_volume_buffered_count() as many times as ibuf_rec_get_volume(rec), so that *n_recs will be updated as appropriate. This fixes Issue #82: some deletes will be buffered in purge.	17 years ago
marko	46ccc6a652	branches/innodb+: Revert r2964 and r2963. The heuristics for disabling delete buffering is not fundamentally flawed. It merely failed because of other bugs.	17 years ago
marko	c39afbb9f1	ibuf_get_entry_counter_low(): Return 0 if no records have been buffered on the page. Because of a bug that was introduced in r2711, ULINT_UNDEFINED was incorrectly returned.	17 years ago
marko	64deac5563	branches/innodb+: ibuf_get_volume_buffered(): Note that the volume includes only buffered inserts, not delete-marks or deletes. This is because ibuf_rec_get_volume() only returns nonzero for inserts.	17 years ago
marko	d836a70547	branches/innodb+: ibuf_insert_low(): Ignore the free bits in the insert buffer bitmap when buffering deletes or delete-marks. TODO: ibuf_get_volume_buffered() should return only the volume of the buffered inserts, not deletes or delete-marks.	17 years ago
marko	dfde1c3b4c	branches/innodb+: ibuf_delete(): Display the space id and page number when ignoring a buffered delete that would empty a page. (Issue #82)	17 years ago
marko	4115c90530	branches/innodb+: ibuf0ibuf.c: Revert the patches to Issue #82 (r2962, r2865, r2864) and do not refuse to buffer deletes. The problem with refusing to buffer deletes was that no deletes were buffered. Instead, when merging delete requests, disregard a delete request if it would make the page empty. InnoDB tolerates redundant secondary index records, but not empty pages. ibuf_delete(): When merging a delete request, print and ignore the record if the page would become empty.	17 years ago
marko	d82c072263	branches/innodb+: buf_get_volume_buffered(): When estimating the number of records on a page, count each unique buffered record at most once. ibuf_get_volume_buffered_hash(): New function, for inserting a hashed record into a bit array. ibuf_get_volume_buffered_count(): New function, refactored from ibuf_get_volume_buffered(), for counting the unique records buffered for the page. ibuf_get_volume_buffered(): Define hash_bitmap, a bit array for identifying duplicate records. Hash collisions do not hurt correctness, only performance. If the number of records on the page is estimated as 0, deletes will not be buffered. This patch is just for the record, as is rb://44. In the tests run so far, the function ibuf_get_volume_buffered() always seems to estimate the number of records as 0, disabling all buffered deletes.	17 years ago
marko	1f0afc587d	branches/innodb+: ibuf0ibuf.c: Add a compile-time check for IBUF_REC_INFO_SIZE. ibuf_get_volume_buffered(): Correct the grammar of the function comment.	17 years ago
marko	937e6971ec	branches/innodb+: Merge revisions 2862:2867 from branches/zip: ------------------------------------------------------------------------ r2866 \| marko \| 2008-10-23 23:25:43 +0300 (Thu, 23 Oct 2008) \| 4 lines branches/zip: ibuf_delete_rec(): When the cursor to the insert buffer record cannot be restored, do not complain if the tablespace does not exist. This fixes Issue #88. ------------------------------------------------------------------------ r2867 \| marko \| 2008-10-24 10:24:17 +0300 (Fri, 24 Oct 2008) \| 2 lines branches/zip: ChangeLog: Document r2763, r2794, r2683, r2799, r2809, r2866. ------------------------------------------------------------------------	17 years ago

1 2 3 4 5 ...

1167 Commits (a4f279a2e999f76313268d6d112674cc8a5a47a6) All Branches Search

1167 Commits (a4f279a2e999f76313268d6d112674cc8a5a47a6)

All Branches