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	79e5dc96c4	branches/innodb+: ibuf_insert_low(): Use common error handling when holding a latch on the insert buffer bitmap page.	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	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	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	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	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	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	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	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
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	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
marko	923123cdee	branches/innodb+: ibuf_get_volume_buffered(): Do not count insert operations when estimating n_recs. This should finally fix Issue #82.	17 years ago
marko	4a7bd430ba	branches/innodb+: Refuse to buffer deletes if that could lead to B-tree pages becoming empty. Remove work-arounds for empty pages. This fixes Issue #82. ibuf_get_volume_buffered(): Add the output parameter n_recs, for returning the minimum number of records on the page. ibuf_insert_low(): Refuse to buffer IBUF_OP_DELETE if the page could become empty. btr_page_get_father_node_ptr(): Remove the work-around for the page being empty. page_zip_dir_delete(): Revert to the version from branches/zip. Always invoke page_zip_clear_rec().	17 years ago
marko	70f1128619	branches/innodb+: Merge revisions 2835:2862 from branches/zip: ------------------------------------------------------------------------ r2838 \| vasil \| 2008-10-21 12:49:27 +0300 (Tue, 21 Oct 2008) \| 61 lines branches/zip: Merge 2744:2837 from branches/5.1 (skipping r2782 and r2826): ------------------------------------------------------------------------ r2832 \| vasil \| 2008-10-21 10:08:30 +0300 (Tue, 21 Oct 2008) \| 10 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: In ha_innobase::info(): Replace sql_print_warning() which prints to mysqld error log with push_warning_printf() which sends the error message to the client. Suggested by: Marko, Sunny, Michael Objected by: Inaam ------------------------------------------------------------------------ r2837 \| vasil \| 2008-10-21 12:07:44 +0300 (Tue, 21 Oct 2008) \| 32 lines Changed paths: M /branches/5.1/mysql-test/innodb-semi-consistent.result M /branches/5.1/mysql-test/innodb-semi-consistent.test M /branches/5.1/mysql-test/innodb.result M /branches/5.1/mysql-test/innodb.test branches/5.1: Merge a change from MySQL (this fixes the failing innodb and innodb-semi-consistent tests): revno: 2757 committer: Georgi Kodinov <kgeorge@mysql.com> branch nick: B39812-5.1-5.1.29-rc timestamp: Fri 2008-10-03 15:24:19 +0300 message: Bug #39812: Make statement replication default for 5.1 (to match 5.0) Make STMT replication default for 5.1. Add a default of MIXED into the config files Fix the tests that needed MIXED replication mode. modified: mysql-test/include/mix1.inc mysql-test/r/innodb-semi-consistent.result mysql-test/r/innodb.result mysql-test/r/innodb_mysql.result mysql-test/r/tx_isolation_func.result mysql-test/t/innodb-semi-consistent.test mysql-test/t/innodb.test mysql-test/t/tx_isolation_func.test sql/mysqld.cc support-files/my-huge.cnf.sh support-files/my-innodb-heavy-4G.cnf.sh support-files/my-large.cnf.sh support-files/my-medium.cnf.sh support-files/my-small.cnf.sh ------------------------------------------------------------------------ ------------------------------------------------------------------------ r2847 \| marko \| 2008-10-22 10:07:37 +0300 (Wed, 22 Oct 2008) \| 6 lines branches/zip: page_zip_rec_needs_ext(): Fix a bug that was introduced in the fix of Mantis issue #73. With key_block_size=16, we will also have to check the available space on the uncompressed page. Otherwise, the clustered index record can be almost 16 kilobytes in size, and the undo log record will not fit. ------------------------------------------------------------------------ r2850 \| marko \| 2008-10-22 13:52:12 +0300 (Wed, 22 Oct 2008) \| 2 lines branches/zip: ibuf_insert_to_index_page(): Discard the local variable block. page_cur is always positioned on block, the function parameter. ------------------------------------------------------------------------ r2853 \| sunny \| 2008-10-23 01:52:09 +0300 (Thu, 23 Oct 2008) \| 2 lines branches/zip: Add missing UNIV_INTERN. ------------------------------------------------------------------------ r2855 \| sunny \| 2008-10-23 09:29:46 +0300 (Thu, 23 Oct 2008) \| 36 lines branches/zip: Merge revisions 2837:2852 from branches/5.1: ------------------------------------------------------------------------ r2849 \| sunny \| 2008-10-22 12:01:18 +0300 (Wed, 22 Oct 2008) \| 8 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/include/row0mysql.h M /branches/5.1/row/row0mysql.c branches/5.1: Return the actual error code encountered when allocating a new autoinc value. The change in behavior (bug) was introduced in 5.1.22 when we introduced the new AUTOINC locking model. rb://31 Bug#40224 New AUTOINC changes mask reporting of deadlock/timeout errors ------------------------------------------------------------------------ r2852 \| sunny \| 2008-10-23 01:42:24 +0300 (Thu, 23 Oct 2008) \| 9 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/handler/ha_innodb.h branches/5.1: Backport r2724 from branches/zip Check column value against the col max value before updating the table's global autoinc counter value. This is part of simplifying the AUTOINC sub-system. We extract the type info from MySQL data structures at runtime. This fixes Bug#37788 InnoDB Plugin: AUTO_INCREMENT wrong for compressed tables ------------------------------------------------------------------------ ------------------------------------------------------------------------ r2856 \| sunny \| 2008-10-23 10:07:05 +0300 (Thu, 23 Oct 2008) \| 1 line Reverting test file changes from r2855 ------------------------------------------------------------------------ r2857 \| sunny \| 2008-10-23 10:24:33 +0300 (Thu, 23 Oct 2008) \| 30 lines branches/zip: Merge revisions 2852:2854 from branches/5.1: ------------------------------------------------------------------------ r2854 \| sunny \| 2008-10-23 08:30:32 +0300 (Thu, 23 Oct 2008) \| 13 lines Changed paths: M /branches/5.1/dict/dict0dict.c M /branches/5.1/dict/dict0mem.c M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/handler/ha_innodb.h M /branches/5.1/include/dict0dict.h M /branches/5.1/include/dict0mem.h M /branches/5.1/row/row0mysql.c branches/5.1: Backport changes from branches/zip r2725 Simplify the autoinc initialization code. This removes the non-determinism related to reading the table's autoinc value for the first time. This change has also reduced the sizeof dict_table_t by sizeof(ibool) bytes because we don't need the dict_table_t::autoinc_inited field anymore. Bug#39830 Table autoinc value not updated on first insert. Bug#35498 Cannot get table test/table1 auto-inccounter value in ::info Bug#36411 Failed to read auto-increment value from storage engine" in 5.1.24 auto-inc rb://16 ------------------------------------------------------------------------ ------------------------------------------------------------------------ r2858 \| vasil \| 2008-10-23 11:33:43 +0300 (Thu, 23 Oct 2008) \| 4 lines branches/zip: Update the ChangeLog ------------------------------------------------------------------------ r2861 \| marko \| 2008-10-23 12:27:15 +0300 (Thu, 23 Oct 2008) \| 24 lines branches/zip: Clean up the file format stamping. trx_sys_file_format_max_upgrade(): Rename from trx_sys_file_format_max_update(). Improve the documentation. Add a const qualifier to the parameter "name". Replace the parameter "flags" with "format_id", because this function should deal with file format identifiers, not with table flags. trx_sys_file_format_max_write(), trx_sys_file_format_max_set(): Add a const qualifier to the parameter "name". ha_innodb.cc: Correct the spelling in some comments: "side effect". Remove redundant prototypes for some static callback functions. innodb_file_format_name_update(), innodb_file_format_check_update(): Correct the function signature. Use appropriate pointer type conversions. MYSQL_SYSVAR_STR(file_format), MYSQL_SYSVAR_STR(file_format_check): Remove the type conversions from the callback function pointers. When the function signatures match, no type conversion is needed. The type conversions would only prevent compilation warnings for any mismatch. Approved by Sunny in rb://25. ------------------------------------------------------------------------ r2862 \| marko \| 2008-10-23 12:37:42 +0300 (Thu, 23 Oct 2008) \| 8 lines branches/zip: Non-functional changes: ibuf_get_volume_buffered(): Declare with static linkage. This function is private to ibuf0ibuf.c. btr_cur_pessimistic_delete(): Use the cached result of btr_cur_get_index(cursor). ------------------------------------------------------------------------	17 years ago
marko	c782aeff5e	branches/innodb+: ibuf_insert_to_index_page(): When the page is empty, look at the first deleted record when checking the number of fields. This fixes part of Issue #82.	17 years ago
marko	467b0a8db0	branches/innodb+: Merge revisions 2799:2835 from branches/zip: ------------------------------------------------------------------------ r2809 \| marko \| 2008-10-16 09:41:13 +0300 (Thu, 16 Oct 2008) \| 18 lines branches/zip: Skip the undo log size check on REDUNDANT and COMPACT tables. In ROW_FORMAT=DYNAMIC and ROW_FORMAT=COMPRESSED, column prefix indexes require that prefixes of externally stored columns be written to the undo log. This may make the undo log record bigger than the record on the B-tree page. The maximum size of an undo log record is the page size. That must be checked for, in dict_index_add_to_cache(). dict_index_add_to_cache(): Skip the undo log size check for REDUNDANT and COMPACT tables. These tables store prefixes of externally stored columns locally within the clustered index record. There are no special considerations for the undo log record size. innodb-index.test: Ensure that the check exists for ROW_FORMAT=DYNAMIC, but not for ROW_FORMAT=COMPACT. This fixes issue #99. rb://28 approved by Sunny. ------------------------------------------------------------------------ r2810 \| vasil \| 2008-10-16 19:57:58 +0300 (Thu, 16 Oct 2008) \| 12 lines branches/zip: Fix Mantis issue#61: In row_undo_ins_parse_undo_rec(): if we find that a table has no indexes (dict_table_get_first_index() returns NULL) do not try to call trx_undo_rec_get_row_ref() with a NULL pointer because that would lead to a crash. Instead, print a warning and set node->table to NULL just like it is done if the .ibd file is missing. Approved by: Heikki (via IM) ------------------------------------------------------------------------ r2824 \| marko \| 2008-10-20 09:58:01 +0300 (Mon, 20 Oct 2008) \| 2 lines branches/zip: rec_convert_dtuple_to_rec_comp(): Relax a too tight assertion. Spotted by Sunny. ------------------------------------------------------------------------ r2825 \| vasil \| 2008-10-20 13:41:04 +0300 (Mon, 20 Oct 2008) \| 6 lines branches/zip: Print the table name via ut_print_name() and add two spaces before InnoDB. Suggested by: Marko ------------------------------------------------------------------------ r2833 \| marko \| 2008-10-21 10:16:45 +0300 (Tue, 21 Oct 2008) \| 2 lines branches/zip: ibuf_insert_low(): Avoid unnecessarily acquiring and releasing ibuf_mutex. ------------------------------------------------------------------------ r2834 \| marko \| 2008-10-21 10:18:57 +0300 (Tue, 21 Oct 2008) \| 1 line branches/zip: ibuf_delete_rec(): Add debug assertions suggested by Heikki. ------------------------------------------------------------------------ r2835 \| marko \| 2008-10-21 11:04:06 +0300 (Tue, 21 Oct 2008) \| 1 line branches/zip: ibuf_insert_low(): Simplify a comparison. ------------------------------------------------------------------------	17 years ago
marko	899c10e7ac	branches/innodb+: Adjust decorative comment.	17 years ago
marko	7dbe6c8f69	branches/innodb+: ibuf_set_entry_counter(): Return FALSE if trying to insert after a record that has no counter field. ibuf_get_entry_counter_low(): Return ULINT_UNDEFINED if the record lacks a counter.	17 years ago
marko	33b5eef50b	branches/innodb+: ibuf_rec_get_size(): Correct some bugs. rb://17 This function was created when the delete buffering code was merged from branches/fts in r2324. ibuf_rec_get_size(): Rename the parameter new_format to pre_4_1. Use the correct offsets and accessors for both values of pre_4_1. ibuf_rec_get_info(): Note that the record must be in 4.1 or later format.	17 years ago
marko	104979bfbd	branches/innodb+: Minor cleanup. ibuf_set_entry_counter(): Turn a ut_ad() assertion into ut_a(). ibuf_set_del_mark(), ibuf_delete(): Add const qualifiers to read-only parameters.	17 years ago
marko	e1580c303b	branches/innodb+: Non-functional changes: ibuf_get_entry_counter_low(): Rename from ibuf_set_entry_counter_low(). This function only reads the counter. Add const qualifier to the rec parameter. ibuf_set_entry_counter(): Document the entry parameter as in/out.	17 years ago
marko	35342a89b8	branches/innodb+: Remove an #ifdef around buf_block_dbg_add_level(). This could have been made as part of the merge in r2661.	17 years ago
marko	5a6b9cf2a1	branches/innodb+: Minor cleanup. ibuf_rec_get_info(): Eliminate the local variable "mod". Use switch-case instead of if-else if-else. ibuf_rec_get_op_type(), ibuf_add_ops(), ibuf_print_ops(): Add const qualifiers to read-only parameters. ibuf_rec_get_volume(): Remove empty line at end of block.	17 years ago
marko	211417e27e	branches/innodb+: Merge revisions 2660:2676 from branches/zip.	17 years ago
marko	000c79b7c3	branches/innodb+: ibuf_delete(): Correctly set the free bits in the insert buffer bitmap.	17 years ago
marko	365402d771	branches/innodb+: Non-functional change: ibuf_rec_get_counter(): Rename from ibuf_rec_get_fake_counter(). There is nothing fake about the counter. Also add const qualifiers to the pointers.	17 years ago
marko	1838b00352	branches/innodb+: Non-functional change: Rename all functions related to the buf_pool->watch_ fields to start with the common prefix buf_pool_watch, so that they can be searched easily: buf_pool_watch_set(): Renamed from buf_pool_add_watch(). The "add" was misleading, because only one watch can be active at a time. buf_pool_watch_clear(): Renamed from buf_pool_remove_watch(). buf_pool_watch_occurred(): Renamed from buf_pool_watch_happened().	17 years ago
marko	0f852ae1a5	branches/innodb+: ibuf_print(): Add a missing local variable that has been missing since the code was merged in r2324 from branches/fts.	17 years ago
marko	5383474770	branches/innodb+: Correct an error introduced in r736 of branches/fts and merged in r2324: ibuf_page(): Assert that recv_no_ibuf_operations == FALSE. fil_io(): Check !recv_no_ibuf_operations before calling ibuf_page().	17 years ago
marko	56d28f1c57	branches/innodb+: Merge 2637:2660 from branches/zip.	17 years ago
marko	c766390485	branches/innodb+: Undo the partial introduction of UNIV_UNUSED, to reduce differences from branches/zip. The __attribute__((unused)) should work on all platforms. When compiled with something else than GCC, MySQL supposedly does #define __attribute__(x) /* empty */ so that the attributes will be ignored.	17 years ago
marko	8f3c1d75bc	branches/innodb+: Add missing UNIV_INTERN linkage specifiers.	17 years ago
marko	0c4879da3d	branches/innodb+: Revert some changes that make the code differ from branches/zip. btr_cur_optimistic_delete(): Split a too long line in the way it is split in branches/zip. buf_page_get_gen(): Add missing space in the function comment. buf_print_io(): Restoer a removed space to the printout. univ.i: Remove C++-style (or C99-style) comments. buf0buf.h: Undo the white-space changes to the wrapper macros of buf_page_get_gen(). ibuf_update_free_bits_low(): Revert the changes. Restore the assertion that this function must not be invoked on compressed pages. The function ibuf_update_free_bits_zip() is for compressed pages. ibuf_insert_to_index_page(): Undo a white-space change.	17 years ago

1 2 3

129 Commits (a4f279a2e999f76313268d6d112674cc8a5a47a6)