branches/innodb+: Merge revisions 5144:5524 from branches/zip
------------------------------------------------------------------------
r5147 | marko | 2009-05-27 06:55:14 -0400 (Wed, 27 May 2009) | 1 line
branches/zip: ibuf0ibuf.c: Improve a comment.
------------------------------------------------------------------------
r5149 | marko | 2009-05-27 07:46:42 -0400 (Wed, 27 May 2009) | 34 lines
branches/zip: Merge revisions 4994:5148 from branches/5.1:
------------------------------------------------------------------------
r5126 | vasil | 2009-05-26 16:57:12 +0300 (Tue, 26 May 2009) | 9 lines
branches/5.1:
Preparation for the fix of
Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Non-functional change: move FSP_* macros from fsp0fsp.h to a new file
fsp0types.h. This is needed in order to be able to use FSP_EXTENT_SIZE
in mtr0log.ic.
------------------------------------------------------------------------
r5127 | vasil | 2009-05-26 17:05:43 +0300 (Tue, 26 May 2009) | 9 lines
branches/5.1:
Preparation for the fix of
Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Do not include unnecessary headers mtr0log.h and fut0lst.h in trx0sys.h
and include fsp0fsp.h just before it is needed. This is needed in order
to be able to use TRX_SYS_SPACE in mtr0log.ic.
------------------------------------------------------------------------
r5128 | vasil | 2009-05-26 17:26:37 +0300 (Tue, 26 May 2009) | 7 lines
branches/5.1:
Fix Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Do not write redo log for the pages in the doublewrite buffer. Also, do not
make a dummy change to the page because this is not needed.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5169 | marko | 2009-05-28 03:21:55 -0400 (Thu, 28 May 2009) | 1 line
branches/zip: mtr0mtr.h: Add Doxygen comments for the redo log entry types.
------------------------------------------------------------------------
r5176 | marko | 2009-05-28 07:14:02 -0400 (Thu, 28 May 2009) | 1 line
branches/zip: Correct a debug assertion that was added in r5125.
------------------------------------------------------------------------
r5201 | marko | 2009-06-01 06:35:25 -0400 (Mon, 01 Jun 2009) | 2 lines
branches/zip: Clean up some comments.
Make the rec parameter of mlog_open_and_write_index() const.
------------------------------------------------------------------------
r5234 | marko | 2009-06-03 08:26:41 -0400 (Wed, 03 Jun 2009) | 44 lines
branches/zip: Merge revisions 5148:5233 from branches/5.1:
------------------------------------------------------------------------
r5150 | vasil | 2009-05-27 18:56:03 +0300 (Wed, 27 May 2009) | 4 lines
branches/5.1:
Whitespace fixup.
------------------------------------------------------------------------
r5191 | vasil | 2009-05-30 17:46:05 +0300 (Sat, 30 May 2009) | 19 lines
branches/5.1:
Merge a change from MySQL (this fixes the failing innodb_mysql test):
------------------------------------------------------------
revno: 1810.3894.10
committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
branch nick: mysql-5.0-bugteam
timestamp: Tue 2009-05-19 11:32:21 +0500
message:
Bug#39793 Foreign keys not constructed when column has a '#' in a comment or default value
Internal InnoDN FK parser does not recognize '\'' as quotation symbol.
Suggested fix is to add '\'' symbol check for quotation condition
(dict_strip_comments() function).
modified:
innobase/dict/dict0dict.c
mysql-test/r/innodb_mysql.result
mysql-test/t/innodb_mysql.test
------------------------------------------------------------------------
r5233 | marko | 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) | 11 lines
branches/5.1: Merge the test case from r5232 from branches/5.0:
------------------------------------------------------------------------
r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines
branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565
(Update Query Results in "1 Row Affected" But Should Be "Zero Rows").
Also, add a test case for Bug #40565.
rb://128 approved by Heikki Tuuri
------------------------------------------------------------------------
------------------------------------------------------------------------
------------------------------------------------------------------------
r5250 | marko | 2009-06-04 02:58:23 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Add Doxygen comments to the rest of buf0*.
------------------------------------------------------------------------
r5251 | marko | 2009-06-04 02:59:51 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Replace <= in a function comment.
------------------------------------------------------------------------
r5253 | marko | 2009-06-04 06:37:35 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Add missing Doxygen comments for page0zip.
------------------------------------------------------------------------
r5261 | vasil | 2009-06-05 11:13:31 -0400 (Fri, 05 Jun 2009) | 15 lines
branches/zip:
Fix Mantis Issue#244 fix bug in linear read ahead (no check on access pattern)
The changes are:
1) Take into account access pattern when deciding whether or not to do linear
read ahead.
2) Expose a knob innodb_read_ahead_factor = [0-64] default (8), dynamic,
global to control linear read ahead behvior
3) Disable random read ahead. Keep the code for now.
Submitted by: Inaam (rb://122)
Approved by: Heikki (rb://122)
------------------------------------------------------------------------
r5262 | vasil | 2009-06-05 12:04:25 -0400 (Fri, 05 Jun 2009) | 22 lines
branches/zip:
Enable functionality to have multiple background io helper threads.
This patch is based on percona contributions.
More details about this patch will be written at:
https://svn.innodb.com/innobase/MultipleBackgroundThreads
The patch essentially does the following:
expose following knobs:
innodb_read_io_threads = [1 - 64] default 1
innodb_write_io_threads = [1 - 64] default 1
deprecate innodb_file_io_threads (this parameter was relevant only on windows)
Internally it allows multiple segments for read and write IO request arrays
where one thread works on one segement.
Submitted by: Inaam (rb://124)
Approved by: Heikki (rb://124)
------------------------------------------------------------------------
r5263 | vasil | 2009-06-05 12:19:37 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Whitespace cleanup.
------------------------------------------------------------------------
r5264 | vasil | 2009-06-05 12:26:58 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5261.
------------------------------------------------------------------------
r5265 | vasil | 2009-06-05 12:34:11 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5262.
------------------------------------------------------------------------
r5268 | inaam | 2009-06-08 12:18:21 -0400 (Mon, 08 Jun 2009) | 7 lines
branches/zip
Non functional change:
Added legal notices acknowledging percona contribution to the multiple
IO helper threads patch i.e.: r5262
------------------------------------------------------------------------
r5283 | inaam | 2009-06-09 13:46:29 -0400 (Tue, 09 Jun 2009) | 9 lines
branches/zip
rb://130
Enable Group Commit functionality that was broken in 5.0 when
distributed transactions were introduced.
Reviewed by: Heikki
------------------------------------------------------------------------
r5319 | marko | 2009-06-11 04:40:33 -0400 (Thu, 11 Jun 2009) | 3 lines
branches/zip: Declare os_thread_id_t as unsigned long,
because ulint is wrong on Win64.
Pointed out by Vladislav Vaintroub <wlad@sun.com>.
------------------------------------------------------------------------
r5320 | inaam | 2009-06-11 09:15:41 -0400 (Thu, 11 Jun 2009) | 14 lines
branches/zip rb://131
This patch changes the following defaults:
max_dirty_pages_pct: default from 90 to 75. max allowed from 100 to 99
additional_mem_pool_size: default from 1 to 8 MB
buffer_pool_size: default from 8 to 128 MB
log_buffer_size: default from 1 to 8 MB
read_io_threads/write_io_threads: default from 1 to 4
The log file sizes are untouched because of upgrade issues
Reviewed by: Heikki
------------------------------------------------------------------------
r5330 | marko | 2009-06-16 04:08:59 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: buf_page_get_gen(): Reduce mutex holding time by adjusting
buf_pool->n_pend_unzip while only holding buf_pool_mutex.
------------------------------------------------------------------------
r5331 | marko | 2009-06-16 05:00:48 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: buf_page_get_zip(): Eliminate a buf_page_get_mutex() call.
The function must switch on the block state anyway.
------------------------------------------------------------------------
r5332 | vasil | 2009-06-16 05:03:27 -0400 (Tue, 16 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entries for r5283 and r5320.
------------------------------------------------------------------------
r5333 | marko | 2009-06-16 05:27:46 -0400 (Tue, 16 Jun 2009) | 1 line
branches/zip: buf_page_io_query(): Remove unused function.
------------------------------------------------------------------------
r5335 | marko | 2009-06-16 09:23:10 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: innodb.test: Adjust the tolerance of
innodb_buffer_pool_pages_total for r5320.
------------------------------------------------------------------------
r5342 | marko | 2009-06-17 06:15:32 -0400 (Wed, 17 Jun 2009) | 60 lines
branches/zip: Merge revisions 5233:5341 from branches/5.1:
------------------------------------------------------------------------
r5233 | marko | 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) | 11 lines
branches/5.1: Merge the test case from r5232 from branches/5.0:
------------------------------------------------------------------------
r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines
branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565
(Update Query Results in "1 Row Affected" But Should Be "Zero Rows").
Also, add a test case for Bug #40565.
rb://128 approved by Heikki Tuuri
------------------------------------------------------------------------
------------------------------------------------------------------------
r5243 | sunny | 2009-06-04 03:17:14 +0300 (Thu, 04 Jun 2009) | 14 lines
branches/5.1: When the InnoDB and MySQL data dictionaries go out of sync, before
the bug fix we would assert on missing autoinc columns. With this fix we allow
MySQL to open the table but set the next autoinc value for the column to the
MAX value. This effectively disables the next value generation. INSERTs will
fail with a generic AUTOINC failure. However, the user should be able to
read/dump the table, set the column values explicitly, use ALTER TABLE to
set the next autoinc value and/or sync the two data dictionaries to resume
normal operations.
Fix Bug#44030 Error: (1500) Couldn't read the MAX(ID) autoinc value from the
index (PRIMARY)
rb://118
------------------------------------------------------------------------
r5252 | sunny | 2009-06-04 10:16:24 +0300 (Thu, 04 Jun 2009) | 2 lines
branches/5.1: The version of the result file checked in was broken in r5243.
------------------------------------------------------------------------
r5259 | vasil | 2009-06-05 10:29:16 +0300 (Fri, 05 Jun 2009) | 7 lines
branches/5.1:
Remove the word "Error" from the printout because the mysqltest suite
interprets it as an error and thus the innodb-autoinc test fails.
Approved by: Sunny (via IM)
------------------------------------------------------------------------
r5339 | marko | 2009-06-17 11:01:37 +0300 (Wed, 17 Jun 2009) | 2 lines
branches/5.1: Add missing #include "mtr0log.h" so that the code compiles
with -DUNIV_MUST_NOT_INLINE.
(null merge; this had already been committed in branches/zip)
------------------------------------------------------------------------
r5340 | marko | 2009-06-17 12:11:49 +0300 (Wed, 17 Jun 2009) | 4 lines
branches/5.1: row_unlock_for_mysql(): When the clustered index is unknown,
refuse to unlock the record.
(Bug #45357, caused by the fix of Bug #39320).
rb://132 approved by Sunny Bains.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5343 | vasil | 2009-06-17 08:56:12 -0400 (Wed, 17 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5342.
------------------------------------------------------------------------
r5344 | marko | 2009-06-17 09:03:45 -0400 (Wed, 17 Jun 2009) | 1 line
branches/zip: row_merge_read_rec(): Fix a UNIV_DEBUG bug (Bug #45426)
------------------------------------------------------------------------
r5391 | marko | 2009-06-22 05:31:35 -0400 (Mon, 22 Jun 2009) | 2 lines
branches/zip: buf_page_get_zip(): Fix a bogus warning about
block_mutex being possibly uninitialized.
------------------------------------------------------------------------
r5392 | marko | 2009-06-22 07:58:20 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: ha_innobase::check_if_incompatible_data(): When
ROW_FORMAT=DEFAULT, do not compare to get_row_type().
Without this change, fast index creation will be disabled
in recent versions of MySQL 5.1.
------------------------------------------------------------------------
r5393 | pekka | 2009-06-22 09:27:55 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: Minor changes for Hot Backup to build correctly. (The
code bracketed between #ifdef UNIV_HOTBACKUP and #endif /* UNIV_HOTBACKUP */).
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r5394 | pekka | 2009-06-22 09:46:34 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: Add functions for checking the format of tablespaces
for Hot Backup build (UNIV_HOTBACKUP defined).
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r5397 | calvin | 2009-06-23 16:59:42 -0400 (Tue, 23 Jun 2009) | 7 lines
branches/zip: change the header file path.
Change the header file path from ../storage/innobase/include/
to ../include/. In the planned 5.1 + plugin release, the source
directory of the plugin will not be in storage/innobase.
Approved by: Heikki (IM)
------------------------------------------------------------------------
r5407 | calvin | 2009-06-24 09:51:08 -0400 (Wed, 24 Jun 2009) | 4 lines
branches/zip: remove relative path of header files.
Suggested by Marko.
------------------------------------------------------------------------
r5412 | marko | 2009-06-25 06:27:08 -0400 (Thu, 25 Jun 2009) | 1 line
branches/zip: Replace a DBUG_ASSERT with ut_a to track down Issue #290.
------------------------------------------------------------------------
r5415 | marko | 2009-06-25 06:45:57 -0400 (Thu, 25 Jun 2009) | 3 lines
branches/zip: dict_index_find_cols(): Print diagnostic on name mismatch.
This addresses Bug #44571 but does not fix it.
rb://135 approved by Sunny Bains.
------------------------------------------------------------------------
r5417 | marko | 2009-06-25 08:20:56 -0400 (Thu, 25 Jun 2009) | 1 line
branches/zip: ha_innodb.cc: Move the misplaced Doxygen @file comment.
------------------------------------------------------------------------
r5418 | marko | 2009-06-25 08:55:52 -0400 (Thu, 25 Jun 2009) | 5 lines
branches/zip: Fix a race condition caused by
SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749)
When innodb_commit_concurrency is initially set nonzero,
DEFAULT would change it back to 0, triggering Bug #42101.
rb://139 approved by Heikki Tuuri.
------------------------------------------------------------------------
r5423 | calvin | 2009-06-26 16:52:52 -0400 (Fri, 26 Jun 2009) | 2 lines
branches/zip: Fix typos.
------------------------------------------------------------------------
r5425 | marko | 2009-06-29 04:52:30 -0400 (Mon, 29 Jun 2009) | 4 lines
branches/zip: ha_innobase::add_index(), ha_innobase::final_drop_index():
Start prebuilt->trx before locking the table. This should fix Issue #293
and could fix Issue #229.
Approved by Sunny (over IM).
------------------------------------------------------------------------
r5426 | marko | 2009-06-29 05:24:27 -0400 (Mon, 29 Jun 2009) | 3 lines
branches/zip: buf_page_get_gen(): Fix a race condition when reading
buf_fix_count. This could explain Issue #156.
Tested by Michael.
------------------------------------------------------------------------
r5427 | marko | 2009-06-29 05:54:53 -0400 (Mon, 29 Jun 2009) | 5 lines
branches/zip: lock_print_info_all_transactions(), buf_read_recv_pages():
Tolerate missing tablespaces (zip_size==ULINT_UNDEFINED).
buf_page_get_gen(): Add ut_ad(ut_is_2pow(zip_size)).
Issue #289, rb://136 approved by Sunny Bains
------------------------------------------------------------------------
r5428 | marko | 2009-06-29 07:06:29 -0400 (Mon, 29 Jun 2009) | 2 lines
branches/zip: row_sel_store_mysql_rec(): Add missing pointer cast.
Do not do arithmetics on void pointers.
------------------------------------------------------------------------
r5429 | marko | 2009-06-29 09:49:54 -0400 (Mon, 29 Jun 2009) | 13 lines
branches/zip: Do not crash on SET GLOBAL innodb_file_format=DEFAULT
or SET GLOBAL innodb_file_format_check=DEFAULT.
innodb_file_format.test: New test for innodb_file_format and
innodb_file_format_check.
innodb_file_format_name_validate(): Store the string in *save.
innodb_file_format_name_update(): Check the string again.
innodb_file_format_check_validate(): Store the string in *save.
innodb_file_format_check_update(): Check the string again.
Issue #282, rb://140 approved by Heikki Tuuri
------------------------------------------------------------------------
r5430 | marko | 2009-06-29 09:58:07 -0400 (Mon, 29 Jun 2009) | 2 lines
branches/zip: lock_rec_validate_page(): Add another assertion
to track down Issue #289.
------------------------------------------------------------------------
r5431 | marko | 2009-06-29 09:58:40 -0400 (Mon, 29 Jun 2009) | 1 line
branches/zip: Revert an accidentally made change in r5430 to univ.i.
------------------------------------------------------------------------
r5437 | marko | 2009-06-30 05:10:01 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: ibuf_dummy_index_free(): Beautify the comment.
------------------------------------------------------------------------
r5438 | marko | 2009-06-30 05:10:32 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: fseg_free(): Remove this unused function.
------------------------------------------------------------------------
r5439 | marko | 2009-06-30 05:15:22 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: fseg_validate(): Enclose in #ifdef UNIV_DEBUG.
This function is unused, but it could turn out to be a useful debugging aid.
------------------------------------------------------------------------
r5441 | marko | 2009-06-30 06:30:14 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: ha_delete(): Remove this unused function that was
very similar to ha_search_and_delete_if_found().
------------------------------------------------------------------------
r5442 | marko | 2009-06-30 06:45:41 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: lock_is_on_table(), lock_table_unlock(): Unused, remove.
------------------------------------------------------------------------
r5443 | marko | 2009-06-30 07:03:00 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_event_create_auto(): Unused, remove.
------------------------------------------------------------------------
r5444 | marko | 2009-06-30 07:19:49 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: que_graph_try_free(): Unused, remove.
------------------------------------------------------------------------
r5445 | marko | 2009-06-30 07:28:11 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: row_build_row_ref_from_row(): Unused, remove.
------------------------------------------------------------------------
r5446 | marko | 2009-06-30 07:35:45 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: srv_que_round_robin(), srv_que_task_enqueue(): Unused, remove.
------------------------------------------------------------------------
r5447 | marko | 2009-06-30 07:37:58 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: srv_que_task_queue_check(): Unused, remove.
------------------------------------------------------------------------
r5448 | marko | 2009-06-30 07:56:36 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: mem_heap_cat(): Unused, remove.
------------------------------------------------------------------------
r5449 | marko | 2009-06-30 08:00:50 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: innobase_start_or_create_for_mysql():
Invoke os_get_os_version() at most once.
------------------------------------------------------------------------
r5450 | marko | 2009-06-30 08:02:20 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_file_close_no_error_handling(): Unused, remove.
------------------------------------------------------------------------
r5451 | marko | 2009-06-30 08:09:49 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: page_set_max_trx_id(): Make the code compile
with UNIV_HOTBACKUP.
------------------------------------------------------------------------
r5452 | marko | 2009-06-30 08:10:26 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: os_file_close_no_error_handling(): Restore,
as this function is used within InnoDB Hot Backup.
------------------------------------------------------------------------
r5453 | marko | 2009-06-30 08:14:01 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_process_set_priority_boost(): Unused, remove.
------------------------------------------------------------------------
r5454 | marko | 2009-06-30 08:42:52 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: Replace a non-ASCII character
(ISO 8859-1 encoded U+00AD SOFT HYPHEN) with a cheap ASCII substitute.
------------------------------------------------------------------------
r5456 | inaam | 2009-06-30 14:21:09 -0400 (Tue, 30 Jun 2009) | 4 lines
branches/zip
Non functional change. s/Percona/Percona Inc./
------------------------------------------------------------------------
r5470 | vasil | 2009-07-02 09:12:36 -0400 (Thu, 02 Jul 2009) | 16 lines
branches/zip:
Use PAUSE instruction inside spinloop if it is available.
The patch was originally developed by Mikael Ronstrom <mikael@mysql.com>
and can be found here:
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2768
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2771
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2772
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2774
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2777
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2799
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2800
Approved by: Heikki (rb://137)
------------------------------------------------------------------------
r5481 | vasil | 2009-07-06 13:16:32 -0400 (Mon, 06 Jul 2009) | 4 lines
branches/zip:
Remove unnecessary quotes and simplify plug.in.
------------------------------------------------------------------------
r5482 | calvin | 2009-07-06 18:36:35 -0400 (Mon, 06 Jul 2009) | 5 lines
branches/zip: add COPYING files for Percona and Sun Micro.
1.0.4 contains patches based on contributions from Percona
and Sun Microsystems.
------------------------------------------------------------------------
r5483 | calvin | 2009-07-07 05:36:43 -0400 (Tue, 07 Jul 2009) | 3 lines
branches/zip: add IB_HAVE_PAUSE_INSTRUCTION to CMake.
Windows will support PAUSE instruction by default.
------------------------------------------------------------------------
r5484 | inaam | 2009-07-07 18:57:14 -0400 (Tue, 07 Jul 2009) | 13 lines
branches/zip rb://126
Based on contribution from Google Inc.
This patch introduces a new parameter innodb_io_capacity to control the
rate at which master threads performs various tasks. The default value
is 200 and higher values imply more aggressive flushing and ibuf merges
from within the master thread.
This patch also changes the ibuf merge from synchronous to asynchronous.
Another minor change is not to force the master thread to wait for a
log flush to complete every second.
Approved by: Heikki
------------------------------------------------------------------------
r5485 | inaam | 2009-07-07 19:00:49 -0400 (Tue, 07 Jul 2009) | 18 lines
branches/zip rb://138
The current implementation is to try to flush the neighbors of every
page that we flush. This patch makes the following distinction:
1) If the flush is from flush_list AND
2) If the flush is intended to move the oldest_modification LSN ahead
(this happens when a user thread sees little space in the log file and
attempts to flush pages from the buffer pool so that a checkpoint can
be made)
THEN
Do not try to flush the neighbors. Just focus on flushing dirty pages at
the end of flush_list
Approved by: Heikki
------------------------------------------------------------------------
r5486 | inaam | 2009-07-08 12:11:40 -0400 (Wed, 08 Jul 2009) | 29 lines
branches/zip rb://133
This patch introduces heuristics based flushing rate of dirty pages to
avoid IO bursts at checkpoint.
1) log_capacity / log_generated per second gives us number of seconds
in which ALL dirty pages need to be flushed. Based on this rough
assumption we can say that
n_dirty_pages / (log_capacity / log_generation_rate) = desired_flush_rate
2) We use weighted averages (hard coded to 20 seconds) of
log_generation_rate to avoid resonance.
3) From the desired_flush_rate we subtract the number of pages that have
been flushed due to LRU flushing. That gives us pages that we should
flush as part of flush_list cleanup. And that is the number (capped by
maximum io_capacity) that we try to flush from the master thread.
Knobs:
======
innodb_adaptive_flushing: boolean, global, dynamic, default TRUE.
Since this heuristic is very experimental and has the potential to
dramatically change the IO pattern I think it is a good idea to leave a
knob to turn it off.
Approved by: Heikki
------------------------------------------------------------------------
r5487 | calvin | 2009-07-08 12:42:28 -0400 (Wed, 08 Jul 2009) | 7 lines
branches/zip: fix PAUSE instruction patch on Windows
The original PAUSE instruction patch (r5470) does not
compile on Windows. Also, there is an elegant way of
doing it on Windows - YieldProcessor().
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r5489 | vasil | 2009-07-10 05:02:22 -0400 (Fri, 10 Jul 2009) | 9 lines
branches/zip:
Change the defaults for
innodb_sync_spin_loops: 20 -> 30
innodb_spin_wait_delay: 5 -> 6
This change was proposed by Sun/MySQL based on their performance testing,
see https://svn.innodb.com/innobase/Release_tasks_for_InnoDB_Plugin_V1.0.4
------------------------------------------------------------------------
r5490 | vasil | 2009-07-10 05:04:20 -0400 (Fri, 10 Jul 2009) | 4 lines
branches/zip:
Add ChangeLog entry for 5489.
------------------------------------------------------------------------
r5491 | calvin | 2009-07-10 12:19:17 -0400 (Fri, 10 Jul 2009) | 6 lines
branches/zip: add copyright info to files related to PAUSE
instruction patch, contributed by Sun Microsystems.
------------------------------------------------------------------------
r5492 | calvin | 2009-07-10 17:47:34 -0400 (Fri, 10 Jul 2009) | 5 lines
branches/zip: add ChangeLog entries for r5484-r5486.
------------------------------------------------------------------------
r5494 | vasil | 2009-07-13 03:37:35 -0400 (Mon, 13 Jul 2009) | 6 lines
branches/zip:
Restore the original value of innodb_sync_spin_loops at the end, previously
the test assumed that setting it to 20 will do this, but now the default is
30 and MTR's internal check failed.
------------------------------------------------------------------------
r5495 | inaam | 2009-07-13 11:48:45 -0400 (Mon, 13 Jul 2009) | 5 lines
branches/zip rb://138 (REVERT)
Revert the flush neighbors patch as it shows regression in
the benchmarks run by Michael.
------------------------------------------------------------------------
r5496 | inaam | 2009-07-13 14:04:57 -0400 (Mon, 13 Jul 2009) | 4 lines
branches/zip
Fixed warnings on windows where ulint != ib_uint64_t
------------------------------------------------------------------------
r5497 | calvin | 2009-07-13 15:01:00 -0400 (Mon, 13 Jul 2009) | 9 lines
branches/zip: fix run-time symbols clash on Solaris.
This patch is from Sergey Vojtovich of Sun Microsystems,
to fix run-time symbols clash on Solaris with older C++
compiler:
- when finding out a way to hide symbols, make decision basing
on compiler, not operating system.
- Sun Studio supports __hidden declaration specifier for this
purpose.
------------------------------------------------------------------------
r5498 | vasil | 2009-07-14 03:16:18 -0400 (Tue, 14 Jul 2009) | 92 lines
branches/zip: Merge r5341:5497 from branches/5.1, skipping:
c5419 because it is merge from branches/zip into branches/5.1
c5466 because the source code has been adjusted to match the MySQL
behavior and the innodb-autoinc test does not fail in branches/zip,
if c5466 is merged, then innodb-autoinc starts failing, Sunny suggested
not to merge c5466.
and resolving conflicts in c5410, c5440, c5488:
------------------------------------------------------------------------
r5410 | marko | 2009-06-24 22:26:34 +0300 (Wed, 24 Jun 2009) | 2 lines
Changed paths:
M /branches/5.1/include/trx0sys.ic
M /branches/5.1/trx/trx0purge.c
M /branches/5.1/trx/trx0sys.c
M /branches/5.1/trx/trx0undo.c
branches/5.1: Add missing #include "mtr0log.h" to avoid warnings
when compiling with -DUNIV_MUST_NOT_INLINE.
------------------------------------------------------------------------
r5419 | marko | 2009-06-25 16:11:57 +0300 (Thu, 25 Jun 2009) | 18 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb_bug42101-nonzero.result
M /branches/5.1/mysql-test/innodb_bug42101-nonzero.test
M /branches/5.1/mysql-test/innodb_bug42101.result
M /branches/5.1/mysql-test/innodb_bug42101.test
branches/5.1: Merge r5418 from branches/zip:
------------------------------------------------------------------------
r5418 | marko | 2009-06-25 15:55:52 +0300 (Thu, 25 Jun 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
M /branches/zip/mysql-test/innodb_bug42101.result
M /branches/zip/mysql-test/innodb_bug42101.test
branches/zip: Fix a race condition caused by
SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749)
When innodb_commit_concurrency is initially set nonzero,
DEFAULT would change it back to 0, triggering Bug #42101.
rb://139 approved by Heikki Tuuri.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5440 | vasil | 2009-06-30 13:04:29 +0300 (Tue, 30 Jun 2009) | 8 lines
Changed paths:
M /branches/5.1/fil/fil0fil.c
branches/5.1:
Fix Bug#45814 URL reference in InnoDB server errors needs adjusting to match documentation
by changing the URL from
http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting.html to
http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting-datadict.html
------------------------------------------------------------------------
r5466 | vasil | 2009-07-02 10:46:45 +0300 (Thu, 02 Jul 2009) | 6 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1:
Adjust the failing innodb-autoinc test to conform to the latest behavior
of the MySQL code. The idea and the comment in innodb-autoinc.test come
from Sunny.
------------------------------------------------------------------------
r5488 | vasil | 2009-07-09 19:16:44 +0300 (Thu, 09 Jul 2009) | 13 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug21704.result
A /branches/5.1/mysql-test/innodb_bug21704.test
branches/5.1:
Fix Bug#21704 Renaming column does not update FK definition
by checking whether a column that participates in a FK definition is being
renamed and denying the ALTER in this case.
The patch was originally developed by Davi Arnaut <Davi.Arnaut@Sun.COM>:
http://lists.mysql.com/commits/77714
and was later adjusted to conform to InnoDB coding style by me (Vasil),
I also added some more comments and moved the bug specific mysql-test to
a separate file to make it more manageable and flexible.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5499 | calvin | 2009-07-14 12:55:10 -0400 (Tue, 14 Jul 2009) | 3 lines
branches/zip: add a missing file in Makefile.am
This change was suggested by MySQL.
------------------------------------------------------------------------
r5500 | calvin | 2009-07-14 13:03:26 -0400 (Tue, 14 Jul 2009) | 3 lines
branches/zip: minor change
Remove an extra "with".
------------------------------------------------------------------------
r5501 | vasil | 2009-07-14 13:58:15 -0400 (Tue, 14 Jul 2009) | 5 lines
branches/zip:
Add @ZLIB_INCLUDES@ so that the InnoDB Plugin picks up the same zlib.h
header file that is eventually used by mysqld.
------------------------------------------------------------------------
r5502 | vasil | 2009-07-14 13:59:59 -0400 (Tue, 14 Jul 2009) | 4 lines
branches/zip:
Add include/ut0auxconf.h to noinst_HEADERS
------------------------------------------------------------------------
r5503 | vasil | 2009-07-14 14:16:11 -0400 (Tue, 14 Jul 2009) | 8 lines
branches/zip:
Non-functional change:
put files in noinst_HEADERS and libinnobase_a_SOURCES one per line and sort
alphabetically, so it is easier to find if a file is there or not and
also diffs show exactly the added or removed file instead of surrounding
lines too.
------------------------------------------------------------------------
r5504 | calvin | 2009-07-15 04:58:44 -0400 (Wed, 15 Jul 2009) | 6 lines
branches/zip: fix compile errors on Win64
Both srv_read_ahead_factor and srv_io_capacity should
be defined as ulong.
Approved by: Sunny
------------------------------------------------------------------------
r5508 | calvin | 2009-07-16 09:40:47 -0400 (Thu, 16 Jul 2009) | 16 lines
branches/zip: Support inlining of functions and prefetch with
Sun Studio
Those changes are contributed by Sun/MySQL. Two sets of changes
in this patch when Sun Studio is used:
- Explicit inlining of functions
- Prefetch Support
This patch has been tested by Sunny with the plugin statically
built in. Since we've never built the plugin as a dynamically
loaded module on Solaris, it is a separate task to change
plug.in.
rb://142
Approved by: Heikki
------------------------------------------------------------------------
r5509 | calvin | 2009-07-16 09:45:28 -0400 (Thu, 16 Jul 2009) | 2 lines
branches/zip: add ChangeLog entry for r5508.
------------------------------------------------------------------------
r5512 | sunny | 2009-07-19 19:52:48 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Remove unused extern ref to timed_mutexes.
------------------------------------------------------------------------
r5513 | sunny | 2009-07-19 19:58:43 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Undo r5512
------------------------------------------------------------------------
r5514 | sunny | 2009-07-19 20:08:49 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Only use my_bool when UNIV_HOTBACKUP is not defined.
------------------------------------------------------------------------
r5515 | sunny | 2009-07-20 03:29:14 -0400 (Mon, 20 Jul 2009) | 2 lines
branches/zip: The dict_table_t::autoinc_mutex field is not used in HotBackup.
------------------------------------------------------------------------
r5516 | sunny | 2009-07-20 03:46:05 -0400 (Mon, 20 Jul 2009) | 4 lines
branches/zip: Make this file usable from within HotBackup. A new file has
been introduced called hb_univ.i. This file should have all the HotBackup
specific configuration.
------------------------------------------------------------------------
r5517 | sunny | 2009-07-20 03:55:11 -0400 (Mon, 20 Jul 2009) | 2 lines
Add /* UNIV_HOTBACK */
------------------------------------------------------------------------
r5519 | vasil | 2009-07-20 04:45:18 -0400 (Mon, 20 Jul 2009) | 31 lines
branches/zip: Merge r5497:5518 from branches/5.1:
------------------------------------------------------------------------
r5518 | vasil | 2009-07-20 11:29:47 +0300 (Mon, 20 Jul 2009) | 22 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Merge a change from MySQL:
------------------------------------------------------------
revno: 2874.2.1
committer: Anurag Shekhar <anurag.shekhar@sun.com>
branch nick: mysql-5.1-bugteam-windows-warning
timestamp: Wed 2009-05-13 15:41:24 +0530
message:
Bug #39802 On Windows, 32-bit time_t should be enforced
This patch fixes compilation warning, "conversion from 'time_t' to 'ulong',
possible loss of data".
The fix is to typecast time_t to ulong before assigning it to ulong.
Backported this from 6.0-bugteam tree.
modified:
storage/archive/ha_archive.cc
storage/federated/ha_federated.cc
storage/innobase/handler/ha_innodb.cc
storage/myisam/ha_myisam.cc
------------------------------------------------------------------------
------------------------------------------------------------------------
r5520 | vasil | 2009-07-20 04:51:47 -0400 (Mon, 20 Jul 2009) | 4 lines
branches/zip:
Add ChangeLog entries for r5498 and r5519.
------------------------------------------------------------------------
r5524 | inaam | 2009-07-20 12:23:15 -0400 (Mon, 20 Jul 2009) | 9 lines
branches/zip
Change the read ahead parameter name to innodb_read_ahead_threshold.
Change the meaning of this parameter to signify the number of pages
that must be sequentially accessed for InnoDB to trigger a readahead
request.
Suggested by: Ken
------------------------------------------------------------------------
2009-07-21 02:09:29 +02:00
|
|
|
/***********************************************************************
|
|
|
|
|
2016-06-21 14:21:03 +02:00
|
|
|
Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
|
branches/innodb+: Merge revisions 5144:5524 from branches/zip
------------------------------------------------------------------------
r5147 | marko | 2009-05-27 06:55:14 -0400 (Wed, 27 May 2009) | 1 line
branches/zip: ibuf0ibuf.c: Improve a comment.
------------------------------------------------------------------------
r5149 | marko | 2009-05-27 07:46:42 -0400 (Wed, 27 May 2009) | 34 lines
branches/zip: Merge revisions 4994:5148 from branches/5.1:
------------------------------------------------------------------------
r5126 | vasil | 2009-05-26 16:57:12 +0300 (Tue, 26 May 2009) | 9 lines
branches/5.1:
Preparation for the fix of
Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Non-functional change: move FSP_* macros from fsp0fsp.h to a new file
fsp0types.h. This is needed in order to be able to use FSP_EXTENT_SIZE
in mtr0log.ic.
------------------------------------------------------------------------
r5127 | vasil | 2009-05-26 17:05:43 +0300 (Tue, 26 May 2009) | 9 lines
branches/5.1:
Preparation for the fix of
Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Do not include unnecessary headers mtr0log.h and fut0lst.h in trx0sys.h
and include fsp0fsp.h just before it is needed. This is needed in order
to be able to use TRX_SYS_SPACE in mtr0log.ic.
------------------------------------------------------------------------
r5128 | vasil | 2009-05-26 17:26:37 +0300 (Tue, 26 May 2009) | 7 lines
branches/5.1:
Fix Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Do not write redo log for the pages in the doublewrite buffer. Also, do not
make a dummy change to the page because this is not needed.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5169 | marko | 2009-05-28 03:21:55 -0400 (Thu, 28 May 2009) | 1 line
branches/zip: mtr0mtr.h: Add Doxygen comments for the redo log entry types.
------------------------------------------------------------------------
r5176 | marko | 2009-05-28 07:14:02 -0400 (Thu, 28 May 2009) | 1 line
branches/zip: Correct a debug assertion that was added in r5125.
------------------------------------------------------------------------
r5201 | marko | 2009-06-01 06:35:25 -0400 (Mon, 01 Jun 2009) | 2 lines
branches/zip: Clean up some comments.
Make the rec parameter of mlog_open_and_write_index() const.
------------------------------------------------------------------------
r5234 | marko | 2009-06-03 08:26:41 -0400 (Wed, 03 Jun 2009) | 44 lines
branches/zip: Merge revisions 5148:5233 from branches/5.1:
------------------------------------------------------------------------
r5150 | vasil | 2009-05-27 18:56:03 +0300 (Wed, 27 May 2009) | 4 lines
branches/5.1:
Whitespace fixup.
------------------------------------------------------------------------
r5191 | vasil | 2009-05-30 17:46:05 +0300 (Sat, 30 May 2009) | 19 lines
branches/5.1:
Merge a change from MySQL (this fixes the failing innodb_mysql test):
------------------------------------------------------------
revno: 1810.3894.10
committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
branch nick: mysql-5.0-bugteam
timestamp: Tue 2009-05-19 11:32:21 +0500
message:
Bug#39793 Foreign keys not constructed when column has a '#' in a comment or default value
Internal InnoDN FK parser does not recognize '\'' as quotation symbol.
Suggested fix is to add '\'' symbol check for quotation condition
(dict_strip_comments() function).
modified:
innobase/dict/dict0dict.c
mysql-test/r/innodb_mysql.result
mysql-test/t/innodb_mysql.test
------------------------------------------------------------------------
r5233 | marko | 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) | 11 lines
branches/5.1: Merge the test case from r5232 from branches/5.0:
------------------------------------------------------------------------
r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines
branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565
(Update Query Results in "1 Row Affected" But Should Be "Zero Rows").
Also, add a test case for Bug #40565.
rb://128 approved by Heikki Tuuri
------------------------------------------------------------------------
------------------------------------------------------------------------
------------------------------------------------------------------------
r5250 | marko | 2009-06-04 02:58:23 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Add Doxygen comments to the rest of buf0*.
------------------------------------------------------------------------
r5251 | marko | 2009-06-04 02:59:51 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Replace <= in a function comment.
------------------------------------------------------------------------
r5253 | marko | 2009-06-04 06:37:35 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Add missing Doxygen comments for page0zip.
------------------------------------------------------------------------
r5261 | vasil | 2009-06-05 11:13:31 -0400 (Fri, 05 Jun 2009) | 15 lines
branches/zip:
Fix Mantis Issue#244 fix bug in linear read ahead (no check on access pattern)
The changes are:
1) Take into account access pattern when deciding whether or not to do linear
read ahead.
2) Expose a knob innodb_read_ahead_factor = [0-64] default (8), dynamic,
global to control linear read ahead behvior
3) Disable random read ahead. Keep the code for now.
Submitted by: Inaam (rb://122)
Approved by: Heikki (rb://122)
------------------------------------------------------------------------
r5262 | vasil | 2009-06-05 12:04:25 -0400 (Fri, 05 Jun 2009) | 22 lines
branches/zip:
Enable functionality to have multiple background io helper threads.
This patch is based on percona contributions.
More details about this patch will be written at:
https://svn.innodb.com/innobase/MultipleBackgroundThreads
The patch essentially does the following:
expose following knobs:
innodb_read_io_threads = [1 - 64] default 1
innodb_write_io_threads = [1 - 64] default 1
deprecate innodb_file_io_threads (this parameter was relevant only on windows)
Internally it allows multiple segments for read and write IO request arrays
where one thread works on one segement.
Submitted by: Inaam (rb://124)
Approved by: Heikki (rb://124)
------------------------------------------------------------------------
r5263 | vasil | 2009-06-05 12:19:37 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Whitespace cleanup.
------------------------------------------------------------------------
r5264 | vasil | 2009-06-05 12:26:58 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5261.
------------------------------------------------------------------------
r5265 | vasil | 2009-06-05 12:34:11 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5262.
------------------------------------------------------------------------
r5268 | inaam | 2009-06-08 12:18:21 -0400 (Mon, 08 Jun 2009) | 7 lines
branches/zip
Non functional change:
Added legal notices acknowledging percona contribution to the multiple
IO helper threads patch i.e.: r5262
------------------------------------------------------------------------
r5283 | inaam | 2009-06-09 13:46:29 -0400 (Tue, 09 Jun 2009) | 9 lines
branches/zip
rb://130
Enable Group Commit functionality that was broken in 5.0 when
distributed transactions were introduced.
Reviewed by: Heikki
------------------------------------------------------------------------
r5319 | marko | 2009-06-11 04:40:33 -0400 (Thu, 11 Jun 2009) | 3 lines
branches/zip: Declare os_thread_id_t as unsigned long,
because ulint is wrong on Win64.
Pointed out by Vladislav Vaintroub <wlad@sun.com>.
------------------------------------------------------------------------
r5320 | inaam | 2009-06-11 09:15:41 -0400 (Thu, 11 Jun 2009) | 14 lines
branches/zip rb://131
This patch changes the following defaults:
max_dirty_pages_pct: default from 90 to 75. max allowed from 100 to 99
additional_mem_pool_size: default from 1 to 8 MB
buffer_pool_size: default from 8 to 128 MB
log_buffer_size: default from 1 to 8 MB
read_io_threads/write_io_threads: default from 1 to 4
The log file sizes are untouched because of upgrade issues
Reviewed by: Heikki
------------------------------------------------------------------------
r5330 | marko | 2009-06-16 04:08:59 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: buf_page_get_gen(): Reduce mutex holding time by adjusting
buf_pool->n_pend_unzip while only holding buf_pool_mutex.
------------------------------------------------------------------------
r5331 | marko | 2009-06-16 05:00:48 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: buf_page_get_zip(): Eliminate a buf_page_get_mutex() call.
The function must switch on the block state anyway.
------------------------------------------------------------------------
r5332 | vasil | 2009-06-16 05:03:27 -0400 (Tue, 16 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entries for r5283 and r5320.
------------------------------------------------------------------------
r5333 | marko | 2009-06-16 05:27:46 -0400 (Tue, 16 Jun 2009) | 1 line
branches/zip: buf_page_io_query(): Remove unused function.
------------------------------------------------------------------------
r5335 | marko | 2009-06-16 09:23:10 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: innodb.test: Adjust the tolerance of
innodb_buffer_pool_pages_total for r5320.
------------------------------------------------------------------------
r5342 | marko | 2009-06-17 06:15:32 -0400 (Wed, 17 Jun 2009) | 60 lines
branches/zip: Merge revisions 5233:5341 from branches/5.1:
------------------------------------------------------------------------
r5233 | marko | 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) | 11 lines
branches/5.1: Merge the test case from r5232 from branches/5.0:
------------------------------------------------------------------------
r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines
branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565
(Update Query Results in "1 Row Affected" But Should Be "Zero Rows").
Also, add a test case for Bug #40565.
rb://128 approved by Heikki Tuuri
------------------------------------------------------------------------
------------------------------------------------------------------------
r5243 | sunny | 2009-06-04 03:17:14 +0300 (Thu, 04 Jun 2009) | 14 lines
branches/5.1: When the InnoDB and MySQL data dictionaries go out of sync, before
the bug fix we would assert on missing autoinc columns. With this fix we allow
MySQL to open the table but set the next autoinc value for the column to the
MAX value. This effectively disables the next value generation. INSERTs will
fail with a generic AUTOINC failure. However, the user should be able to
read/dump the table, set the column values explicitly, use ALTER TABLE to
set the next autoinc value and/or sync the two data dictionaries to resume
normal operations.
Fix Bug#44030 Error: (1500) Couldn't read the MAX(ID) autoinc value from the
index (PRIMARY)
rb://118
------------------------------------------------------------------------
r5252 | sunny | 2009-06-04 10:16:24 +0300 (Thu, 04 Jun 2009) | 2 lines
branches/5.1: The version of the result file checked in was broken in r5243.
------------------------------------------------------------------------
r5259 | vasil | 2009-06-05 10:29:16 +0300 (Fri, 05 Jun 2009) | 7 lines
branches/5.1:
Remove the word "Error" from the printout because the mysqltest suite
interprets it as an error and thus the innodb-autoinc test fails.
Approved by: Sunny (via IM)
------------------------------------------------------------------------
r5339 | marko | 2009-06-17 11:01:37 +0300 (Wed, 17 Jun 2009) | 2 lines
branches/5.1: Add missing #include "mtr0log.h" so that the code compiles
with -DUNIV_MUST_NOT_INLINE.
(null merge; this had already been committed in branches/zip)
------------------------------------------------------------------------
r5340 | marko | 2009-06-17 12:11:49 +0300 (Wed, 17 Jun 2009) | 4 lines
branches/5.1: row_unlock_for_mysql(): When the clustered index is unknown,
refuse to unlock the record.
(Bug #45357, caused by the fix of Bug #39320).
rb://132 approved by Sunny Bains.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5343 | vasil | 2009-06-17 08:56:12 -0400 (Wed, 17 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5342.
------------------------------------------------------------------------
r5344 | marko | 2009-06-17 09:03:45 -0400 (Wed, 17 Jun 2009) | 1 line
branches/zip: row_merge_read_rec(): Fix a UNIV_DEBUG bug (Bug #45426)
------------------------------------------------------------------------
r5391 | marko | 2009-06-22 05:31:35 -0400 (Mon, 22 Jun 2009) | 2 lines
branches/zip: buf_page_get_zip(): Fix a bogus warning about
block_mutex being possibly uninitialized.
------------------------------------------------------------------------
r5392 | marko | 2009-06-22 07:58:20 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: ha_innobase::check_if_incompatible_data(): When
ROW_FORMAT=DEFAULT, do not compare to get_row_type().
Without this change, fast index creation will be disabled
in recent versions of MySQL 5.1.
------------------------------------------------------------------------
r5393 | pekka | 2009-06-22 09:27:55 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: Minor changes for Hot Backup to build correctly. (The
code bracketed between #ifdef UNIV_HOTBACKUP and #endif /* UNIV_HOTBACKUP */).
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r5394 | pekka | 2009-06-22 09:46:34 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: Add functions for checking the format of tablespaces
for Hot Backup build (UNIV_HOTBACKUP defined).
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r5397 | calvin | 2009-06-23 16:59:42 -0400 (Tue, 23 Jun 2009) | 7 lines
branches/zip: change the header file path.
Change the header file path from ../storage/innobase/include/
to ../include/. In the planned 5.1 + plugin release, the source
directory of the plugin will not be in storage/innobase.
Approved by: Heikki (IM)
------------------------------------------------------------------------
r5407 | calvin | 2009-06-24 09:51:08 -0400 (Wed, 24 Jun 2009) | 4 lines
branches/zip: remove relative path of header files.
Suggested by Marko.
------------------------------------------------------------------------
r5412 | marko | 2009-06-25 06:27:08 -0400 (Thu, 25 Jun 2009) | 1 line
branches/zip: Replace a DBUG_ASSERT with ut_a to track down Issue #290.
------------------------------------------------------------------------
r5415 | marko | 2009-06-25 06:45:57 -0400 (Thu, 25 Jun 2009) | 3 lines
branches/zip: dict_index_find_cols(): Print diagnostic on name mismatch.
This addresses Bug #44571 but does not fix it.
rb://135 approved by Sunny Bains.
------------------------------------------------------------------------
r5417 | marko | 2009-06-25 08:20:56 -0400 (Thu, 25 Jun 2009) | 1 line
branches/zip: ha_innodb.cc: Move the misplaced Doxygen @file comment.
------------------------------------------------------------------------
r5418 | marko | 2009-06-25 08:55:52 -0400 (Thu, 25 Jun 2009) | 5 lines
branches/zip: Fix a race condition caused by
SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749)
When innodb_commit_concurrency is initially set nonzero,
DEFAULT would change it back to 0, triggering Bug #42101.
rb://139 approved by Heikki Tuuri.
------------------------------------------------------------------------
r5423 | calvin | 2009-06-26 16:52:52 -0400 (Fri, 26 Jun 2009) | 2 lines
branches/zip: Fix typos.
------------------------------------------------------------------------
r5425 | marko | 2009-06-29 04:52:30 -0400 (Mon, 29 Jun 2009) | 4 lines
branches/zip: ha_innobase::add_index(), ha_innobase::final_drop_index():
Start prebuilt->trx before locking the table. This should fix Issue #293
and could fix Issue #229.
Approved by Sunny (over IM).
------------------------------------------------------------------------
r5426 | marko | 2009-06-29 05:24:27 -0400 (Mon, 29 Jun 2009) | 3 lines
branches/zip: buf_page_get_gen(): Fix a race condition when reading
buf_fix_count. This could explain Issue #156.
Tested by Michael.
------------------------------------------------------------------------
r5427 | marko | 2009-06-29 05:54:53 -0400 (Mon, 29 Jun 2009) | 5 lines
branches/zip: lock_print_info_all_transactions(), buf_read_recv_pages():
Tolerate missing tablespaces (zip_size==ULINT_UNDEFINED).
buf_page_get_gen(): Add ut_ad(ut_is_2pow(zip_size)).
Issue #289, rb://136 approved by Sunny Bains
------------------------------------------------------------------------
r5428 | marko | 2009-06-29 07:06:29 -0400 (Mon, 29 Jun 2009) | 2 lines
branches/zip: row_sel_store_mysql_rec(): Add missing pointer cast.
Do not do arithmetics on void pointers.
------------------------------------------------------------------------
r5429 | marko | 2009-06-29 09:49:54 -0400 (Mon, 29 Jun 2009) | 13 lines
branches/zip: Do not crash on SET GLOBAL innodb_file_format=DEFAULT
or SET GLOBAL innodb_file_format_check=DEFAULT.
innodb_file_format.test: New test for innodb_file_format and
innodb_file_format_check.
innodb_file_format_name_validate(): Store the string in *save.
innodb_file_format_name_update(): Check the string again.
innodb_file_format_check_validate(): Store the string in *save.
innodb_file_format_check_update(): Check the string again.
Issue #282, rb://140 approved by Heikki Tuuri
------------------------------------------------------------------------
r5430 | marko | 2009-06-29 09:58:07 -0400 (Mon, 29 Jun 2009) | 2 lines
branches/zip: lock_rec_validate_page(): Add another assertion
to track down Issue #289.
------------------------------------------------------------------------
r5431 | marko | 2009-06-29 09:58:40 -0400 (Mon, 29 Jun 2009) | 1 line
branches/zip: Revert an accidentally made change in r5430 to univ.i.
------------------------------------------------------------------------
r5437 | marko | 2009-06-30 05:10:01 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: ibuf_dummy_index_free(): Beautify the comment.
------------------------------------------------------------------------
r5438 | marko | 2009-06-30 05:10:32 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: fseg_free(): Remove this unused function.
------------------------------------------------------------------------
r5439 | marko | 2009-06-30 05:15:22 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: fseg_validate(): Enclose in #ifdef UNIV_DEBUG.
This function is unused, but it could turn out to be a useful debugging aid.
------------------------------------------------------------------------
r5441 | marko | 2009-06-30 06:30:14 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: ha_delete(): Remove this unused function that was
very similar to ha_search_and_delete_if_found().
------------------------------------------------------------------------
r5442 | marko | 2009-06-30 06:45:41 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: lock_is_on_table(), lock_table_unlock(): Unused, remove.
------------------------------------------------------------------------
r5443 | marko | 2009-06-30 07:03:00 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_event_create_auto(): Unused, remove.
------------------------------------------------------------------------
r5444 | marko | 2009-06-30 07:19:49 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: que_graph_try_free(): Unused, remove.
------------------------------------------------------------------------
r5445 | marko | 2009-06-30 07:28:11 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: row_build_row_ref_from_row(): Unused, remove.
------------------------------------------------------------------------
r5446 | marko | 2009-06-30 07:35:45 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: srv_que_round_robin(), srv_que_task_enqueue(): Unused, remove.
------------------------------------------------------------------------
r5447 | marko | 2009-06-30 07:37:58 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: srv_que_task_queue_check(): Unused, remove.
------------------------------------------------------------------------
r5448 | marko | 2009-06-30 07:56:36 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: mem_heap_cat(): Unused, remove.
------------------------------------------------------------------------
r5449 | marko | 2009-06-30 08:00:50 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: innobase_start_or_create_for_mysql():
Invoke os_get_os_version() at most once.
------------------------------------------------------------------------
r5450 | marko | 2009-06-30 08:02:20 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_file_close_no_error_handling(): Unused, remove.
------------------------------------------------------------------------
r5451 | marko | 2009-06-30 08:09:49 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: page_set_max_trx_id(): Make the code compile
with UNIV_HOTBACKUP.
------------------------------------------------------------------------
r5452 | marko | 2009-06-30 08:10:26 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: os_file_close_no_error_handling(): Restore,
as this function is used within InnoDB Hot Backup.
------------------------------------------------------------------------
r5453 | marko | 2009-06-30 08:14:01 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_process_set_priority_boost(): Unused, remove.
------------------------------------------------------------------------
r5454 | marko | 2009-06-30 08:42:52 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: Replace a non-ASCII character
(ISO 8859-1 encoded U+00AD SOFT HYPHEN) with a cheap ASCII substitute.
------------------------------------------------------------------------
r5456 | inaam | 2009-06-30 14:21:09 -0400 (Tue, 30 Jun 2009) | 4 lines
branches/zip
Non functional change. s/Percona/Percona Inc./
------------------------------------------------------------------------
r5470 | vasil | 2009-07-02 09:12:36 -0400 (Thu, 02 Jul 2009) | 16 lines
branches/zip:
Use PAUSE instruction inside spinloop if it is available.
The patch was originally developed by Mikael Ronstrom <mikael@mysql.com>
and can be found here:
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2768
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2771
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2772
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2774
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2777
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2799
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2800
Approved by: Heikki (rb://137)
------------------------------------------------------------------------
r5481 | vasil | 2009-07-06 13:16:32 -0400 (Mon, 06 Jul 2009) | 4 lines
branches/zip:
Remove unnecessary quotes and simplify plug.in.
------------------------------------------------------------------------
r5482 | calvin | 2009-07-06 18:36:35 -0400 (Mon, 06 Jul 2009) | 5 lines
branches/zip: add COPYING files for Percona and Sun Micro.
1.0.4 contains patches based on contributions from Percona
and Sun Microsystems.
------------------------------------------------------------------------
r5483 | calvin | 2009-07-07 05:36:43 -0400 (Tue, 07 Jul 2009) | 3 lines
branches/zip: add IB_HAVE_PAUSE_INSTRUCTION to CMake.
Windows will support PAUSE instruction by default.
------------------------------------------------------------------------
r5484 | inaam | 2009-07-07 18:57:14 -0400 (Tue, 07 Jul 2009) | 13 lines
branches/zip rb://126
Based on contribution from Google Inc.
This patch introduces a new parameter innodb_io_capacity to control the
rate at which master threads performs various tasks. The default value
is 200 and higher values imply more aggressive flushing and ibuf merges
from within the master thread.
This patch also changes the ibuf merge from synchronous to asynchronous.
Another minor change is not to force the master thread to wait for a
log flush to complete every second.
Approved by: Heikki
------------------------------------------------------------------------
r5485 | inaam | 2009-07-07 19:00:49 -0400 (Tue, 07 Jul 2009) | 18 lines
branches/zip rb://138
The current implementation is to try to flush the neighbors of every
page that we flush. This patch makes the following distinction:
1) If the flush is from flush_list AND
2) If the flush is intended to move the oldest_modification LSN ahead
(this happens when a user thread sees little space in the log file and
attempts to flush pages from the buffer pool so that a checkpoint can
be made)
THEN
Do not try to flush the neighbors. Just focus on flushing dirty pages at
the end of flush_list
Approved by: Heikki
------------------------------------------------------------------------
r5486 | inaam | 2009-07-08 12:11:40 -0400 (Wed, 08 Jul 2009) | 29 lines
branches/zip rb://133
This patch introduces heuristics based flushing rate of dirty pages to
avoid IO bursts at checkpoint.
1) log_capacity / log_generated per second gives us number of seconds
in which ALL dirty pages need to be flushed. Based on this rough
assumption we can say that
n_dirty_pages / (log_capacity / log_generation_rate) = desired_flush_rate
2) We use weighted averages (hard coded to 20 seconds) of
log_generation_rate to avoid resonance.
3) From the desired_flush_rate we subtract the number of pages that have
been flushed due to LRU flushing. That gives us pages that we should
flush as part of flush_list cleanup. And that is the number (capped by
maximum io_capacity) that we try to flush from the master thread.
Knobs:
======
innodb_adaptive_flushing: boolean, global, dynamic, default TRUE.
Since this heuristic is very experimental and has the potential to
dramatically change the IO pattern I think it is a good idea to leave a
knob to turn it off.
Approved by: Heikki
------------------------------------------------------------------------
r5487 | calvin | 2009-07-08 12:42:28 -0400 (Wed, 08 Jul 2009) | 7 lines
branches/zip: fix PAUSE instruction patch on Windows
The original PAUSE instruction patch (r5470) does not
compile on Windows. Also, there is an elegant way of
doing it on Windows - YieldProcessor().
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r5489 | vasil | 2009-07-10 05:02:22 -0400 (Fri, 10 Jul 2009) | 9 lines
branches/zip:
Change the defaults for
innodb_sync_spin_loops: 20 -> 30
innodb_spin_wait_delay: 5 -> 6
This change was proposed by Sun/MySQL based on their performance testing,
see https://svn.innodb.com/innobase/Release_tasks_for_InnoDB_Plugin_V1.0.4
------------------------------------------------------------------------
r5490 | vasil | 2009-07-10 05:04:20 -0400 (Fri, 10 Jul 2009) | 4 lines
branches/zip:
Add ChangeLog entry for 5489.
------------------------------------------------------------------------
r5491 | calvin | 2009-07-10 12:19:17 -0400 (Fri, 10 Jul 2009) | 6 lines
branches/zip: add copyright info to files related to PAUSE
instruction patch, contributed by Sun Microsystems.
------------------------------------------------------------------------
r5492 | calvin | 2009-07-10 17:47:34 -0400 (Fri, 10 Jul 2009) | 5 lines
branches/zip: add ChangeLog entries for r5484-r5486.
------------------------------------------------------------------------
r5494 | vasil | 2009-07-13 03:37:35 -0400 (Mon, 13 Jul 2009) | 6 lines
branches/zip:
Restore the original value of innodb_sync_spin_loops at the end, previously
the test assumed that setting it to 20 will do this, but now the default is
30 and MTR's internal check failed.
------------------------------------------------------------------------
r5495 | inaam | 2009-07-13 11:48:45 -0400 (Mon, 13 Jul 2009) | 5 lines
branches/zip rb://138 (REVERT)
Revert the flush neighbors patch as it shows regression in
the benchmarks run by Michael.
------------------------------------------------------------------------
r5496 | inaam | 2009-07-13 14:04:57 -0400 (Mon, 13 Jul 2009) | 4 lines
branches/zip
Fixed warnings on windows where ulint != ib_uint64_t
------------------------------------------------------------------------
r5497 | calvin | 2009-07-13 15:01:00 -0400 (Mon, 13 Jul 2009) | 9 lines
branches/zip: fix run-time symbols clash on Solaris.
This patch is from Sergey Vojtovich of Sun Microsystems,
to fix run-time symbols clash on Solaris with older C++
compiler:
- when finding out a way to hide symbols, make decision basing
on compiler, not operating system.
- Sun Studio supports __hidden declaration specifier for this
purpose.
------------------------------------------------------------------------
r5498 | vasil | 2009-07-14 03:16:18 -0400 (Tue, 14 Jul 2009) | 92 lines
branches/zip: Merge r5341:5497 from branches/5.1, skipping:
c5419 because it is merge from branches/zip into branches/5.1
c5466 because the source code has been adjusted to match the MySQL
behavior and the innodb-autoinc test does not fail in branches/zip,
if c5466 is merged, then innodb-autoinc starts failing, Sunny suggested
not to merge c5466.
and resolving conflicts in c5410, c5440, c5488:
------------------------------------------------------------------------
r5410 | marko | 2009-06-24 22:26:34 +0300 (Wed, 24 Jun 2009) | 2 lines
Changed paths:
M /branches/5.1/include/trx0sys.ic
M /branches/5.1/trx/trx0purge.c
M /branches/5.1/trx/trx0sys.c
M /branches/5.1/trx/trx0undo.c
branches/5.1: Add missing #include "mtr0log.h" to avoid warnings
when compiling with -DUNIV_MUST_NOT_INLINE.
------------------------------------------------------------------------
r5419 | marko | 2009-06-25 16:11:57 +0300 (Thu, 25 Jun 2009) | 18 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb_bug42101-nonzero.result
M /branches/5.1/mysql-test/innodb_bug42101-nonzero.test
M /branches/5.1/mysql-test/innodb_bug42101.result
M /branches/5.1/mysql-test/innodb_bug42101.test
branches/5.1: Merge r5418 from branches/zip:
------------------------------------------------------------------------
r5418 | marko | 2009-06-25 15:55:52 +0300 (Thu, 25 Jun 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
M /branches/zip/mysql-test/innodb_bug42101.result
M /branches/zip/mysql-test/innodb_bug42101.test
branches/zip: Fix a race condition caused by
SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749)
When innodb_commit_concurrency is initially set nonzero,
DEFAULT would change it back to 0, triggering Bug #42101.
rb://139 approved by Heikki Tuuri.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5440 | vasil | 2009-06-30 13:04:29 +0300 (Tue, 30 Jun 2009) | 8 lines
Changed paths:
M /branches/5.1/fil/fil0fil.c
branches/5.1:
Fix Bug#45814 URL reference in InnoDB server errors needs adjusting to match documentation
by changing the URL from
http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting.html to
http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting-datadict.html
------------------------------------------------------------------------
r5466 | vasil | 2009-07-02 10:46:45 +0300 (Thu, 02 Jul 2009) | 6 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1:
Adjust the failing innodb-autoinc test to conform to the latest behavior
of the MySQL code. The idea and the comment in innodb-autoinc.test come
from Sunny.
------------------------------------------------------------------------
r5488 | vasil | 2009-07-09 19:16:44 +0300 (Thu, 09 Jul 2009) | 13 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug21704.result
A /branches/5.1/mysql-test/innodb_bug21704.test
branches/5.1:
Fix Bug#21704 Renaming column does not update FK definition
by checking whether a column that participates in a FK definition is being
renamed and denying the ALTER in this case.
The patch was originally developed by Davi Arnaut <Davi.Arnaut@Sun.COM>:
http://lists.mysql.com/commits/77714
and was later adjusted to conform to InnoDB coding style by me (Vasil),
I also added some more comments and moved the bug specific mysql-test to
a separate file to make it more manageable and flexible.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5499 | calvin | 2009-07-14 12:55:10 -0400 (Tue, 14 Jul 2009) | 3 lines
branches/zip: add a missing file in Makefile.am
This change was suggested by MySQL.
------------------------------------------------------------------------
r5500 | calvin | 2009-07-14 13:03:26 -0400 (Tue, 14 Jul 2009) | 3 lines
branches/zip: minor change
Remove an extra "with".
------------------------------------------------------------------------
r5501 | vasil | 2009-07-14 13:58:15 -0400 (Tue, 14 Jul 2009) | 5 lines
branches/zip:
Add @ZLIB_INCLUDES@ so that the InnoDB Plugin picks up the same zlib.h
header file that is eventually used by mysqld.
------------------------------------------------------------------------
r5502 | vasil | 2009-07-14 13:59:59 -0400 (Tue, 14 Jul 2009) | 4 lines
branches/zip:
Add include/ut0auxconf.h to noinst_HEADERS
------------------------------------------------------------------------
r5503 | vasil | 2009-07-14 14:16:11 -0400 (Tue, 14 Jul 2009) | 8 lines
branches/zip:
Non-functional change:
put files in noinst_HEADERS and libinnobase_a_SOURCES one per line and sort
alphabetically, so it is easier to find if a file is there or not and
also diffs show exactly the added or removed file instead of surrounding
lines too.
------------------------------------------------------------------------
r5504 | calvin | 2009-07-15 04:58:44 -0400 (Wed, 15 Jul 2009) | 6 lines
branches/zip: fix compile errors on Win64
Both srv_read_ahead_factor and srv_io_capacity should
be defined as ulong.
Approved by: Sunny
------------------------------------------------------------------------
r5508 | calvin | 2009-07-16 09:40:47 -0400 (Thu, 16 Jul 2009) | 16 lines
branches/zip: Support inlining of functions and prefetch with
Sun Studio
Those changes are contributed by Sun/MySQL. Two sets of changes
in this patch when Sun Studio is used:
- Explicit inlining of functions
- Prefetch Support
This patch has been tested by Sunny with the plugin statically
built in. Since we've never built the plugin as a dynamically
loaded module on Solaris, it is a separate task to change
plug.in.
rb://142
Approved by: Heikki
------------------------------------------------------------------------
r5509 | calvin | 2009-07-16 09:45:28 -0400 (Thu, 16 Jul 2009) | 2 lines
branches/zip: add ChangeLog entry for r5508.
------------------------------------------------------------------------
r5512 | sunny | 2009-07-19 19:52:48 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Remove unused extern ref to timed_mutexes.
------------------------------------------------------------------------
r5513 | sunny | 2009-07-19 19:58:43 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Undo r5512
------------------------------------------------------------------------
r5514 | sunny | 2009-07-19 20:08:49 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Only use my_bool when UNIV_HOTBACKUP is not defined.
------------------------------------------------------------------------
r5515 | sunny | 2009-07-20 03:29:14 -0400 (Mon, 20 Jul 2009) | 2 lines
branches/zip: The dict_table_t::autoinc_mutex field is not used in HotBackup.
------------------------------------------------------------------------
r5516 | sunny | 2009-07-20 03:46:05 -0400 (Mon, 20 Jul 2009) | 4 lines
branches/zip: Make this file usable from within HotBackup. A new file has
been introduced called hb_univ.i. This file should have all the HotBackup
specific configuration.
------------------------------------------------------------------------
r5517 | sunny | 2009-07-20 03:55:11 -0400 (Mon, 20 Jul 2009) | 2 lines
Add /* UNIV_HOTBACK */
------------------------------------------------------------------------
r5519 | vasil | 2009-07-20 04:45:18 -0400 (Mon, 20 Jul 2009) | 31 lines
branches/zip: Merge r5497:5518 from branches/5.1:
------------------------------------------------------------------------
r5518 | vasil | 2009-07-20 11:29:47 +0300 (Mon, 20 Jul 2009) | 22 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Merge a change from MySQL:
------------------------------------------------------------
revno: 2874.2.1
committer: Anurag Shekhar <anurag.shekhar@sun.com>
branch nick: mysql-5.1-bugteam-windows-warning
timestamp: Wed 2009-05-13 15:41:24 +0530
message:
Bug #39802 On Windows, 32-bit time_t should be enforced
This patch fixes compilation warning, "conversion from 'time_t' to 'ulong',
possible loss of data".
The fix is to typecast time_t to ulong before assigning it to ulong.
Backported this from 6.0-bugteam tree.
modified:
storage/archive/ha_archive.cc
storage/federated/ha_federated.cc
storage/innobase/handler/ha_innodb.cc
storage/myisam/ha_myisam.cc
------------------------------------------------------------------------
------------------------------------------------------------------------
r5520 | vasil | 2009-07-20 04:51:47 -0400 (Mon, 20 Jul 2009) | 4 lines
branches/zip:
Add ChangeLog entries for r5498 and r5519.
------------------------------------------------------------------------
r5524 | inaam | 2009-07-20 12:23:15 -0400 (Mon, 20 Jul 2009) | 9 lines
branches/zip
Change the read ahead parameter name to innodb_read_ahead_threshold.
Change the meaning of this parameter to signify the number of pages
that must be sequentially accessed for InnoDB to trigger a readahead
request.
Suggested by: Ken
------------------------------------------------------------------------
2009-07-21 02:09:29 +02:00
|
|
|
Copyright (c) 2009, Percona Inc.
|
2017-02-17 09:32:21 +01:00
|
|
|
Copyright (c) 2013, 2017, MariaDB Corporation. All Rights Reserved.
|
branches/innodb+: Merge revisions 5144:5524 from branches/zip
------------------------------------------------------------------------
r5147 | marko | 2009-05-27 06:55:14 -0400 (Wed, 27 May 2009) | 1 line
branches/zip: ibuf0ibuf.c: Improve a comment.
------------------------------------------------------------------------
r5149 | marko | 2009-05-27 07:46:42 -0400 (Wed, 27 May 2009) | 34 lines
branches/zip: Merge revisions 4994:5148 from branches/5.1:
------------------------------------------------------------------------
r5126 | vasil | 2009-05-26 16:57:12 +0300 (Tue, 26 May 2009) | 9 lines
branches/5.1:
Preparation for the fix of
Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Non-functional change: move FSP_* macros from fsp0fsp.h to a new file
fsp0types.h. This is needed in order to be able to use FSP_EXTENT_SIZE
in mtr0log.ic.
------------------------------------------------------------------------
r5127 | vasil | 2009-05-26 17:05:43 +0300 (Tue, 26 May 2009) | 9 lines
branches/5.1:
Preparation for the fix of
Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Do not include unnecessary headers mtr0log.h and fut0lst.h in trx0sys.h
and include fsp0fsp.h just before it is needed. This is needed in order
to be able to use TRX_SYS_SPACE in mtr0log.ic.
------------------------------------------------------------------------
r5128 | vasil | 2009-05-26 17:26:37 +0300 (Tue, 26 May 2009) | 7 lines
branches/5.1:
Fix Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Do not write redo log for the pages in the doublewrite buffer. Also, do not
make a dummy change to the page because this is not needed.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5169 | marko | 2009-05-28 03:21:55 -0400 (Thu, 28 May 2009) | 1 line
branches/zip: mtr0mtr.h: Add Doxygen comments for the redo log entry types.
------------------------------------------------------------------------
r5176 | marko | 2009-05-28 07:14:02 -0400 (Thu, 28 May 2009) | 1 line
branches/zip: Correct a debug assertion that was added in r5125.
------------------------------------------------------------------------
r5201 | marko | 2009-06-01 06:35:25 -0400 (Mon, 01 Jun 2009) | 2 lines
branches/zip: Clean up some comments.
Make the rec parameter of mlog_open_and_write_index() const.
------------------------------------------------------------------------
r5234 | marko | 2009-06-03 08:26:41 -0400 (Wed, 03 Jun 2009) | 44 lines
branches/zip: Merge revisions 5148:5233 from branches/5.1:
------------------------------------------------------------------------
r5150 | vasil | 2009-05-27 18:56:03 +0300 (Wed, 27 May 2009) | 4 lines
branches/5.1:
Whitespace fixup.
------------------------------------------------------------------------
r5191 | vasil | 2009-05-30 17:46:05 +0300 (Sat, 30 May 2009) | 19 lines
branches/5.1:
Merge a change from MySQL (this fixes the failing innodb_mysql test):
------------------------------------------------------------
revno: 1810.3894.10
committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
branch nick: mysql-5.0-bugteam
timestamp: Tue 2009-05-19 11:32:21 +0500
message:
Bug#39793 Foreign keys not constructed when column has a '#' in a comment or default value
Internal InnoDN FK parser does not recognize '\'' as quotation symbol.
Suggested fix is to add '\'' symbol check for quotation condition
(dict_strip_comments() function).
modified:
innobase/dict/dict0dict.c
mysql-test/r/innodb_mysql.result
mysql-test/t/innodb_mysql.test
------------------------------------------------------------------------
r5233 | marko | 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) | 11 lines
branches/5.1: Merge the test case from r5232 from branches/5.0:
------------------------------------------------------------------------
r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines
branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565
(Update Query Results in "1 Row Affected" But Should Be "Zero Rows").
Also, add a test case for Bug #40565.
rb://128 approved by Heikki Tuuri
------------------------------------------------------------------------
------------------------------------------------------------------------
------------------------------------------------------------------------
r5250 | marko | 2009-06-04 02:58:23 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Add Doxygen comments to the rest of buf0*.
------------------------------------------------------------------------
r5251 | marko | 2009-06-04 02:59:51 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Replace <= in a function comment.
------------------------------------------------------------------------
r5253 | marko | 2009-06-04 06:37:35 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Add missing Doxygen comments for page0zip.
------------------------------------------------------------------------
r5261 | vasil | 2009-06-05 11:13:31 -0400 (Fri, 05 Jun 2009) | 15 lines
branches/zip:
Fix Mantis Issue#244 fix bug in linear read ahead (no check on access pattern)
The changes are:
1) Take into account access pattern when deciding whether or not to do linear
read ahead.
2) Expose a knob innodb_read_ahead_factor = [0-64] default (8), dynamic,
global to control linear read ahead behvior
3) Disable random read ahead. Keep the code for now.
Submitted by: Inaam (rb://122)
Approved by: Heikki (rb://122)
------------------------------------------------------------------------
r5262 | vasil | 2009-06-05 12:04:25 -0400 (Fri, 05 Jun 2009) | 22 lines
branches/zip:
Enable functionality to have multiple background io helper threads.
This patch is based on percona contributions.
More details about this patch will be written at:
https://svn.innodb.com/innobase/MultipleBackgroundThreads
The patch essentially does the following:
expose following knobs:
innodb_read_io_threads = [1 - 64] default 1
innodb_write_io_threads = [1 - 64] default 1
deprecate innodb_file_io_threads (this parameter was relevant only on windows)
Internally it allows multiple segments for read and write IO request arrays
where one thread works on one segement.
Submitted by: Inaam (rb://124)
Approved by: Heikki (rb://124)
------------------------------------------------------------------------
r5263 | vasil | 2009-06-05 12:19:37 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Whitespace cleanup.
------------------------------------------------------------------------
r5264 | vasil | 2009-06-05 12:26:58 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5261.
------------------------------------------------------------------------
r5265 | vasil | 2009-06-05 12:34:11 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5262.
------------------------------------------------------------------------
r5268 | inaam | 2009-06-08 12:18:21 -0400 (Mon, 08 Jun 2009) | 7 lines
branches/zip
Non functional change:
Added legal notices acknowledging percona contribution to the multiple
IO helper threads patch i.e.: r5262
------------------------------------------------------------------------
r5283 | inaam | 2009-06-09 13:46:29 -0400 (Tue, 09 Jun 2009) | 9 lines
branches/zip
rb://130
Enable Group Commit functionality that was broken in 5.0 when
distributed transactions were introduced.
Reviewed by: Heikki
------------------------------------------------------------------------
r5319 | marko | 2009-06-11 04:40:33 -0400 (Thu, 11 Jun 2009) | 3 lines
branches/zip: Declare os_thread_id_t as unsigned long,
because ulint is wrong on Win64.
Pointed out by Vladislav Vaintroub <wlad@sun.com>.
------------------------------------------------------------------------
r5320 | inaam | 2009-06-11 09:15:41 -0400 (Thu, 11 Jun 2009) | 14 lines
branches/zip rb://131
This patch changes the following defaults:
max_dirty_pages_pct: default from 90 to 75. max allowed from 100 to 99
additional_mem_pool_size: default from 1 to 8 MB
buffer_pool_size: default from 8 to 128 MB
log_buffer_size: default from 1 to 8 MB
read_io_threads/write_io_threads: default from 1 to 4
The log file sizes are untouched because of upgrade issues
Reviewed by: Heikki
------------------------------------------------------------------------
r5330 | marko | 2009-06-16 04:08:59 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: buf_page_get_gen(): Reduce mutex holding time by adjusting
buf_pool->n_pend_unzip while only holding buf_pool_mutex.
------------------------------------------------------------------------
r5331 | marko | 2009-06-16 05:00:48 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: buf_page_get_zip(): Eliminate a buf_page_get_mutex() call.
The function must switch on the block state anyway.
------------------------------------------------------------------------
r5332 | vasil | 2009-06-16 05:03:27 -0400 (Tue, 16 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entries for r5283 and r5320.
------------------------------------------------------------------------
r5333 | marko | 2009-06-16 05:27:46 -0400 (Tue, 16 Jun 2009) | 1 line
branches/zip: buf_page_io_query(): Remove unused function.
------------------------------------------------------------------------
r5335 | marko | 2009-06-16 09:23:10 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: innodb.test: Adjust the tolerance of
innodb_buffer_pool_pages_total for r5320.
------------------------------------------------------------------------
r5342 | marko | 2009-06-17 06:15:32 -0400 (Wed, 17 Jun 2009) | 60 lines
branches/zip: Merge revisions 5233:5341 from branches/5.1:
------------------------------------------------------------------------
r5233 | marko | 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) | 11 lines
branches/5.1: Merge the test case from r5232 from branches/5.0:
------------------------------------------------------------------------
r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines
branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565
(Update Query Results in "1 Row Affected" But Should Be "Zero Rows").
Also, add a test case for Bug #40565.
rb://128 approved by Heikki Tuuri
------------------------------------------------------------------------
------------------------------------------------------------------------
r5243 | sunny | 2009-06-04 03:17:14 +0300 (Thu, 04 Jun 2009) | 14 lines
branches/5.1: When the InnoDB and MySQL data dictionaries go out of sync, before
the bug fix we would assert on missing autoinc columns. With this fix we allow
MySQL to open the table but set the next autoinc value for the column to the
MAX value. This effectively disables the next value generation. INSERTs will
fail with a generic AUTOINC failure. However, the user should be able to
read/dump the table, set the column values explicitly, use ALTER TABLE to
set the next autoinc value and/or sync the two data dictionaries to resume
normal operations.
Fix Bug#44030 Error: (1500) Couldn't read the MAX(ID) autoinc value from the
index (PRIMARY)
rb://118
------------------------------------------------------------------------
r5252 | sunny | 2009-06-04 10:16:24 +0300 (Thu, 04 Jun 2009) | 2 lines
branches/5.1: The version of the result file checked in was broken in r5243.
------------------------------------------------------------------------
r5259 | vasil | 2009-06-05 10:29:16 +0300 (Fri, 05 Jun 2009) | 7 lines
branches/5.1:
Remove the word "Error" from the printout because the mysqltest suite
interprets it as an error and thus the innodb-autoinc test fails.
Approved by: Sunny (via IM)
------------------------------------------------------------------------
r5339 | marko | 2009-06-17 11:01:37 +0300 (Wed, 17 Jun 2009) | 2 lines
branches/5.1: Add missing #include "mtr0log.h" so that the code compiles
with -DUNIV_MUST_NOT_INLINE.
(null merge; this had already been committed in branches/zip)
------------------------------------------------------------------------
r5340 | marko | 2009-06-17 12:11:49 +0300 (Wed, 17 Jun 2009) | 4 lines
branches/5.1: row_unlock_for_mysql(): When the clustered index is unknown,
refuse to unlock the record.
(Bug #45357, caused by the fix of Bug #39320).
rb://132 approved by Sunny Bains.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5343 | vasil | 2009-06-17 08:56:12 -0400 (Wed, 17 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5342.
------------------------------------------------------------------------
r5344 | marko | 2009-06-17 09:03:45 -0400 (Wed, 17 Jun 2009) | 1 line
branches/zip: row_merge_read_rec(): Fix a UNIV_DEBUG bug (Bug #45426)
------------------------------------------------------------------------
r5391 | marko | 2009-06-22 05:31:35 -0400 (Mon, 22 Jun 2009) | 2 lines
branches/zip: buf_page_get_zip(): Fix a bogus warning about
block_mutex being possibly uninitialized.
------------------------------------------------------------------------
r5392 | marko | 2009-06-22 07:58:20 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: ha_innobase::check_if_incompatible_data(): When
ROW_FORMAT=DEFAULT, do not compare to get_row_type().
Without this change, fast index creation will be disabled
in recent versions of MySQL 5.1.
------------------------------------------------------------------------
r5393 | pekka | 2009-06-22 09:27:55 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: Minor changes for Hot Backup to build correctly. (The
code bracketed between #ifdef UNIV_HOTBACKUP and #endif /* UNIV_HOTBACKUP */).
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r5394 | pekka | 2009-06-22 09:46:34 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: Add functions for checking the format of tablespaces
for Hot Backup build (UNIV_HOTBACKUP defined).
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r5397 | calvin | 2009-06-23 16:59:42 -0400 (Tue, 23 Jun 2009) | 7 lines
branches/zip: change the header file path.
Change the header file path from ../storage/innobase/include/
to ../include/. In the planned 5.1 + plugin release, the source
directory of the plugin will not be in storage/innobase.
Approved by: Heikki (IM)
------------------------------------------------------------------------
r5407 | calvin | 2009-06-24 09:51:08 -0400 (Wed, 24 Jun 2009) | 4 lines
branches/zip: remove relative path of header files.
Suggested by Marko.
------------------------------------------------------------------------
r5412 | marko | 2009-06-25 06:27:08 -0400 (Thu, 25 Jun 2009) | 1 line
branches/zip: Replace a DBUG_ASSERT with ut_a to track down Issue #290.
------------------------------------------------------------------------
r5415 | marko | 2009-06-25 06:45:57 -0400 (Thu, 25 Jun 2009) | 3 lines
branches/zip: dict_index_find_cols(): Print diagnostic on name mismatch.
This addresses Bug #44571 but does not fix it.
rb://135 approved by Sunny Bains.
------------------------------------------------------------------------
r5417 | marko | 2009-06-25 08:20:56 -0400 (Thu, 25 Jun 2009) | 1 line
branches/zip: ha_innodb.cc: Move the misplaced Doxygen @file comment.
------------------------------------------------------------------------
r5418 | marko | 2009-06-25 08:55:52 -0400 (Thu, 25 Jun 2009) | 5 lines
branches/zip: Fix a race condition caused by
SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749)
When innodb_commit_concurrency is initially set nonzero,
DEFAULT would change it back to 0, triggering Bug #42101.
rb://139 approved by Heikki Tuuri.
------------------------------------------------------------------------
r5423 | calvin | 2009-06-26 16:52:52 -0400 (Fri, 26 Jun 2009) | 2 lines
branches/zip: Fix typos.
------------------------------------------------------------------------
r5425 | marko | 2009-06-29 04:52:30 -0400 (Mon, 29 Jun 2009) | 4 lines
branches/zip: ha_innobase::add_index(), ha_innobase::final_drop_index():
Start prebuilt->trx before locking the table. This should fix Issue #293
and could fix Issue #229.
Approved by Sunny (over IM).
------------------------------------------------------------------------
r5426 | marko | 2009-06-29 05:24:27 -0400 (Mon, 29 Jun 2009) | 3 lines
branches/zip: buf_page_get_gen(): Fix a race condition when reading
buf_fix_count. This could explain Issue #156.
Tested by Michael.
------------------------------------------------------------------------
r5427 | marko | 2009-06-29 05:54:53 -0400 (Mon, 29 Jun 2009) | 5 lines
branches/zip: lock_print_info_all_transactions(), buf_read_recv_pages():
Tolerate missing tablespaces (zip_size==ULINT_UNDEFINED).
buf_page_get_gen(): Add ut_ad(ut_is_2pow(zip_size)).
Issue #289, rb://136 approved by Sunny Bains
------------------------------------------------------------------------
r5428 | marko | 2009-06-29 07:06:29 -0400 (Mon, 29 Jun 2009) | 2 lines
branches/zip: row_sel_store_mysql_rec(): Add missing pointer cast.
Do not do arithmetics on void pointers.
------------------------------------------------------------------------
r5429 | marko | 2009-06-29 09:49:54 -0400 (Mon, 29 Jun 2009) | 13 lines
branches/zip: Do not crash on SET GLOBAL innodb_file_format=DEFAULT
or SET GLOBAL innodb_file_format_check=DEFAULT.
innodb_file_format.test: New test for innodb_file_format and
innodb_file_format_check.
innodb_file_format_name_validate(): Store the string in *save.
innodb_file_format_name_update(): Check the string again.
innodb_file_format_check_validate(): Store the string in *save.
innodb_file_format_check_update(): Check the string again.
Issue #282, rb://140 approved by Heikki Tuuri
------------------------------------------------------------------------
r5430 | marko | 2009-06-29 09:58:07 -0400 (Mon, 29 Jun 2009) | 2 lines
branches/zip: lock_rec_validate_page(): Add another assertion
to track down Issue #289.
------------------------------------------------------------------------
r5431 | marko | 2009-06-29 09:58:40 -0400 (Mon, 29 Jun 2009) | 1 line
branches/zip: Revert an accidentally made change in r5430 to univ.i.
------------------------------------------------------------------------
r5437 | marko | 2009-06-30 05:10:01 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: ibuf_dummy_index_free(): Beautify the comment.
------------------------------------------------------------------------
r5438 | marko | 2009-06-30 05:10:32 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: fseg_free(): Remove this unused function.
------------------------------------------------------------------------
r5439 | marko | 2009-06-30 05:15:22 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: fseg_validate(): Enclose in #ifdef UNIV_DEBUG.
This function is unused, but it could turn out to be a useful debugging aid.
------------------------------------------------------------------------
r5441 | marko | 2009-06-30 06:30:14 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: ha_delete(): Remove this unused function that was
very similar to ha_search_and_delete_if_found().
------------------------------------------------------------------------
r5442 | marko | 2009-06-30 06:45:41 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: lock_is_on_table(), lock_table_unlock(): Unused, remove.
------------------------------------------------------------------------
r5443 | marko | 2009-06-30 07:03:00 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_event_create_auto(): Unused, remove.
------------------------------------------------------------------------
r5444 | marko | 2009-06-30 07:19:49 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: que_graph_try_free(): Unused, remove.
------------------------------------------------------------------------
r5445 | marko | 2009-06-30 07:28:11 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: row_build_row_ref_from_row(): Unused, remove.
------------------------------------------------------------------------
r5446 | marko | 2009-06-30 07:35:45 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: srv_que_round_robin(), srv_que_task_enqueue(): Unused, remove.
------------------------------------------------------------------------
r5447 | marko | 2009-06-30 07:37:58 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: srv_que_task_queue_check(): Unused, remove.
------------------------------------------------------------------------
r5448 | marko | 2009-06-30 07:56:36 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: mem_heap_cat(): Unused, remove.
------------------------------------------------------------------------
r5449 | marko | 2009-06-30 08:00:50 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: innobase_start_or_create_for_mysql():
Invoke os_get_os_version() at most once.
------------------------------------------------------------------------
r5450 | marko | 2009-06-30 08:02:20 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_file_close_no_error_handling(): Unused, remove.
------------------------------------------------------------------------
r5451 | marko | 2009-06-30 08:09:49 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: page_set_max_trx_id(): Make the code compile
with UNIV_HOTBACKUP.
------------------------------------------------------------------------
r5452 | marko | 2009-06-30 08:10:26 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: os_file_close_no_error_handling(): Restore,
as this function is used within InnoDB Hot Backup.
------------------------------------------------------------------------
r5453 | marko | 2009-06-30 08:14:01 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_process_set_priority_boost(): Unused, remove.
------------------------------------------------------------------------
r5454 | marko | 2009-06-30 08:42:52 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: Replace a non-ASCII character
(ISO 8859-1 encoded U+00AD SOFT HYPHEN) with a cheap ASCII substitute.
------------------------------------------------------------------------
r5456 | inaam | 2009-06-30 14:21:09 -0400 (Tue, 30 Jun 2009) | 4 lines
branches/zip
Non functional change. s/Percona/Percona Inc./
------------------------------------------------------------------------
r5470 | vasil | 2009-07-02 09:12:36 -0400 (Thu, 02 Jul 2009) | 16 lines
branches/zip:
Use PAUSE instruction inside spinloop if it is available.
The patch was originally developed by Mikael Ronstrom <mikael@mysql.com>
and can be found here:
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2768
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2771
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2772
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2774
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2777
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2799
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2800
Approved by: Heikki (rb://137)
------------------------------------------------------------------------
r5481 | vasil | 2009-07-06 13:16:32 -0400 (Mon, 06 Jul 2009) | 4 lines
branches/zip:
Remove unnecessary quotes and simplify plug.in.
------------------------------------------------------------------------
r5482 | calvin | 2009-07-06 18:36:35 -0400 (Mon, 06 Jul 2009) | 5 lines
branches/zip: add COPYING files for Percona and Sun Micro.
1.0.4 contains patches based on contributions from Percona
and Sun Microsystems.
------------------------------------------------------------------------
r5483 | calvin | 2009-07-07 05:36:43 -0400 (Tue, 07 Jul 2009) | 3 lines
branches/zip: add IB_HAVE_PAUSE_INSTRUCTION to CMake.
Windows will support PAUSE instruction by default.
------------------------------------------------------------------------
r5484 | inaam | 2009-07-07 18:57:14 -0400 (Tue, 07 Jul 2009) | 13 lines
branches/zip rb://126
Based on contribution from Google Inc.
This patch introduces a new parameter innodb_io_capacity to control the
rate at which master threads performs various tasks. The default value
is 200 and higher values imply more aggressive flushing and ibuf merges
from within the master thread.
This patch also changes the ibuf merge from synchronous to asynchronous.
Another minor change is not to force the master thread to wait for a
log flush to complete every second.
Approved by: Heikki
------------------------------------------------------------------------
r5485 | inaam | 2009-07-07 19:00:49 -0400 (Tue, 07 Jul 2009) | 18 lines
branches/zip rb://138
The current implementation is to try to flush the neighbors of every
page that we flush. This patch makes the following distinction:
1) If the flush is from flush_list AND
2) If the flush is intended to move the oldest_modification LSN ahead
(this happens when a user thread sees little space in the log file and
attempts to flush pages from the buffer pool so that a checkpoint can
be made)
THEN
Do not try to flush the neighbors. Just focus on flushing dirty pages at
the end of flush_list
Approved by: Heikki
------------------------------------------------------------------------
r5486 | inaam | 2009-07-08 12:11:40 -0400 (Wed, 08 Jul 2009) | 29 lines
branches/zip rb://133
This patch introduces heuristics based flushing rate of dirty pages to
avoid IO bursts at checkpoint.
1) log_capacity / log_generated per second gives us number of seconds
in which ALL dirty pages need to be flushed. Based on this rough
assumption we can say that
n_dirty_pages / (log_capacity / log_generation_rate) = desired_flush_rate
2) We use weighted averages (hard coded to 20 seconds) of
log_generation_rate to avoid resonance.
3) From the desired_flush_rate we subtract the number of pages that have
been flushed due to LRU flushing. That gives us pages that we should
flush as part of flush_list cleanup. And that is the number (capped by
maximum io_capacity) that we try to flush from the master thread.
Knobs:
======
innodb_adaptive_flushing: boolean, global, dynamic, default TRUE.
Since this heuristic is very experimental and has the potential to
dramatically change the IO pattern I think it is a good idea to leave a
knob to turn it off.
Approved by: Heikki
------------------------------------------------------------------------
r5487 | calvin | 2009-07-08 12:42:28 -0400 (Wed, 08 Jul 2009) | 7 lines
branches/zip: fix PAUSE instruction patch on Windows
The original PAUSE instruction patch (r5470) does not
compile on Windows. Also, there is an elegant way of
doing it on Windows - YieldProcessor().
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r5489 | vasil | 2009-07-10 05:02:22 -0400 (Fri, 10 Jul 2009) | 9 lines
branches/zip:
Change the defaults for
innodb_sync_spin_loops: 20 -> 30
innodb_spin_wait_delay: 5 -> 6
This change was proposed by Sun/MySQL based on their performance testing,
see https://svn.innodb.com/innobase/Release_tasks_for_InnoDB_Plugin_V1.0.4
------------------------------------------------------------------------
r5490 | vasil | 2009-07-10 05:04:20 -0400 (Fri, 10 Jul 2009) | 4 lines
branches/zip:
Add ChangeLog entry for 5489.
------------------------------------------------------------------------
r5491 | calvin | 2009-07-10 12:19:17 -0400 (Fri, 10 Jul 2009) | 6 lines
branches/zip: add copyright info to files related to PAUSE
instruction patch, contributed by Sun Microsystems.
------------------------------------------------------------------------
r5492 | calvin | 2009-07-10 17:47:34 -0400 (Fri, 10 Jul 2009) | 5 lines
branches/zip: add ChangeLog entries for r5484-r5486.
------------------------------------------------------------------------
r5494 | vasil | 2009-07-13 03:37:35 -0400 (Mon, 13 Jul 2009) | 6 lines
branches/zip:
Restore the original value of innodb_sync_spin_loops at the end, previously
the test assumed that setting it to 20 will do this, but now the default is
30 and MTR's internal check failed.
------------------------------------------------------------------------
r5495 | inaam | 2009-07-13 11:48:45 -0400 (Mon, 13 Jul 2009) | 5 lines
branches/zip rb://138 (REVERT)
Revert the flush neighbors patch as it shows regression in
the benchmarks run by Michael.
------------------------------------------------------------------------
r5496 | inaam | 2009-07-13 14:04:57 -0400 (Mon, 13 Jul 2009) | 4 lines
branches/zip
Fixed warnings on windows where ulint != ib_uint64_t
------------------------------------------------------------------------
r5497 | calvin | 2009-07-13 15:01:00 -0400 (Mon, 13 Jul 2009) | 9 lines
branches/zip: fix run-time symbols clash on Solaris.
This patch is from Sergey Vojtovich of Sun Microsystems,
to fix run-time symbols clash on Solaris with older C++
compiler:
- when finding out a way to hide symbols, make decision basing
on compiler, not operating system.
- Sun Studio supports __hidden declaration specifier for this
purpose.
------------------------------------------------------------------------
r5498 | vasil | 2009-07-14 03:16:18 -0400 (Tue, 14 Jul 2009) | 92 lines
branches/zip: Merge r5341:5497 from branches/5.1, skipping:
c5419 because it is merge from branches/zip into branches/5.1
c5466 because the source code has been adjusted to match the MySQL
behavior and the innodb-autoinc test does not fail in branches/zip,
if c5466 is merged, then innodb-autoinc starts failing, Sunny suggested
not to merge c5466.
and resolving conflicts in c5410, c5440, c5488:
------------------------------------------------------------------------
r5410 | marko | 2009-06-24 22:26:34 +0300 (Wed, 24 Jun 2009) | 2 lines
Changed paths:
M /branches/5.1/include/trx0sys.ic
M /branches/5.1/trx/trx0purge.c
M /branches/5.1/trx/trx0sys.c
M /branches/5.1/trx/trx0undo.c
branches/5.1: Add missing #include "mtr0log.h" to avoid warnings
when compiling with -DUNIV_MUST_NOT_INLINE.
------------------------------------------------------------------------
r5419 | marko | 2009-06-25 16:11:57 +0300 (Thu, 25 Jun 2009) | 18 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb_bug42101-nonzero.result
M /branches/5.1/mysql-test/innodb_bug42101-nonzero.test
M /branches/5.1/mysql-test/innodb_bug42101.result
M /branches/5.1/mysql-test/innodb_bug42101.test
branches/5.1: Merge r5418 from branches/zip:
------------------------------------------------------------------------
r5418 | marko | 2009-06-25 15:55:52 +0300 (Thu, 25 Jun 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
M /branches/zip/mysql-test/innodb_bug42101.result
M /branches/zip/mysql-test/innodb_bug42101.test
branches/zip: Fix a race condition caused by
SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749)
When innodb_commit_concurrency is initially set nonzero,
DEFAULT would change it back to 0, triggering Bug #42101.
rb://139 approved by Heikki Tuuri.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5440 | vasil | 2009-06-30 13:04:29 +0300 (Tue, 30 Jun 2009) | 8 lines
Changed paths:
M /branches/5.1/fil/fil0fil.c
branches/5.1:
Fix Bug#45814 URL reference in InnoDB server errors needs adjusting to match documentation
by changing the URL from
http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting.html to
http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting-datadict.html
------------------------------------------------------------------------
r5466 | vasil | 2009-07-02 10:46:45 +0300 (Thu, 02 Jul 2009) | 6 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1:
Adjust the failing innodb-autoinc test to conform to the latest behavior
of the MySQL code. The idea and the comment in innodb-autoinc.test come
from Sunny.
------------------------------------------------------------------------
r5488 | vasil | 2009-07-09 19:16:44 +0300 (Thu, 09 Jul 2009) | 13 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug21704.result
A /branches/5.1/mysql-test/innodb_bug21704.test
branches/5.1:
Fix Bug#21704 Renaming column does not update FK definition
by checking whether a column that participates in a FK definition is being
renamed and denying the ALTER in this case.
The patch was originally developed by Davi Arnaut <Davi.Arnaut@Sun.COM>:
http://lists.mysql.com/commits/77714
and was later adjusted to conform to InnoDB coding style by me (Vasil),
I also added some more comments and moved the bug specific mysql-test to
a separate file to make it more manageable and flexible.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5499 | calvin | 2009-07-14 12:55:10 -0400 (Tue, 14 Jul 2009) | 3 lines
branches/zip: add a missing file in Makefile.am
This change was suggested by MySQL.
------------------------------------------------------------------------
r5500 | calvin | 2009-07-14 13:03:26 -0400 (Tue, 14 Jul 2009) | 3 lines
branches/zip: minor change
Remove an extra "with".
------------------------------------------------------------------------
r5501 | vasil | 2009-07-14 13:58:15 -0400 (Tue, 14 Jul 2009) | 5 lines
branches/zip:
Add @ZLIB_INCLUDES@ so that the InnoDB Plugin picks up the same zlib.h
header file that is eventually used by mysqld.
------------------------------------------------------------------------
r5502 | vasil | 2009-07-14 13:59:59 -0400 (Tue, 14 Jul 2009) | 4 lines
branches/zip:
Add include/ut0auxconf.h to noinst_HEADERS
------------------------------------------------------------------------
r5503 | vasil | 2009-07-14 14:16:11 -0400 (Tue, 14 Jul 2009) | 8 lines
branches/zip:
Non-functional change:
put files in noinst_HEADERS and libinnobase_a_SOURCES one per line and sort
alphabetically, so it is easier to find if a file is there or not and
also diffs show exactly the added or removed file instead of surrounding
lines too.
------------------------------------------------------------------------
r5504 | calvin | 2009-07-15 04:58:44 -0400 (Wed, 15 Jul 2009) | 6 lines
branches/zip: fix compile errors on Win64
Both srv_read_ahead_factor and srv_io_capacity should
be defined as ulong.
Approved by: Sunny
------------------------------------------------------------------------
r5508 | calvin | 2009-07-16 09:40:47 -0400 (Thu, 16 Jul 2009) | 16 lines
branches/zip: Support inlining of functions and prefetch with
Sun Studio
Those changes are contributed by Sun/MySQL. Two sets of changes
in this patch when Sun Studio is used:
- Explicit inlining of functions
- Prefetch Support
This patch has been tested by Sunny with the plugin statically
built in. Since we've never built the plugin as a dynamically
loaded module on Solaris, it is a separate task to change
plug.in.
rb://142
Approved by: Heikki
------------------------------------------------------------------------
r5509 | calvin | 2009-07-16 09:45:28 -0400 (Thu, 16 Jul 2009) | 2 lines
branches/zip: add ChangeLog entry for r5508.
------------------------------------------------------------------------
r5512 | sunny | 2009-07-19 19:52:48 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Remove unused extern ref to timed_mutexes.
------------------------------------------------------------------------
r5513 | sunny | 2009-07-19 19:58:43 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Undo r5512
------------------------------------------------------------------------
r5514 | sunny | 2009-07-19 20:08:49 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Only use my_bool when UNIV_HOTBACKUP is not defined.
------------------------------------------------------------------------
r5515 | sunny | 2009-07-20 03:29:14 -0400 (Mon, 20 Jul 2009) | 2 lines
branches/zip: The dict_table_t::autoinc_mutex field is not used in HotBackup.
------------------------------------------------------------------------
r5516 | sunny | 2009-07-20 03:46:05 -0400 (Mon, 20 Jul 2009) | 4 lines
branches/zip: Make this file usable from within HotBackup. A new file has
been introduced called hb_univ.i. This file should have all the HotBackup
specific configuration.
------------------------------------------------------------------------
r5517 | sunny | 2009-07-20 03:55:11 -0400 (Mon, 20 Jul 2009) | 2 lines
Add /* UNIV_HOTBACK */
------------------------------------------------------------------------
r5519 | vasil | 2009-07-20 04:45:18 -0400 (Mon, 20 Jul 2009) | 31 lines
branches/zip: Merge r5497:5518 from branches/5.1:
------------------------------------------------------------------------
r5518 | vasil | 2009-07-20 11:29:47 +0300 (Mon, 20 Jul 2009) | 22 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Merge a change from MySQL:
------------------------------------------------------------
revno: 2874.2.1
committer: Anurag Shekhar <anurag.shekhar@sun.com>
branch nick: mysql-5.1-bugteam-windows-warning
timestamp: Wed 2009-05-13 15:41:24 +0530
message:
Bug #39802 On Windows, 32-bit time_t should be enforced
This patch fixes compilation warning, "conversion from 'time_t' to 'ulong',
possible loss of data".
The fix is to typecast time_t to ulong before assigning it to ulong.
Backported this from 6.0-bugteam tree.
modified:
storage/archive/ha_archive.cc
storage/federated/ha_federated.cc
storage/innobase/handler/ha_innodb.cc
storage/myisam/ha_myisam.cc
------------------------------------------------------------------------
------------------------------------------------------------------------
r5520 | vasil | 2009-07-20 04:51:47 -0400 (Mon, 20 Jul 2009) | 4 lines
branches/zip:
Add ChangeLog entries for r5498 and r5519.
------------------------------------------------------------------------
r5524 | inaam | 2009-07-20 12:23:15 -0400 (Mon, 20 Jul 2009) | 9 lines
branches/zip
Change the read ahead parameter name to innodb_read_ahead_threshold.
Change the meaning of this parameter to signify the number of pages
that must be sequentially accessed for InnoDB to trigger a readahead
request.
Suggested by: Ken
------------------------------------------------------------------------
2009-07-21 02:09:29 +02:00
|
|
|
|
|
|
|
Portions of this file contain modifications contributed and copyrighted
|
|
|
|
by Percona Inc.. Those modifications are
|
|
|
|
gratefully acknowledged and are described briefly in the InnoDB
|
|
|
|
documentation. The contributions by Percona Inc. are incorporated with
|
|
|
|
their permission, and subject to the conditions contained in the file
|
|
|
|
COPYING.Percona.
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify it
|
|
|
|
under the terms of the GNU General Public License as published by the
|
|
|
|
Free Software Foundation; version 2 of the License.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful, but
|
|
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
|
|
|
|
Public License for more details.
|
|
|
|
|
2012-08-01 16:27:34 +02:00
|
|
|
You should have received a copy of the GNU General Public License along with
|
|
|
|
this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
|
branches/innodb+: Merge revisions 5144:5524 from branches/zip
------------------------------------------------------------------------
r5147 | marko | 2009-05-27 06:55:14 -0400 (Wed, 27 May 2009) | 1 line
branches/zip: ibuf0ibuf.c: Improve a comment.
------------------------------------------------------------------------
r5149 | marko | 2009-05-27 07:46:42 -0400 (Wed, 27 May 2009) | 34 lines
branches/zip: Merge revisions 4994:5148 from branches/5.1:
------------------------------------------------------------------------
r5126 | vasil | 2009-05-26 16:57:12 +0300 (Tue, 26 May 2009) | 9 lines
branches/5.1:
Preparation for the fix of
Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Non-functional change: move FSP_* macros from fsp0fsp.h to a new file
fsp0types.h. This is needed in order to be able to use FSP_EXTENT_SIZE
in mtr0log.ic.
------------------------------------------------------------------------
r5127 | vasil | 2009-05-26 17:05:43 +0300 (Tue, 26 May 2009) | 9 lines
branches/5.1:
Preparation for the fix of
Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Do not include unnecessary headers mtr0log.h and fut0lst.h in trx0sys.h
and include fsp0fsp.h just before it is needed. This is needed in order
to be able to use TRX_SYS_SPACE in mtr0log.ic.
------------------------------------------------------------------------
r5128 | vasil | 2009-05-26 17:26:37 +0300 (Tue, 26 May 2009) | 7 lines
branches/5.1:
Fix Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Do not write redo log for the pages in the doublewrite buffer. Also, do not
make a dummy change to the page because this is not needed.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5169 | marko | 2009-05-28 03:21:55 -0400 (Thu, 28 May 2009) | 1 line
branches/zip: mtr0mtr.h: Add Doxygen comments for the redo log entry types.
------------------------------------------------------------------------
r5176 | marko | 2009-05-28 07:14:02 -0400 (Thu, 28 May 2009) | 1 line
branches/zip: Correct a debug assertion that was added in r5125.
------------------------------------------------------------------------
r5201 | marko | 2009-06-01 06:35:25 -0400 (Mon, 01 Jun 2009) | 2 lines
branches/zip: Clean up some comments.
Make the rec parameter of mlog_open_and_write_index() const.
------------------------------------------------------------------------
r5234 | marko | 2009-06-03 08:26:41 -0400 (Wed, 03 Jun 2009) | 44 lines
branches/zip: Merge revisions 5148:5233 from branches/5.1:
------------------------------------------------------------------------
r5150 | vasil | 2009-05-27 18:56:03 +0300 (Wed, 27 May 2009) | 4 lines
branches/5.1:
Whitespace fixup.
------------------------------------------------------------------------
r5191 | vasil | 2009-05-30 17:46:05 +0300 (Sat, 30 May 2009) | 19 lines
branches/5.1:
Merge a change from MySQL (this fixes the failing innodb_mysql test):
------------------------------------------------------------
revno: 1810.3894.10
committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
branch nick: mysql-5.0-bugteam
timestamp: Tue 2009-05-19 11:32:21 +0500
message:
Bug#39793 Foreign keys not constructed when column has a '#' in a comment or default value
Internal InnoDN FK parser does not recognize '\'' as quotation symbol.
Suggested fix is to add '\'' symbol check for quotation condition
(dict_strip_comments() function).
modified:
innobase/dict/dict0dict.c
mysql-test/r/innodb_mysql.result
mysql-test/t/innodb_mysql.test
------------------------------------------------------------------------
r5233 | marko | 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) | 11 lines
branches/5.1: Merge the test case from r5232 from branches/5.0:
------------------------------------------------------------------------
r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines
branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565
(Update Query Results in "1 Row Affected" But Should Be "Zero Rows").
Also, add a test case for Bug #40565.
rb://128 approved by Heikki Tuuri
------------------------------------------------------------------------
------------------------------------------------------------------------
------------------------------------------------------------------------
r5250 | marko | 2009-06-04 02:58:23 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Add Doxygen comments to the rest of buf0*.
------------------------------------------------------------------------
r5251 | marko | 2009-06-04 02:59:51 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Replace <= in a function comment.
------------------------------------------------------------------------
r5253 | marko | 2009-06-04 06:37:35 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Add missing Doxygen comments for page0zip.
------------------------------------------------------------------------
r5261 | vasil | 2009-06-05 11:13:31 -0400 (Fri, 05 Jun 2009) | 15 lines
branches/zip:
Fix Mantis Issue#244 fix bug in linear read ahead (no check on access pattern)
The changes are:
1) Take into account access pattern when deciding whether or not to do linear
read ahead.
2) Expose a knob innodb_read_ahead_factor = [0-64] default (8), dynamic,
global to control linear read ahead behvior
3) Disable random read ahead. Keep the code for now.
Submitted by: Inaam (rb://122)
Approved by: Heikki (rb://122)
------------------------------------------------------------------------
r5262 | vasil | 2009-06-05 12:04:25 -0400 (Fri, 05 Jun 2009) | 22 lines
branches/zip:
Enable functionality to have multiple background io helper threads.
This patch is based on percona contributions.
More details about this patch will be written at:
https://svn.innodb.com/innobase/MultipleBackgroundThreads
The patch essentially does the following:
expose following knobs:
innodb_read_io_threads = [1 - 64] default 1
innodb_write_io_threads = [1 - 64] default 1
deprecate innodb_file_io_threads (this parameter was relevant only on windows)
Internally it allows multiple segments for read and write IO request arrays
where one thread works on one segement.
Submitted by: Inaam (rb://124)
Approved by: Heikki (rb://124)
------------------------------------------------------------------------
r5263 | vasil | 2009-06-05 12:19:37 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Whitespace cleanup.
------------------------------------------------------------------------
r5264 | vasil | 2009-06-05 12:26:58 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5261.
------------------------------------------------------------------------
r5265 | vasil | 2009-06-05 12:34:11 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5262.
------------------------------------------------------------------------
r5268 | inaam | 2009-06-08 12:18:21 -0400 (Mon, 08 Jun 2009) | 7 lines
branches/zip
Non functional change:
Added legal notices acknowledging percona contribution to the multiple
IO helper threads patch i.e.: r5262
------------------------------------------------------------------------
r5283 | inaam | 2009-06-09 13:46:29 -0400 (Tue, 09 Jun 2009) | 9 lines
branches/zip
rb://130
Enable Group Commit functionality that was broken in 5.0 when
distributed transactions were introduced.
Reviewed by: Heikki
------------------------------------------------------------------------
r5319 | marko | 2009-06-11 04:40:33 -0400 (Thu, 11 Jun 2009) | 3 lines
branches/zip: Declare os_thread_id_t as unsigned long,
because ulint is wrong on Win64.
Pointed out by Vladislav Vaintroub <wlad@sun.com>.
------------------------------------------------------------------------
r5320 | inaam | 2009-06-11 09:15:41 -0400 (Thu, 11 Jun 2009) | 14 lines
branches/zip rb://131
This patch changes the following defaults:
max_dirty_pages_pct: default from 90 to 75. max allowed from 100 to 99
additional_mem_pool_size: default from 1 to 8 MB
buffer_pool_size: default from 8 to 128 MB
log_buffer_size: default from 1 to 8 MB
read_io_threads/write_io_threads: default from 1 to 4
The log file sizes are untouched because of upgrade issues
Reviewed by: Heikki
------------------------------------------------------------------------
r5330 | marko | 2009-06-16 04:08:59 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: buf_page_get_gen(): Reduce mutex holding time by adjusting
buf_pool->n_pend_unzip while only holding buf_pool_mutex.
------------------------------------------------------------------------
r5331 | marko | 2009-06-16 05:00:48 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: buf_page_get_zip(): Eliminate a buf_page_get_mutex() call.
The function must switch on the block state anyway.
------------------------------------------------------------------------
r5332 | vasil | 2009-06-16 05:03:27 -0400 (Tue, 16 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entries for r5283 and r5320.
------------------------------------------------------------------------
r5333 | marko | 2009-06-16 05:27:46 -0400 (Tue, 16 Jun 2009) | 1 line
branches/zip: buf_page_io_query(): Remove unused function.
------------------------------------------------------------------------
r5335 | marko | 2009-06-16 09:23:10 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: innodb.test: Adjust the tolerance of
innodb_buffer_pool_pages_total for r5320.
------------------------------------------------------------------------
r5342 | marko | 2009-06-17 06:15:32 -0400 (Wed, 17 Jun 2009) | 60 lines
branches/zip: Merge revisions 5233:5341 from branches/5.1:
------------------------------------------------------------------------
r5233 | marko | 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) | 11 lines
branches/5.1: Merge the test case from r5232 from branches/5.0:
------------------------------------------------------------------------
r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines
branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565
(Update Query Results in "1 Row Affected" But Should Be "Zero Rows").
Also, add a test case for Bug #40565.
rb://128 approved by Heikki Tuuri
------------------------------------------------------------------------
------------------------------------------------------------------------
r5243 | sunny | 2009-06-04 03:17:14 +0300 (Thu, 04 Jun 2009) | 14 lines
branches/5.1: When the InnoDB and MySQL data dictionaries go out of sync, before
the bug fix we would assert on missing autoinc columns. With this fix we allow
MySQL to open the table but set the next autoinc value for the column to the
MAX value. This effectively disables the next value generation. INSERTs will
fail with a generic AUTOINC failure. However, the user should be able to
read/dump the table, set the column values explicitly, use ALTER TABLE to
set the next autoinc value and/or sync the two data dictionaries to resume
normal operations.
Fix Bug#44030 Error: (1500) Couldn't read the MAX(ID) autoinc value from the
index (PRIMARY)
rb://118
------------------------------------------------------------------------
r5252 | sunny | 2009-06-04 10:16:24 +0300 (Thu, 04 Jun 2009) | 2 lines
branches/5.1: The version of the result file checked in was broken in r5243.
------------------------------------------------------------------------
r5259 | vasil | 2009-06-05 10:29:16 +0300 (Fri, 05 Jun 2009) | 7 lines
branches/5.1:
Remove the word "Error" from the printout because the mysqltest suite
interprets it as an error and thus the innodb-autoinc test fails.
Approved by: Sunny (via IM)
------------------------------------------------------------------------
r5339 | marko | 2009-06-17 11:01:37 +0300 (Wed, 17 Jun 2009) | 2 lines
branches/5.1: Add missing #include "mtr0log.h" so that the code compiles
with -DUNIV_MUST_NOT_INLINE.
(null merge; this had already been committed in branches/zip)
------------------------------------------------------------------------
r5340 | marko | 2009-06-17 12:11:49 +0300 (Wed, 17 Jun 2009) | 4 lines
branches/5.1: row_unlock_for_mysql(): When the clustered index is unknown,
refuse to unlock the record.
(Bug #45357, caused by the fix of Bug #39320).
rb://132 approved by Sunny Bains.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5343 | vasil | 2009-06-17 08:56:12 -0400 (Wed, 17 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5342.
------------------------------------------------------------------------
r5344 | marko | 2009-06-17 09:03:45 -0400 (Wed, 17 Jun 2009) | 1 line
branches/zip: row_merge_read_rec(): Fix a UNIV_DEBUG bug (Bug #45426)
------------------------------------------------------------------------
r5391 | marko | 2009-06-22 05:31:35 -0400 (Mon, 22 Jun 2009) | 2 lines
branches/zip: buf_page_get_zip(): Fix a bogus warning about
block_mutex being possibly uninitialized.
------------------------------------------------------------------------
r5392 | marko | 2009-06-22 07:58:20 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: ha_innobase::check_if_incompatible_data(): When
ROW_FORMAT=DEFAULT, do not compare to get_row_type().
Without this change, fast index creation will be disabled
in recent versions of MySQL 5.1.
------------------------------------------------------------------------
r5393 | pekka | 2009-06-22 09:27:55 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: Minor changes for Hot Backup to build correctly. (The
code bracketed between #ifdef UNIV_HOTBACKUP and #endif /* UNIV_HOTBACKUP */).
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r5394 | pekka | 2009-06-22 09:46:34 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: Add functions for checking the format of tablespaces
for Hot Backup build (UNIV_HOTBACKUP defined).
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r5397 | calvin | 2009-06-23 16:59:42 -0400 (Tue, 23 Jun 2009) | 7 lines
branches/zip: change the header file path.
Change the header file path from ../storage/innobase/include/
to ../include/. In the planned 5.1 + plugin release, the source
directory of the plugin will not be in storage/innobase.
Approved by: Heikki (IM)
------------------------------------------------------------------------
r5407 | calvin | 2009-06-24 09:51:08 -0400 (Wed, 24 Jun 2009) | 4 lines
branches/zip: remove relative path of header files.
Suggested by Marko.
------------------------------------------------------------------------
r5412 | marko | 2009-06-25 06:27:08 -0400 (Thu, 25 Jun 2009) | 1 line
branches/zip: Replace a DBUG_ASSERT with ut_a to track down Issue #290.
------------------------------------------------------------------------
r5415 | marko | 2009-06-25 06:45:57 -0400 (Thu, 25 Jun 2009) | 3 lines
branches/zip: dict_index_find_cols(): Print diagnostic on name mismatch.
This addresses Bug #44571 but does not fix it.
rb://135 approved by Sunny Bains.
------------------------------------------------------------------------
r5417 | marko | 2009-06-25 08:20:56 -0400 (Thu, 25 Jun 2009) | 1 line
branches/zip: ha_innodb.cc: Move the misplaced Doxygen @file comment.
------------------------------------------------------------------------
r5418 | marko | 2009-06-25 08:55:52 -0400 (Thu, 25 Jun 2009) | 5 lines
branches/zip: Fix a race condition caused by
SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749)
When innodb_commit_concurrency is initially set nonzero,
DEFAULT would change it back to 0, triggering Bug #42101.
rb://139 approved by Heikki Tuuri.
------------------------------------------------------------------------
r5423 | calvin | 2009-06-26 16:52:52 -0400 (Fri, 26 Jun 2009) | 2 lines
branches/zip: Fix typos.
------------------------------------------------------------------------
r5425 | marko | 2009-06-29 04:52:30 -0400 (Mon, 29 Jun 2009) | 4 lines
branches/zip: ha_innobase::add_index(), ha_innobase::final_drop_index():
Start prebuilt->trx before locking the table. This should fix Issue #293
and could fix Issue #229.
Approved by Sunny (over IM).
------------------------------------------------------------------------
r5426 | marko | 2009-06-29 05:24:27 -0400 (Mon, 29 Jun 2009) | 3 lines
branches/zip: buf_page_get_gen(): Fix a race condition when reading
buf_fix_count. This could explain Issue #156.
Tested by Michael.
------------------------------------------------------------------------
r5427 | marko | 2009-06-29 05:54:53 -0400 (Mon, 29 Jun 2009) | 5 lines
branches/zip: lock_print_info_all_transactions(), buf_read_recv_pages():
Tolerate missing tablespaces (zip_size==ULINT_UNDEFINED).
buf_page_get_gen(): Add ut_ad(ut_is_2pow(zip_size)).
Issue #289, rb://136 approved by Sunny Bains
------------------------------------------------------------------------
r5428 | marko | 2009-06-29 07:06:29 -0400 (Mon, 29 Jun 2009) | 2 lines
branches/zip: row_sel_store_mysql_rec(): Add missing pointer cast.
Do not do arithmetics on void pointers.
------------------------------------------------------------------------
r5429 | marko | 2009-06-29 09:49:54 -0400 (Mon, 29 Jun 2009) | 13 lines
branches/zip: Do not crash on SET GLOBAL innodb_file_format=DEFAULT
or SET GLOBAL innodb_file_format_check=DEFAULT.
innodb_file_format.test: New test for innodb_file_format and
innodb_file_format_check.
innodb_file_format_name_validate(): Store the string in *save.
innodb_file_format_name_update(): Check the string again.
innodb_file_format_check_validate(): Store the string in *save.
innodb_file_format_check_update(): Check the string again.
Issue #282, rb://140 approved by Heikki Tuuri
------------------------------------------------------------------------
r5430 | marko | 2009-06-29 09:58:07 -0400 (Mon, 29 Jun 2009) | 2 lines
branches/zip: lock_rec_validate_page(): Add another assertion
to track down Issue #289.
------------------------------------------------------------------------
r5431 | marko | 2009-06-29 09:58:40 -0400 (Mon, 29 Jun 2009) | 1 line
branches/zip: Revert an accidentally made change in r5430 to univ.i.
------------------------------------------------------------------------
r5437 | marko | 2009-06-30 05:10:01 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: ibuf_dummy_index_free(): Beautify the comment.
------------------------------------------------------------------------
r5438 | marko | 2009-06-30 05:10:32 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: fseg_free(): Remove this unused function.
------------------------------------------------------------------------
r5439 | marko | 2009-06-30 05:15:22 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: fseg_validate(): Enclose in #ifdef UNIV_DEBUG.
This function is unused, but it could turn out to be a useful debugging aid.
------------------------------------------------------------------------
r5441 | marko | 2009-06-30 06:30:14 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: ha_delete(): Remove this unused function that was
very similar to ha_search_and_delete_if_found().
------------------------------------------------------------------------
r5442 | marko | 2009-06-30 06:45:41 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: lock_is_on_table(), lock_table_unlock(): Unused, remove.
------------------------------------------------------------------------
r5443 | marko | 2009-06-30 07:03:00 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_event_create_auto(): Unused, remove.
------------------------------------------------------------------------
r5444 | marko | 2009-06-30 07:19:49 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: que_graph_try_free(): Unused, remove.
------------------------------------------------------------------------
r5445 | marko | 2009-06-30 07:28:11 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: row_build_row_ref_from_row(): Unused, remove.
------------------------------------------------------------------------
r5446 | marko | 2009-06-30 07:35:45 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: srv_que_round_robin(), srv_que_task_enqueue(): Unused, remove.
------------------------------------------------------------------------
r5447 | marko | 2009-06-30 07:37:58 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: srv_que_task_queue_check(): Unused, remove.
------------------------------------------------------------------------
r5448 | marko | 2009-06-30 07:56:36 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: mem_heap_cat(): Unused, remove.
------------------------------------------------------------------------
r5449 | marko | 2009-06-30 08:00:50 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: innobase_start_or_create_for_mysql():
Invoke os_get_os_version() at most once.
------------------------------------------------------------------------
r5450 | marko | 2009-06-30 08:02:20 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_file_close_no_error_handling(): Unused, remove.
------------------------------------------------------------------------
r5451 | marko | 2009-06-30 08:09:49 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: page_set_max_trx_id(): Make the code compile
with UNIV_HOTBACKUP.
------------------------------------------------------------------------
r5452 | marko | 2009-06-30 08:10:26 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: os_file_close_no_error_handling(): Restore,
as this function is used within InnoDB Hot Backup.
------------------------------------------------------------------------
r5453 | marko | 2009-06-30 08:14:01 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_process_set_priority_boost(): Unused, remove.
------------------------------------------------------------------------
r5454 | marko | 2009-06-30 08:42:52 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: Replace a non-ASCII character
(ISO 8859-1 encoded U+00AD SOFT HYPHEN) with a cheap ASCII substitute.
------------------------------------------------------------------------
r5456 | inaam | 2009-06-30 14:21:09 -0400 (Tue, 30 Jun 2009) | 4 lines
branches/zip
Non functional change. s/Percona/Percona Inc./
------------------------------------------------------------------------
r5470 | vasil | 2009-07-02 09:12:36 -0400 (Thu, 02 Jul 2009) | 16 lines
branches/zip:
Use PAUSE instruction inside spinloop if it is available.
The patch was originally developed by Mikael Ronstrom <mikael@mysql.com>
and can be found here:
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2768
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2771
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2772
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2774
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2777
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2799
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2800
Approved by: Heikki (rb://137)
------------------------------------------------------------------------
r5481 | vasil | 2009-07-06 13:16:32 -0400 (Mon, 06 Jul 2009) | 4 lines
branches/zip:
Remove unnecessary quotes and simplify plug.in.
------------------------------------------------------------------------
r5482 | calvin | 2009-07-06 18:36:35 -0400 (Mon, 06 Jul 2009) | 5 lines
branches/zip: add COPYING files for Percona and Sun Micro.
1.0.4 contains patches based on contributions from Percona
and Sun Microsystems.
------------------------------------------------------------------------
r5483 | calvin | 2009-07-07 05:36:43 -0400 (Tue, 07 Jul 2009) | 3 lines
branches/zip: add IB_HAVE_PAUSE_INSTRUCTION to CMake.
Windows will support PAUSE instruction by default.
------------------------------------------------------------------------
r5484 | inaam | 2009-07-07 18:57:14 -0400 (Tue, 07 Jul 2009) | 13 lines
branches/zip rb://126
Based on contribution from Google Inc.
This patch introduces a new parameter innodb_io_capacity to control the
rate at which master threads performs various tasks. The default value
is 200 and higher values imply more aggressive flushing and ibuf merges
from within the master thread.
This patch also changes the ibuf merge from synchronous to asynchronous.
Another minor change is not to force the master thread to wait for a
log flush to complete every second.
Approved by: Heikki
------------------------------------------------------------------------
r5485 | inaam | 2009-07-07 19:00:49 -0400 (Tue, 07 Jul 2009) | 18 lines
branches/zip rb://138
The current implementation is to try to flush the neighbors of every
page that we flush. This patch makes the following distinction:
1) If the flush is from flush_list AND
2) If the flush is intended to move the oldest_modification LSN ahead
(this happens when a user thread sees little space in the log file and
attempts to flush pages from the buffer pool so that a checkpoint can
be made)
THEN
Do not try to flush the neighbors. Just focus on flushing dirty pages at
the end of flush_list
Approved by: Heikki
------------------------------------------------------------------------
r5486 | inaam | 2009-07-08 12:11:40 -0400 (Wed, 08 Jul 2009) | 29 lines
branches/zip rb://133
This patch introduces heuristics based flushing rate of dirty pages to
avoid IO bursts at checkpoint.
1) log_capacity / log_generated per second gives us number of seconds
in which ALL dirty pages need to be flushed. Based on this rough
assumption we can say that
n_dirty_pages / (log_capacity / log_generation_rate) = desired_flush_rate
2) We use weighted averages (hard coded to 20 seconds) of
log_generation_rate to avoid resonance.
3) From the desired_flush_rate we subtract the number of pages that have
been flushed due to LRU flushing. That gives us pages that we should
flush as part of flush_list cleanup. And that is the number (capped by
maximum io_capacity) that we try to flush from the master thread.
Knobs:
======
innodb_adaptive_flushing: boolean, global, dynamic, default TRUE.
Since this heuristic is very experimental and has the potential to
dramatically change the IO pattern I think it is a good idea to leave a
knob to turn it off.
Approved by: Heikki
------------------------------------------------------------------------
r5487 | calvin | 2009-07-08 12:42:28 -0400 (Wed, 08 Jul 2009) | 7 lines
branches/zip: fix PAUSE instruction patch on Windows
The original PAUSE instruction patch (r5470) does not
compile on Windows. Also, there is an elegant way of
doing it on Windows - YieldProcessor().
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r5489 | vasil | 2009-07-10 05:02:22 -0400 (Fri, 10 Jul 2009) | 9 lines
branches/zip:
Change the defaults for
innodb_sync_spin_loops: 20 -> 30
innodb_spin_wait_delay: 5 -> 6
This change was proposed by Sun/MySQL based on their performance testing,
see https://svn.innodb.com/innobase/Release_tasks_for_InnoDB_Plugin_V1.0.4
------------------------------------------------------------------------
r5490 | vasil | 2009-07-10 05:04:20 -0400 (Fri, 10 Jul 2009) | 4 lines
branches/zip:
Add ChangeLog entry for 5489.
------------------------------------------------------------------------
r5491 | calvin | 2009-07-10 12:19:17 -0400 (Fri, 10 Jul 2009) | 6 lines
branches/zip: add copyright info to files related to PAUSE
instruction patch, contributed by Sun Microsystems.
------------------------------------------------------------------------
r5492 | calvin | 2009-07-10 17:47:34 -0400 (Fri, 10 Jul 2009) | 5 lines
branches/zip: add ChangeLog entries for r5484-r5486.
------------------------------------------------------------------------
r5494 | vasil | 2009-07-13 03:37:35 -0400 (Mon, 13 Jul 2009) | 6 lines
branches/zip:
Restore the original value of innodb_sync_spin_loops at the end, previously
the test assumed that setting it to 20 will do this, but now the default is
30 and MTR's internal check failed.
------------------------------------------------------------------------
r5495 | inaam | 2009-07-13 11:48:45 -0400 (Mon, 13 Jul 2009) | 5 lines
branches/zip rb://138 (REVERT)
Revert the flush neighbors patch as it shows regression in
the benchmarks run by Michael.
------------------------------------------------------------------------
r5496 | inaam | 2009-07-13 14:04:57 -0400 (Mon, 13 Jul 2009) | 4 lines
branches/zip
Fixed warnings on windows where ulint != ib_uint64_t
------------------------------------------------------------------------
r5497 | calvin | 2009-07-13 15:01:00 -0400 (Mon, 13 Jul 2009) | 9 lines
branches/zip: fix run-time symbols clash on Solaris.
This patch is from Sergey Vojtovich of Sun Microsystems,
to fix run-time symbols clash on Solaris with older C++
compiler:
- when finding out a way to hide symbols, make decision basing
on compiler, not operating system.
- Sun Studio supports __hidden declaration specifier for this
purpose.
------------------------------------------------------------------------
r5498 | vasil | 2009-07-14 03:16:18 -0400 (Tue, 14 Jul 2009) | 92 lines
branches/zip: Merge r5341:5497 from branches/5.1, skipping:
c5419 because it is merge from branches/zip into branches/5.1
c5466 because the source code has been adjusted to match the MySQL
behavior and the innodb-autoinc test does not fail in branches/zip,
if c5466 is merged, then innodb-autoinc starts failing, Sunny suggested
not to merge c5466.
and resolving conflicts in c5410, c5440, c5488:
------------------------------------------------------------------------
r5410 | marko | 2009-06-24 22:26:34 +0300 (Wed, 24 Jun 2009) | 2 lines
Changed paths:
M /branches/5.1/include/trx0sys.ic
M /branches/5.1/trx/trx0purge.c
M /branches/5.1/trx/trx0sys.c
M /branches/5.1/trx/trx0undo.c
branches/5.1: Add missing #include "mtr0log.h" to avoid warnings
when compiling with -DUNIV_MUST_NOT_INLINE.
------------------------------------------------------------------------
r5419 | marko | 2009-06-25 16:11:57 +0300 (Thu, 25 Jun 2009) | 18 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb_bug42101-nonzero.result
M /branches/5.1/mysql-test/innodb_bug42101-nonzero.test
M /branches/5.1/mysql-test/innodb_bug42101.result
M /branches/5.1/mysql-test/innodb_bug42101.test
branches/5.1: Merge r5418 from branches/zip:
------------------------------------------------------------------------
r5418 | marko | 2009-06-25 15:55:52 +0300 (Thu, 25 Jun 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
M /branches/zip/mysql-test/innodb_bug42101.result
M /branches/zip/mysql-test/innodb_bug42101.test
branches/zip: Fix a race condition caused by
SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749)
When innodb_commit_concurrency is initially set nonzero,
DEFAULT would change it back to 0, triggering Bug #42101.
rb://139 approved by Heikki Tuuri.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5440 | vasil | 2009-06-30 13:04:29 +0300 (Tue, 30 Jun 2009) | 8 lines
Changed paths:
M /branches/5.1/fil/fil0fil.c
branches/5.1:
Fix Bug#45814 URL reference in InnoDB server errors needs adjusting to match documentation
by changing the URL from
http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting.html to
http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting-datadict.html
------------------------------------------------------------------------
r5466 | vasil | 2009-07-02 10:46:45 +0300 (Thu, 02 Jul 2009) | 6 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1:
Adjust the failing innodb-autoinc test to conform to the latest behavior
of the MySQL code. The idea and the comment in innodb-autoinc.test come
from Sunny.
------------------------------------------------------------------------
r5488 | vasil | 2009-07-09 19:16:44 +0300 (Thu, 09 Jul 2009) | 13 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug21704.result
A /branches/5.1/mysql-test/innodb_bug21704.test
branches/5.1:
Fix Bug#21704 Renaming column does not update FK definition
by checking whether a column that participates in a FK definition is being
renamed and denying the ALTER in this case.
The patch was originally developed by Davi Arnaut <Davi.Arnaut@Sun.COM>:
http://lists.mysql.com/commits/77714
and was later adjusted to conform to InnoDB coding style by me (Vasil),
I also added some more comments and moved the bug specific mysql-test to
a separate file to make it more manageable and flexible.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5499 | calvin | 2009-07-14 12:55:10 -0400 (Tue, 14 Jul 2009) | 3 lines
branches/zip: add a missing file in Makefile.am
This change was suggested by MySQL.
------------------------------------------------------------------------
r5500 | calvin | 2009-07-14 13:03:26 -0400 (Tue, 14 Jul 2009) | 3 lines
branches/zip: minor change
Remove an extra "with".
------------------------------------------------------------------------
r5501 | vasil | 2009-07-14 13:58:15 -0400 (Tue, 14 Jul 2009) | 5 lines
branches/zip:
Add @ZLIB_INCLUDES@ so that the InnoDB Plugin picks up the same zlib.h
header file that is eventually used by mysqld.
------------------------------------------------------------------------
r5502 | vasil | 2009-07-14 13:59:59 -0400 (Tue, 14 Jul 2009) | 4 lines
branches/zip:
Add include/ut0auxconf.h to noinst_HEADERS
------------------------------------------------------------------------
r5503 | vasil | 2009-07-14 14:16:11 -0400 (Tue, 14 Jul 2009) | 8 lines
branches/zip:
Non-functional change:
put files in noinst_HEADERS and libinnobase_a_SOURCES one per line and sort
alphabetically, so it is easier to find if a file is there or not and
also diffs show exactly the added or removed file instead of surrounding
lines too.
------------------------------------------------------------------------
r5504 | calvin | 2009-07-15 04:58:44 -0400 (Wed, 15 Jul 2009) | 6 lines
branches/zip: fix compile errors on Win64
Both srv_read_ahead_factor and srv_io_capacity should
be defined as ulong.
Approved by: Sunny
------------------------------------------------------------------------
r5508 | calvin | 2009-07-16 09:40:47 -0400 (Thu, 16 Jul 2009) | 16 lines
branches/zip: Support inlining of functions and prefetch with
Sun Studio
Those changes are contributed by Sun/MySQL. Two sets of changes
in this patch when Sun Studio is used:
- Explicit inlining of functions
- Prefetch Support
This patch has been tested by Sunny with the plugin statically
built in. Since we've never built the plugin as a dynamically
loaded module on Solaris, it is a separate task to change
plug.in.
rb://142
Approved by: Heikki
------------------------------------------------------------------------
r5509 | calvin | 2009-07-16 09:45:28 -0400 (Thu, 16 Jul 2009) | 2 lines
branches/zip: add ChangeLog entry for r5508.
------------------------------------------------------------------------
r5512 | sunny | 2009-07-19 19:52:48 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Remove unused extern ref to timed_mutexes.
------------------------------------------------------------------------
r5513 | sunny | 2009-07-19 19:58:43 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Undo r5512
------------------------------------------------------------------------
r5514 | sunny | 2009-07-19 20:08:49 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Only use my_bool when UNIV_HOTBACKUP is not defined.
------------------------------------------------------------------------
r5515 | sunny | 2009-07-20 03:29:14 -0400 (Mon, 20 Jul 2009) | 2 lines
branches/zip: The dict_table_t::autoinc_mutex field is not used in HotBackup.
------------------------------------------------------------------------
r5516 | sunny | 2009-07-20 03:46:05 -0400 (Mon, 20 Jul 2009) | 4 lines
branches/zip: Make this file usable from within HotBackup. A new file has
been introduced called hb_univ.i. This file should have all the HotBackup
specific configuration.
------------------------------------------------------------------------
r5517 | sunny | 2009-07-20 03:55:11 -0400 (Mon, 20 Jul 2009) | 2 lines
Add /* UNIV_HOTBACK */
------------------------------------------------------------------------
r5519 | vasil | 2009-07-20 04:45:18 -0400 (Mon, 20 Jul 2009) | 31 lines
branches/zip: Merge r5497:5518 from branches/5.1:
------------------------------------------------------------------------
r5518 | vasil | 2009-07-20 11:29:47 +0300 (Mon, 20 Jul 2009) | 22 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Merge a change from MySQL:
------------------------------------------------------------
revno: 2874.2.1
committer: Anurag Shekhar <anurag.shekhar@sun.com>
branch nick: mysql-5.1-bugteam-windows-warning
timestamp: Wed 2009-05-13 15:41:24 +0530
message:
Bug #39802 On Windows, 32-bit time_t should be enforced
This patch fixes compilation warning, "conversion from 'time_t' to 'ulong',
possible loss of data".
The fix is to typecast time_t to ulong before assigning it to ulong.
Backported this from 6.0-bugteam tree.
modified:
storage/archive/ha_archive.cc
storage/federated/ha_federated.cc
storage/innobase/handler/ha_innodb.cc
storage/myisam/ha_myisam.cc
------------------------------------------------------------------------
------------------------------------------------------------------------
r5520 | vasil | 2009-07-20 04:51:47 -0400 (Mon, 20 Jul 2009) | 4 lines
branches/zip:
Add ChangeLog entries for r5498 and r5519.
------------------------------------------------------------------------
r5524 | inaam | 2009-07-20 12:23:15 -0400 (Mon, 20 Jul 2009) | 9 lines
branches/zip
Change the read ahead parameter name to innodb_read_ahead_threshold.
Change the meaning of this parameter to signify the number of pages
that must be sequentially accessed for InnoDB to trigger a readahead
request.
Suggested by: Ken
------------------------------------------------------------------------
2009-07-21 02:09:29 +02:00
|
|
|
|
|
|
|
***********************************************************************/
|
branches/innodb+: Merge revisions 4150:4528 from branches/zip:
------------------------------------------------------------------------
r4152 | marko | 2009-02-10 12:52:27 +0200 (Tue, 10 Feb 2009) | 12 lines
branches/zip: When innodb_use_sys_malloc is set, ignore
innodb_additional_mem_pool_size, because nothing will
be allocated from mem_comm_pool.
mem_pool_create(): Remove the assertion about size. The function will
work with any size. However, an assertion would fail in ut_malloc_low()
when size==0.
mem_init(): When srv_use_sys_malloc is set, pass size=1 to mem_pool_create().
mem0mem.c: Add #include "srv0srv.h" that is needed by mem0dbg.c.
------------------------------------------------------------------------
r4153 | vasil | 2009-02-10 22:58:17 +0200 (Tue, 10 Feb 2009) | 14 lines
branches/zip:
(followup to r4145) Non-functional change:
Change the os_atomic_increment() and os_compare_and_swap() functions
to macros to avoid artificial limitations on the types of those
functions' arguments. As a consequence typecasts from the source
code can be removed.
Also remove Google's copyright from os0sync.ic because that file no longer
contains code from Google.
Approved by: Marko (rb://88), also ok from Inaam via IM
------------------------------------------------------------------------
r4163 | marko | 2009-02-12 00:14:19 +0200 (Thu, 12 Feb 2009) | 4 lines
branches/zip: Make innodb_thread_concurrency=0 the default.
The old default was 8.
------------------------------------------------------------------------
r4169 | calvin | 2009-02-12 10:37:10 +0200 (Thu, 12 Feb 2009) | 3 lines
branches/zip: Adjust the result file of innodb_thread_concurrency_basic
test. The default value of innodb_thread_concurrency is changed to 0
(from 8) via r4163.
------------------------------------------------------------------------
r4174 | vasil | 2009-02-12 17:38:27 +0200 (Thu, 12 Feb 2009) | 4 lines
branches/zip:
Fix pathname of the file to patch.
------------------------------------------------------------------------
r4176 | vasil | 2009-02-13 10:06:31 +0200 (Fri, 13 Feb 2009) | 7 lines
branches/zip:
Fix the failing mysql-test partition_innodb, which failed only if run after
innodb_trx_weight (or other test that would leave LATEST DEADLOCK ERROR into
the output of SHOW ENGINE INNODB STATUS). Find further explanation for the
failure at the top of the added patch partition_innodb.diff.
------------------------------------------------------------------------
r4198 | vasil | 2009-02-17 09:06:07 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
Add the full text of the GPLv2 license into the root directory of the
plugin. In previous releases this file was copied from an external source
(https://svn.innodb.com/svn/plugin/trunk/support/COPYING) "manually" when
creating the source and binary archives. It is less confusing to have this
present in the root directory of the SVN branch.
------------------------------------------------------------------------
r4199 | vasil | 2009-02-17 09:11:58 +0200 (Tue, 17 Feb 2009) | 4 lines
branches/zip:
Add Google's license into COPYING.Google.
------------------------------------------------------------------------
r4200 | vasil | 2009-02-17 09:56:33 +0200 (Tue, 17 Feb 2009) | 11 lines
branches/zip:
To the files touched by the Google patch from c4144 (excluding
include/os0sync.ic because later we removed Google code from that file):
* Remove the Google license
* Remove old Innobase copyright lines
* Add a reference to the Google license and to the GPLv2 license at the top,
as recommended by the lawyers at Oracle Legal.
------------------------------------------------------------------------
r4201 | vasil | 2009-02-17 10:12:02 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 1/28]
------------------------------------------------------------------------
r4202 | vasil | 2009-02-17 10:15:06 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 2/28]
------------------------------------------------------------------------
r4203 | vasil | 2009-02-17 10:25:45 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 3/28]
------------------------------------------------------------------------
r4204 | vasil | 2009-02-17 10:55:41 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 4/28]
------------------------------------------------------------------------
r4205 | vasil | 2009-02-17 10:59:22 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 5/28]
------------------------------------------------------------------------
r4206 | vasil | 2009-02-17 11:02:27 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 6/28]
------------------------------------------------------------------------
r4207 | vasil | 2009-02-17 11:04:28 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 7/28]
------------------------------------------------------------------------
r4208 | vasil | 2009-02-17 11:06:49 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 8/28]
------------------------------------------------------------------------
r4209 | vasil | 2009-02-17 11:10:18 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 9/28]
------------------------------------------------------------------------
r4210 | vasil | 2009-02-17 11:12:41 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 10/28]
------------------------------------------------------------------------
r4211 | vasil | 2009-02-17 11:14:40 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 11/28]
------------------------------------------------------------------------
r4212 | vasil | 2009-02-17 11:18:35 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 12/28]
------------------------------------------------------------------------
r4213 | vasil | 2009-02-17 11:24:40 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 13/28]
------------------------------------------------------------------------
r4214 | vasil | 2009-02-17 11:27:31 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 13/28]
------------------------------------------------------------------------
r4215 | vasil | 2009-02-17 11:29:55 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 15/28]
------------------------------------------------------------------------
r4216 | vasil | 2009-02-17 11:33:38 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 16/28]
------------------------------------------------------------------------
r4217 | vasil | 2009-02-17 11:36:44 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 17/28]
------------------------------------------------------------------------
r4218 | vasil | 2009-02-17 11:39:11 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 18/28]
------------------------------------------------------------------------
r4219 | vasil | 2009-02-17 11:41:24 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 19/28]
------------------------------------------------------------------------
r4220 | vasil | 2009-02-17 11:43:50 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 20/28]
------------------------------------------------------------------------
r4221 | vasil | 2009-02-17 11:46:52 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 21/28]
------------------------------------------------------------------------
r4222 | vasil | 2009-02-17 11:50:12 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 22/28]
------------------------------------------------------------------------
r4223 | vasil | 2009-02-17 11:53:58 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 23/28]
------------------------------------------------------------------------
r4224 | vasil | 2009-02-17 12:01:41 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 24/28]
------------------------------------------------------------------------
r4225 | vasil | 2009-02-17 12:05:45 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 25/28]
------------------------------------------------------------------------
r4226 | vasil | 2009-02-17 12:09:16 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 26/28]
------------------------------------------------------------------------
r4227 | vasil | 2009-02-17 12:12:56 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 27/28]
------------------------------------------------------------------------
r4228 | vasil | 2009-02-17 12:14:04 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 28/28]
------------------------------------------------------------------------
r4229 | vasil | 2009-02-17 12:30:55 +0200 (Tue, 17 Feb 2009) | 4 lines
branches/zip:
Add the copyright notice to the non C files.
------------------------------------------------------------------------
r4231 | marko | 2009-02-17 14:26:53 +0200 (Tue, 17 Feb 2009) | 12 lines
Minor cleanup of the Google SMP patch.
sync_array_object_signalled(): Add a (void) cast to eliminate a gcc warning
about the return value of os_atomic_increment() being ignored.
rw_lock_create_func(): Properly indent the preprocessor directives.
rw_lock_x_lock_low(), rw_lock_x_lock_func_nowait(): Split lines correctly.
rw_lock_set_writer_id_and_recursion_flag(): Silence a Valgrind warning.
Do not mix statements and variable declarations.
------------------------------------------------------------------------
r4232 | marko | 2009-02-17 14:59:54 +0200 (Tue, 17 Feb 2009) | 3 lines
branches/zip: When assigning lock->recursive = FALSE, also flag
lock->writer_thread invalid, so that Valgrind will catch more errors.
This is related to Issue #175.
------------------------------------------------------------------------
r4242 | marko | 2009-02-18 17:01:09 +0200 (Wed, 18 Feb 2009) | 2 lines
branches/zip: UT_DBG_STOP: Use do{} while(0) to silence a g++-4.3.2 warning
about a while(0); statement. This should fix (part of) Issue #176.
------------------------------------------------------------------------
r4243 | marko | 2009-02-18 17:04:03 +0200 (Wed, 18 Feb 2009) | 3 lines
branches/zip: buf_buddy_get_slot(): Fix a gcc 4.3.2 warning
about an empty body of a "for" statement.
This fixes part of Issue #176.
------------------------------------------------------------------------
r4244 | marko | 2009-02-18 17:25:45 +0200 (Wed, 18 Feb 2009) | 11 lines
branches/zip: Protect ut_total_allocated_memory with ut_list_mutex.
Unprotected updates to ut_total_allocated_memory in
os_mem_alloc_large() and os_mem_free_large(), called during
fast index creation, may corrupt the variable and cause assertion failures.
Also, add UNIV_MEM_ALLOC() and UNIV_MEM_FREE() instrumentation around
os_mem_alloc_large() and os_mem_free_large(), so that Valgrind can
detect more errors.
rb://90 approved by Heikki Tuuri. This addresses Issue #177.
------------------------------------------------------------------------
r4248 | marko | 2009-02-19 11:52:39 +0200 (Thu, 19 Feb 2009) | 2 lines
branches/zip: page_zip_set_size(): Fix a g++ 4.3.2 warning
about an empty body in a "for" statement. This closes Issue #176.
------------------------------------------------------------------------
r4251 | inaam | 2009-02-19 15:46:27 +0200 (Thu, 19 Feb 2009) | 8 lines
branches/zip: Issue #178 rb://91
Change plug.in to have same CXXFLAGS as CFLAGS. This is to ensure that
both .c and .cc files get compiled with same flags. To fix the issue
where UNIV_LINUX was defined only in .c files.
Approved by: Marko
------------------------------------------------------------------------
r4258 | vasil | 2009-02-20 11:52:19 +0200 (Fri, 20 Feb 2009) | 7 lines
branches/zip:
Cleanup in ChangeLog:
* Wrap lines at 78 characters
* Changed files are listed alphabetically
* White-space cleanup
------------------------------------------------------------------------
r4259 | vasil | 2009-02-20 11:59:42 +0200 (Fri, 20 Feb 2009) | 6 lines
branches/zip:
ChangeLog: Remove include/os0sync.ic from the entry about the google patch,
this file was modified later to not include Google's code.
------------------------------------------------------------------------
r4262 | vasil | 2009-02-20 14:56:59 +0200 (Fri, 20 Feb 2009) | 373 lines
branches/zip:
Merge revisions 4035:4261 from branches/5.1:
------------------------------------------------------------------------
r4065 | sunny | 2009-01-29 16:01:36 +0200 (Thu, 29 Jan 2009) | 8 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: In the last round of AUTOINC cleanup we assumed that AUTOINC
is only defined for integer columns. This caused an assertion failure when
we checked for the maximum value of a column type. We now calculate the
max value for floating-point autoinc columns too.
Fix Bug#42400 - InnoDB autoinc code can't handle floating-point columns
rb://84 and Mantis issue://162
------------------------------------------------------------------------
r4111 | sunny | 2009-02-03 22:06:52 +0200 (Tue, 03 Feb 2009) | 2 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Add the ULL suffix otherwise there is an overflow.
------------------------------------------------------------------------
r4128 | vasil | 2009-02-08 21:36:45 +0200 (Sun, 08 Feb 2009) | 18 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1:
Merge a change from MySQL:
------------------------------------------------------------
revno: 2709.20.31
committer: Timothy Smith <timothy.smith@sun.com>
branch nick: 51
timestamp: Fri 2008-12-19 01:28:51 +0100
message:
Disable part of innodb-autoinc.test, because the MySQL server asserts when
compiled --with-debug, due to bug 39828, "autoinc wraps around when offset and
increment > 1". This change should be reverted when that bug is fixed (and a
a few other minor changes to the test as described in comments).
modified:
mysql-test/r/innodb-autoinc.result
mysql-test/t/innodb-autoinc.test
------------------------------------------------------------------------
r4129 | vasil | 2009-02-08 21:54:25 +0200 (Sun, 08 Feb 2009) | 310 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1:
Merge a change from MySQL:
[looks like the changes to innodb-autoinc.test were made as part of
the following huge merge, but we are merging only changes to that file]
------------------------------------------------------------
revno: 2546.47.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: 5.1-rpl
timestamp: Fri 2009-01-23 13:22:05 +0100
message:
merge: 5.1 -> 5.1-rpl
conflicts:
Text conflict in client/mysqltest.cc
Text conflict in mysql-test/include/wait_until_connected_again.inc
Text conflict in mysql-test/lib/mtr_report.pm
Text conflict in mysql-test/mysql-test-run.pl
Text conflict in mysql-test/r/events_bugs.result
Text conflict in mysql-test/r/log_state.result
Text conflict in mysql-test/r/myisam_data_pointer_size_func.result
Text conflict in mysql-test/r/mysqlcheck.result
Text conflict in mysql-test/r/query_cache.result
Text conflict in mysql-test/r/status.result
Text conflict in mysql-test/suite/binlog/r/binlog_index.result
Text conflict in mysql-test/suite/binlog/r/binlog_innodb.result
Text conflict in mysql-test/suite/rpl/r/rpl_packet.result
Text conflict in mysql-test/suite/rpl/t/rpl_packet.test
Text conflict in mysql-test/t/disabled.def
Text conflict in mysql-test/t/events_bugs.test
Text conflict in mysql-test/t/log_state.test
Text conflict in mysql-test/t/myisam_data_pointer_size_func.test
Text conflict in mysql-test/t/mysqlcheck.test
Text conflict in mysql-test/t/query_cache.test
Text conflict in mysql-test/t/rpl_init_slave_func.test
Text conflict in mysql-test/t/status.test
removed:
mysql-test/suite/parts/r/partition_bit_ndb.result
mysql-test/suite/parts/t/partition_bit_ndb.test
mysql-test/suite/parts/t/partition_sessions.test
mysql-test/suite/sys_vars/inc/tmp_table_size_basic.inc
mysql-test/suite/sys_vars/r/tmp_table_size_basic_32.result
mysql-test/suite/sys_vars/r/tmp_table_size_basic_64.result
mysql-test/suite/sys_vars/t/tmp_table_size_basic_32.test
mysql-test/suite/sys_vars/t/tmp_table_size_basic_64.test
mysql-test/t/log_bin_trust_function_creators_func-master.opt
mysql-test/t/rpl_init_slave_func-slave.opt
added:
mysql-test/include/check_events_off.inc
mysql-test/include/cleanup_fake_relay_log.inc
mysql-test/include/have_simple_parser.inc
mysql-test/include/no_running_event_scheduler.inc
mysql-test/include/no_running_events.inc
mysql-test/include/running_event_scheduler.inc
mysql-test/include/setup_fake_relay_log.inc
mysql-test/include/wait_condition_sp.inc
mysql-test/r/fulltext_plugin.result
mysql-test/r/have_simple_parser.require
mysql-test/r/innodb_bug38231.result
mysql-test/r/innodb_bug39438.result
mysql-test/r/innodb_mysql_rbk.result
mysql-test/r/partition_innodb_semi_consistent.result
mysql-test/r/query_cache_28249.result
mysql-test/r/status2.result
mysql-test/std_data/bug40482-bin.000001
mysql-test/suite/binlog/r/binlog_innodb_row.result
mysql-test/suite/binlog/t/binlog_innodb_row.test
mysql-test/suite/rpl/r/rpl_binlog_corruption.result
mysql-test/suite/rpl/t/rpl_binlog_corruption-master.opt
mysql-test/suite/rpl/t/rpl_binlog_corruption.test
mysql-test/suite/sys_vars/r/tmp_table_size_basic.result
mysql-test/suite/sys_vars/t/tmp_table_size_basic.test
mysql-test/t/fulltext_plugin-master.opt
mysql-test/t/fulltext_plugin.test
mysql-test/t/innodb_bug38231.test
mysql-test/t/innodb_bug39438-master.opt
mysql-test/t/innodb_bug39438.test
mysql-test/t/innodb_mysql_rbk-master.opt
mysql-test/t/innodb_mysql_rbk.test
mysql-test/t/partition_innodb_semi_consistent-master.opt
mysql-test/t/partition_innodb_semi_consistent.test
mysql-test/t/query_cache_28249.test
mysql-test/t/status2.test
renamed:
mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result => mysql-test/suite/funcs_1/r/is_coll_char_set_appl.result
mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test => mysql-test/suite/funcs_1/t/is_coll_char_set_appl.test
modified:
.bzr-mysql/default.conf
CMakeLists.txt
client/mysql.cc
client/mysql_upgrade.c
client/mysqlcheck.c
client/mysqltest.cc
configure.in
extra/resolve_stack_dump.c
extra/yassl/include/openssl/ssl.h
include/config-win.h
include/m_ctype.h
include/my_global.h
mysql-test/extra/binlog_tests/database.test
mysql-test/extra/rpl_tests/rpl_auto_increment.test
mysql-test/include/commit.inc
mysql-test/include/have_32bit.inc
mysql-test/include/have_64bit.inc
mysql-test/include/index_merge1.inc
mysql-test/include/linux_sys_vars.inc
mysql-test/include/windows_sys_vars.inc
mysql-test/lib/mtr_report.pm
mysql-test/mysql-test-run.pl
mysql-test/r/alter_table.result
mysql-test/r/commit_1innodb.result
mysql-test/r/create.result
mysql-test/r/csv.result
mysql-test/r/ctype_ucs.result
mysql-test/r/date_formats.result
mysql-test/r/events_bugs.result
mysql-test/r/events_scheduling.result
mysql-test/r/fulltext.result
mysql-test/r/func_if.result
mysql-test/r/func_in.result
mysql-test/r/func_str.result
mysql-test/r/func_time.result
mysql-test/r/grant.result
mysql-test/r/index_merge_myisam.result
mysql-test/r/information_schema.result
mysql-test/r/innodb-autoinc.result
mysql-test/r/innodb.result
mysql-test/r/innodb_mysql.result
mysql-test/r/log_bin_trust_function_creators_func.result
mysql-test/r/log_state.result
mysql-test/r/myisampack.result
mysql-test/r/mysql.result
mysql-test/r/mysqlcheck.result
mysql-test/r/partition_datatype.result
mysql-test/r/partition_mgm.result
mysql-test/r/partition_pruning.result
mysql-test/r/query_cache.result
mysql-test/r/read_buffer_size_basic.result
mysql-test/r/read_rnd_buffer_size_basic.result
mysql-test/r/rpl_init_slave_func.result
mysql-test/r/select.result
mysql-test/r/status.result
mysql-test/r/strict.result
mysql-test/r/temp_table.result
mysql-test/r/type_bit.result
mysql-test/r/type_date.result
mysql-test/r/type_float.result
mysql-test/r/warnings_engine_disabled.result
mysql-test/r/xml.result
mysql-test/suite/binlog/r/binlog_database.result
mysql-test/suite/binlog/r/binlog_index.result
mysql-test/suite/binlog/r/binlog_innodb.result
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
mysql-test/suite/binlog/t/binlog_innodb.test
mysql-test/suite/funcs_1/r/is_columns_is.result
mysql-test/suite/funcs_1/r/is_engines.result
mysql-test/suite/funcs_1/r/storedproc.result
mysql-test/suite/funcs_1/storedproc/param_check.inc
mysql-test/suite/funcs_2/t/disabled.def
mysql-test/suite/ndb/t/disabled.def
mysql-test/suite/parts/r/partition_bit_innodb.result
mysql-test/suite/parts/r/partition_bit_myisam.result
mysql-test/suite/parts/r/partition_special_innodb.result
mysql-test/suite/parts/t/disabled.def
mysql-test/suite/parts/t/partition_special_innodb.test
mysql-test/suite/parts/t/partition_value_innodb.test
mysql-test/suite/parts/t/partition_value_myisam.test
mysql-test/suite/parts/t/partition_value_ndb.test
mysql-test/suite/rpl/r/rpl_auto_increment.result
mysql-test/suite/rpl/r/rpl_packet.result
mysql-test/suite/rpl/r/rpl_row_create_table.result
mysql-test/suite/rpl/r/rpl_slave_skip.result
mysql-test/suite/rpl/r/rpl_trigger.result
mysql-test/suite/rpl/t/disabled.def
mysql-test/suite/rpl/t/rpl_packet.test
mysql-test/suite/rpl/t/rpl_row_create_table.test
mysql-test/suite/rpl/t/rpl_slave_skip.test
mysql-test/suite/rpl/t/rpl_trigger.test
mysql-test/suite/rpl_ndb/t/disabled.def
mysql-test/suite/sys_vars/inc/key_buffer_size_basic.inc
mysql-test/suite/sys_vars/inc/sort_buffer_size_basic.inc
mysql-test/suite/sys_vars/r/key_buffer_size_basic_32.result
mysql-test/suite/sys_vars/r/key_buffer_size_basic_64.result
mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result
mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result
mysql-test/t/alter_table.test
mysql-test/t/create.test
mysql-test/t/csv.test
mysql-test/t/ctype_ucs.test
mysql-test/t/date_formats.test
mysql-test/t/disabled.def
mysql-test/t/events_bugs.test
mysql-test/t/events_scheduling.test
mysql-test/t/fulltext.test
mysql-test/t/func_if.test
mysql-test/t/func_in.test
mysql-test/t/func_str.test
mysql-test/t/func_time.test
mysql-test/t/grant.test
mysql-test/t/information_schema.test
mysql-test/t/innodb-autoinc.test
mysql-test/t/innodb.test
mysql-test/t/innodb_mysql.test
mysql-test/t/log_bin_trust_function_creators_func.test
mysql-test/t/log_state.test
mysql-test/t/myisam_data_pointer_size_func.test
mysql-test/t/myisampack.test
mysql-test/t/mysql.test
mysql-test/t/mysqlcheck.test
mysql-test/t/partition_innodb_stmt.test
mysql-test/t/partition_mgm.test
mysql-test/t/partition_pruning.test
mysql-test/t/query_cache.test
mysql-test/t/rpl_init_slave_func.test
mysql-test/t/select.test
mysql-test/t/status.test
mysql-test/t/strict.test
mysql-test/t/temp_table.test
mysql-test/t/type_bit.test
mysql-test/t/type_date.test
mysql-test/t/type_float.test
mysql-test/t/warnings_engine_disabled.test
mysql-test/t/xml.test
mysys/my_getopt.c
mysys/my_init.c
scripts/mysql_install_db.sh
sql-common/my_time.c
sql/field.cc
sql/field.h
sql/filesort.cc
sql/ha_partition.cc
sql/ha_partition.h
sql/item.cc
sql/item_cmpfunc.cc
sql/item_func.h
sql/item_strfunc.cc
sql/item_sum.cc
sql/item_timefunc.cc
sql/item_timefunc.h
sql/log.cc
sql/log.h
sql/log_event.cc
sql/log_event.h
sql/mysql_priv.h
sql/mysqld.cc
sql/opt_range.cc
sql/partition_info.cc
sql/repl_failsafe.cc
sql/rpl_constants.h
sql/set_var.cc
sql/slave.cc
sql/spatial.h
sql/sql_acl.cc
sql/sql_base.cc
sql/sql_binlog.cc
sql/sql_class.h
sql/sql_cursor.cc
sql/sql_delete.cc
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_locale.cc
sql/sql_parse.cc
sql/sql_partition.cc
sql/sql_plugin.cc
sql/sql_plugin.h
sql/sql_profile.cc
sql/sql_repl.cc
sql/sql_select.cc
sql/sql_select.h
sql/sql_show.cc
sql/sql_table.cc
sql/sql_trigger.cc
sql/sql_trigger.h
sql/table.cc
sql/table.h
sql/unireg.cc
storage/csv/ha_tina.cc
storage/federated/ha_federated.cc
storage/heap/ha_heap.cc
storage/innobase/Makefile.am
storage/innobase/btr/btr0sea.c
storage/innobase/buf/buf0lru.c
storage/innobase/dict/dict0dict.c
storage/innobase/dict/dict0mem.c
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innobase/include/btr0sea.h
storage/innobase/include/dict0dict.h
storage/innobase/include/dict0mem.h
storage/innobase/include/ha_prototypes.h
storage/innobase/include/lock0lock.h
storage/innobase/include/row0mysql.h
storage/innobase/include/sync0sync.ic
storage/innobase/include/ut0ut.h
storage/innobase/lock/lock0lock.c
storage/innobase/os/os0file.c
storage/innobase/plug.in
storage/innobase/row/row0mysql.c
storage/innobase/row/row0sel.c
storage/innobase/srv/srv0srv.c
storage/innobase/srv/srv0start.c
storage/innobase/ut/ut0ut.c
storage/myisam/ft_boolean_search.c
strings/ctype.c
strings/xml.c
tests/mysql_client_test.c
win/configure.js
mysql-test/suite/funcs_1/t/is_coll_char_set_appl.test
------------------------------------------------------------------------
r4165 | calvin | 2009-02-12 01:34:27 +0200 (Thu, 12 Feb 2009) | 1 line
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: minor non-functional changes.
------------------------------------------------------------------------
------------------------------------------------------------------------
r4263 | vasil | 2009-02-20 15:00:46 +0200 (Fri, 20 Feb 2009) | 4 lines
branches/zip:
Add a ChangeLog entry for a change in r4262.
------------------------------------------------------------------------
r4265 | marko | 2009-02-20 22:31:03 +0200 (Fri, 20 Feb 2009) | 5 lines
branches/zip: Make innodb_use_sys_malloc=ON the default.
Replace srv_use_sys_malloc with UNIV_LIKELY(srv_use_sys_malloc)
to improve branch prediction in the default case.
Approved by Ken over the IM.
------------------------------------------------------------------------
r4266 | vasil | 2009-02-20 23:29:32 +0200 (Fri, 20 Feb 2009) | 7 lines
branches/zip:
Add a sentence at the top of COPYING.Google to clarify that this license
does not apply to the whole InnoDB.
Suggested by: Ken
------------------------------------------------------------------------
r4268 | marko | 2009-02-23 12:43:51 +0200 (Mon, 23 Feb 2009) | 9 lines
branches/zip: Initialize ut_list_mutex at startup. Without this fix,
ut_list_mutex would be used uninitialized when innodb_use_sys_malloc=1.
This fix addresses Issue #181.
ut_mem_block_list_init(): Rename to ut_mem_init() and make public.
ut_malloc_low(), ut_free_all_mem(): Add ut_a(ut_mem_block_list_inited).
mem_init(): Call ut_mem_init().
------------------------------------------------------------------------
r4269 | marko | 2009-02-23 15:09:49 +0200 (Mon, 23 Feb 2009) | 7 lines
branches/zip: When freeing an uncompressed BLOB page, tolerate garbage in
FIL_PAGE_TYPE. (Bug #43043, Issue #182)
btr_check_blob_fil_page_type(): New function.
btr_free_externally_stored_field(), btr_copy_blob_prefix():
Call btr_check_blob_fil_page_type() to check FIL_PAGE_TYPE.
------------------------------------------------------------------------
r4272 | marko | 2009-02-23 23:10:18 +0200 (Mon, 23 Feb 2009) | 8 lines
branches/zip: Adjust the fix of Issue #182 in r4269 per Inaam's suggestion.
btr_check_blob_fil_page_type(): Replace the parameter
const char* op
with
ibool read. Do not print anything about page type mismatch
when reading a BLOB page in Antelope format.
Print space id before page number.
------------------------------------------------------------------------
r4273 | marko | 2009-02-24 00:11:11 +0200 (Tue, 24 Feb 2009) | 1 line
branches/zip: ut_mem_init(): Add the assertion !ut_mem_block_list_inited.
------------------------------------------------------------------------
r4274 | marko | 2009-02-24 00:14:38 +0200 (Tue, 24 Feb 2009) | 12 lines
branches/zip: Fix bugs in the fix of Issue #181. Tested inside and
outside Valgrind, with innodb_use_sys_malloc set to 0 and 1.
mem_init(): Invoke ut_mem_init() before mem_pool_create(), because
the latter one will invoke ut_malloc().
srv_general_init(): Do not initialize the memory subsystem (mem_init()).
innobase_init(): Initialize the memory subsystem (mem_init()) before
calling srv_parse_data_file_paths_and_sizes(), which needs ut_malloc().
Call ut_free_all_mem() in error handling to clean up after the mem_init().
------------------------------------------------------------------------
r4280 | marko | 2009-02-24 15:14:59 +0200 (Tue, 24 Feb 2009) | 1 line
branches/zip: Remove unused function os_mem_alloc_nocache().
------------------------------------------------------------------------
r4281 | marko | 2009-02-24 16:02:48 +0200 (Tue, 24 Feb 2009) | 1 line
branches/zip: Remove the unused function dict_index_get_type().
------------------------------------------------------------------------
r4283 | marko | 2009-02-24 23:06:56 +0200 (Tue, 24 Feb 2009) | 1 line
branches/zip: srv0start.c: Remove unnecessary #include "mem0pool.h".
------------------------------------------------------------------------
r4284 | marko | 2009-02-24 23:26:38 +0200 (Tue, 24 Feb 2009) | 1 line
branches/zip: mem0mem.c: Remove unnecessary #include "mach0data.h".
------------------------------------------------------------------------
r4288 | vasil | 2009-02-25 10:48:07 +0200 (Wed, 25 Feb 2009) | 21 lines
branches/zip: Merge revisions 4261:4287 from branches/5.1:
------------------------------------------------------------------------
r4287 | sunny | 2009-02-25 05:32:01 +0200 (Wed, 25 Feb 2009) | 10 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Fix Bug#42714 AUTO_INCREMENT errors in 5.1.31. There are two
changes to the autoinc handling.
1. To fix the immediate problem from the bug report, we must ensure that the
value written to the table is always less than the max value stored in
dict_table_t.
2. The second related change is that according to MySQL documentation when
the offset is greater than the increment, we should ignore the offset.
------------------------------------------------------------------------
------------------------------------------------------------------------
r4289 | vasil | 2009-02-25 10:53:51 +0200 (Wed, 25 Feb 2009) | 4 lines
branches/zip:
Add ChangeLog entry for the fix in r4288.
------------------------------------------------------------------------
r4290 | vasil | 2009-02-25 11:05:44 +0200 (Wed, 25 Feb 2009) | 11 lines
branches/zip:
Make ChangeLog entries for bugs in bugs.mysql.com in the form:
Fix Bug#12345 bug title
(for bugs after 1.0.2 was released and the ChangeLog published)
There is no need to bloat the ChangeLog with information that is available
via bugs.mysql.com.
Discussed with: Marko
------------------------------------------------------------------------
r4291 | vasil | 2009-02-25 11:08:32 +0200 (Wed, 25 Feb 2009) | 4 lines
branches/zip:
Fix Bug synopsis and remove explanation
------------------------------------------------------------------------
r4292 | marko | 2009-02-25 12:09:15 +0200 (Wed, 25 Feb 2009) | 25 lines
branches/zip: Correct the initialization of the memory subsystem once
again, to finally put Issue #181 to rest.
Revert some parts of r4274. It is best not to call ut_malloc() before
srv_general_init().
mem_init(): Do not call ut_mem_init().
srv_general_init(): Initialize the memory subsystem in two phases:
first ut_mem_init(), then mem_init(). This is because os_sync_init()
and sync_init() depend on ut_mem_init() and mem_init() depends on
os_sync_init() or sync_init().
srv_parse_data_file_paths_and_sizes(),
srv_parse_log_group_home_dirs(): Remove the output parameters. Assign
to the global variables directly. Allocate memory with malloc()
instead of ut_malloc(), because these functions will be called before
srv_general_init().
srv_free_paths_and_sizes(): New function, for cleaning up after
srv_parse_data_file_paths_and_sizes() and
srv_parse_log_group_home_dirs().
rb://92 approved by Sunny Bains
------------------------------------------------------------------------
r4297 | vasil | 2009-02-25 17:19:19 +0200 (Wed, 25 Feb 2009) | 4 lines
branches/zip:
White-space cleanup in the ChangeLog
------------------------------------------------------------------------
r4301 | vasil | 2009-02-25 21:33:32 +0200 (Wed, 25 Feb 2009) | 5 lines
branches/zip:
Do not output the commands that restore the environment because they depend
on the state of the environment before the test starts executing.
------------------------------------------------------------------------
r4315 | vasil | 2009-02-26 09:21:20 +0200 (Thu, 26 Feb 2009) | 5 lines
branches/zip:
Apply any necessary patches to the mysql tree at the end of setup.sh
This step was previously done manually (and sometimes forgotten).
------------------------------------------------------------------------
r4319 | marko | 2009-02-26 23:27:51 +0200 (Thu, 26 Feb 2009) | 6 lines
branches/zip: btr_check_blob_fil_page_type(): Do not report
FIL_PAGE_TYPE mismatch even when purging a BLOB.
Heavy users may have large data files created with MySQL 5.0 or earlier,
and they don not want to have the error log flooded with such messages.
This fixes Issue #182.
------------------------------------------------------------------------
r4320 | inaam | 2009-02-27 02:13:19 +0200 (Fri, 27 Feb 2009) | 8 lines
branches/zip
This is to revert the changes made to the plug.in (r4251) as a fix for
issue# 178. Changes to plug.in will not propogate to a plugin
installation unless autotools are rerun which is unacceptable.
A fix for issue# 178 will be committed in a separate commit.
------------------------------------------------------------------------
r4321 | inaam | 2009-02-27 02:16:46 +0200 (Fri, 27 Feb 2009) | 6 lines
branches/zip
This is a fix for issue#178. Instead of using UNIV_LINUX which is
defined through CFLAGS we use compiler generated define __linux__
that is effective for both .c and .cc files.
------------------------------------------------------------------------
r4324 | vasil | 2009-02-27 13:27:18 +0200 (Fri, 27 Feb 2009) | 39 lines
branches/zip:
Add FreeBSD to the list of the operating systems that have
sizeof(pthread_t) == sizeof(void*) (i.e. word size).
On FreeBSD pthread_t is defined like:
/usr/include/sys/_pthreadtypes.h:
typedef struct pthread *pthread_t;
I did the following tests (per Inaam's recommendation):
a) appropriate version of GCC is available on that platform (4.1.2 or
higher for atomics to be available)
On FreeBSD 6.x the default compiler is 3.4.6, on FreeBSD 7.x the default
one is 4.2.1. One can always install the version of choice from the ports
collection. If gcc 3.x is used then HAVE_GCC_ATOMIC_BUILTINS will not be
defined and thus the change I am committing will make no difference.
b) find out if sizeof(pthread_t) == sizeof(long)
On 32 bit both are 4 bytes, on 64 bit both are 8 bytes.
c) find out the compiler generated platform define (e.g.: __aix, __sunos__
etc.)
The macro is __FreeBSD__.
d) patch univ.i with the appropriate platform define
e) build the mysql
f) ensure it is using atomic builtins (look at the err.log message at
system startup. It should say we are using atomics for both mutexes and
rw-locks)
g) do sanity testing (keeping in view the smp changes)
I ran the mysql-test suite. All tests pass.
------------------------------------------------------------------------
r4353 | vasil | 2009-03-05 09:27:29 +0200 (Thu, 05 Mar 2009) | 6 lines
branches/zip:
As suggested by Ken, print a message that says that the Google SMP patch
(GCC atomics) is disabled if it is. Also extend the message when the patch
is partially enabled to make it clear that it is partially enabled.
------------------------------------------------------------------------
r4356 | vasil | 2009-03-05 13:49:51 +0200 (Thu, 05 Mar 2009) | 4 lines
branches/zip:
Fix typo made in r4353.
------------------------------------------------------------------------
r4357 | vasil | 2009-03-05 16:38:59 +0200 (Thu, 05 Mar 2009) | 23 lines
branches/zip:
Implement a check whether pthread_t objects can be used by GCC atomic
builtin functions. This check is implemented in plug.in and defines the
macro HAVE_ATOMIC_PTHREAD_T. This macro is checked in univ.i and the
relevant part of the code enabled (the one that uses GCC atomics against
pthread_t objects).
In addition to this, the same program that is compiled as part of the
plug.in check is added in ut/ut0auxconf.c. In the InnoDB Plugin source
archives that are shipped to the users, a generated Makefile.in is added.
That Makefile.in will be modified to compile ut/ut0auxconf.c and define
the macro HAVE_ATOMIC_PTHREAD_T if the compilation succeeds. I.e.
Makefile.in will emulate the work that is done by plug.in. This is done in
order to make the check happen and HAVE_ATOMIC_PTHREAD_T eventually
defined without regenerating MySQL's ./configure from
./storage/innobase/plug.in. The point is not to ask users to install the
autotools and regenerate ./configure.
rb://95
Approved by: Marko
------------------------------------------------------------------------
r4360 | vasil | 2009-03-05 22:23:17 +0200 (Thu, 05 Mar 2009) | 21 lines
branches/zip: Merge revisions 4287:4357 from branches/5.1:
------------------------------------------------------------------------
r4325 | sunny | 2009-03-02 02:28:52 +0200 (Mon, 02 Mar 2009) | 10 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Bug#43203: Overflow from auto incrementing causes server segv
It was not a SIGSEGV but an assertion failure. The assertion was checking
the invariant that *first_value passed in by MySQL doesn't contain a value
that is greater than the max value for that type. The assertion has been
changed to a check and if the value is greater than the max we report a
generic AUTOINC failure.
rb://93
Approved by Heikki
------------------------------------------------------------------------
------------------------------------------------------------------------
r4361 | vasil | 2009-03-05 22:27:54 +0200 (Thu, 05 Mar 2009) | 30 lines
branches/zip: Merge revision 4358 from branches/5.1 (resolving a conflict):
------------------------------------------------------------------------
r4358 | vasil | 2009-03-05 21:21:10 +0200 (Thu, 05 Mar 2009) | 21 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Merge a change from MySQL:
------------------------------------------------------------
revno: 2728.19.1
committer: Alfranio Correia <alfranio.correia@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-02-03 11:36:46 +0000
message:
BUG#42445 Warning messages in innobase/handler/ha_innodb.cc
There was a type casting problem in the storage/innobase/handler/ha_innodb.cc,
(int ha_innobase::write_row(...)). Innobase uses has an internal error variable
of type 'ulint' while mysql uses an 'int'.
To fix the problem the function manipulates an error variable of
type 'ulint' and only casts it into 'int' when needs to return the value.
modified:
storage/innobase/handler/ha_innodb.cc
------------------------------------------------------------------------
------------------------------------------------------------------------
r4362 | vasil | 2009-03-05 22:29:07 +0200 (Thu, 05 Mar 2009) | 23 lines
branches/zip: Merge revision 4359 from branches/5.1:
------------------------------------------------------------------------
r4359 | vasil | 2009-03-05 21:42:01 +0200 (Thu, 05 Mar 2009) | 14 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Merge a change from MySQL:
------------------------------------------------------------
revno: 2747
committer: Timothy Smith <timothy.smith@sun.com>
branch nick: 51
timestamp: Fri 2009-01-16 17:49:07 +0100
message:
Add another cast to ignore int/ulong difference in error types, silence warning on Win64
modified:
storage/innobase/handler/ha_innodb.cc
------------------------------------------------------------------------
------------------------------------------------------------------------
r4363 | vasil | 2009-03-05 22:31:37 +0200 (Thu, 05 Mar 2009) | 4 lines
branches/zip:
Add ChangeLog entry for the bugfix in c4360.
------------------------------------------------------------------------
r4378 | calvin | 2009-03-09 10:10:17 +0200 (Mon, 09 Mar 2009) | 7 lines
branches/zip: remove compile flag MYSQL_SERVER for dynamic plugin
The dynamic plugin on Windows used to be built with MYSQL_SERVER
compile flag, while it is not the case for other platforms.
r3797 assumed MYSQL_SERVER was not defined for dynamic plugin,
which introduced the engine crash during dropping a database.
------------------------------------------------------------------------
r4396 | marko | 2009-03-12 09:22:27 +0200 (Thu, 12 Mar 2009) | 3 lines
branches/zip: btr_store_big_rec_extern_fields(): Initialize FIL_PAGE_TYPE
in a separate redo log entry. This will make ibbackup --apply-log
debugging easier.
------------------------------------------------------------------------
r4397 | marko | 2009-03-12 09:26:11 +0200 (Thu, 12 Mar 2009) | 3 lines
branches/zip: trx_sys_create_doublewrite_buf(): As the dummy change,
initialize FIL_PAGE_TYPE. This will make it easier to write the debug
assertions for ibbackup --apply-log.
------------------------------------------------------------------------
r4401 | marko | 2009-03-12 10:26:40 +0200 (Thu, 12 Mar 2009) | 19 lines
branches/zip: Merge revisions 4359:4400 from branches/5.1:
------------------------------------------------------------------------
r4399 | marko | 2009-03-12 09:38:05 +0200 (Thu, 12 Mar 2009) | 2 lines
branches/5.1: row_sel_get_clust_rec_for_mysql(): Store the cursor position
also for unlock_row(). (Bug #39320)
------------------------------------------------------------------------
r4400 | marko | 2009-03-12 10:06:44 +0200 (Thu, 12 Mar 2009) | 5 lines
branches/5.1: Fix a bug in multi-table semi-consistent reads.
Remember the acquired record locks per table handle (row_prebuilt_t)
rather than per transaction (trx_t), so that unlock_row should successfully
unlock all non-matching rows in multi-table operations.
This deficiency was found while investigating Bug #39320.
------------------------------------------------------------------------
These were submitted as rb://94 and rb://96 and approved by Heikki Tuuri.
------------------------------------------------------------------------
r4455 | marko | 2009-03-16 11:43:34 +0200 (Mon, 16 Mar 2009) | 2 lines
branches/zip: UT_LIST_VALIDATE(): Add the parameter ASSERTION and
adjust all callers.
------------------------------------------------------------------------
r4456 | marko | 2009-03-16 12:59:25 +0200 (Mon, 16 Mar 2009) | 6 lines
branches/zip: UT_LIST_VALIDATE(): Assert that the link is non-NULL
before dereferencing it. In this way, ut_list_node_313 will be
pointing to the last non-NULL list item at the time of the assertion
failure. (gcc-4.3.2 -O3 seems to optimize the common subexpressions
and make the variable NULL, though.)
------------------------------------------------------------------------
r4457 | marko | 2009-03-16 14:12:02 +0200 (Mon, 16 Mar 2009) | 2 lines
branches/zip: sync_thread_add_level(): Make the assertions about
level == SYNC_BUF_BLOCK more readable.
------------------------------------------------------------------------
r4461 | vasil | 2009-03-17 09:38:19 +0200 (Tue, 17 Mar 2009) | 6 lines
branches/zip:
Remove mysql-test/patches/bug32625.diff because that bug was fixed in
the mysql repository (1 year and 4 months after sending them the simple
patch!). See http://bugs.mysql.com/32625
------------------------------------------------------------------------
r4465 | marko | 2009-03-17 12:34:19 +0200 (Tue, 17 Mar 2009) | 1 line
branches/zip: buf0buddy.c: Add and adjust some debug assertions.
------------------------------------------------------------------------
r4473 | vasil | 2009-03-17 15:50:30 +0200 (Tue, 17 Mar 2009) | 5 lines
branches/zip:
Increment the InnoDB Plugin version from 1.0.3 to 1.0.4 now that
1.0.3 has been released.
------------------------------------------------------------------------
r4478 | vasil | 2009-03-18 11:53:53 +0200 (Wed, 18 Mar 2009) | 5 lines
branches/zip:
Remove mysql-test/patches/bug41893.diff because that bug has been fixed
in the MySQL repository, see http://bugs.mysql.com/41893.
------------------------------------------------------------------------
r4479 | marko | 2009-03-18 12:43:54 +0200 (Wed, 18 Mar 2009) | 2 lines
branches/zip: buf_LRU_block_remove_hashed_page(): Add some debug assertions.
------------------------------------------------------------------------
r4480 | marko | 2009-03-18 14:32:13 +0200 (Wed, 18 Mar 2009) | 1 line
branches/zip: buf_buddy_free_low(): Correct the function comment.
------------------------------------------------------------------------
r4482 | marko | 2009-03-19 15:23:32 +0200 (Thu, 19 Mar 2009) | 12 lines
branches/zip: Merge revisions 4400:4481 from branches/5.1:
------------------------------------------------------------------------
r4481 | marko | 2009-03-19 15:01:48 +0200 (Thu, 19 Mar 2009) | 6 lines
branches/5.1: row_unlock_for_mysql(): Do not unlock records that were
modified by the current transaction. This bug was introduced or unmasked
in r4400.
rb://97 approved by Heikki Tuuri
------------------------------------------------------------------------
------------------------------------------------------------------------
r4490 | marko | 2009-03-20 12:33:33 +0200 (Fri, 20 Mar 2009) | 4 lines
branches/zip: Non-functional change for reducing dependencies in InnoDB Hot Backup:
Replace srv_sys->dummy_ind1 and srv_sys->dummy_ind2 with
dict_ind_redundant and dict_ind_compact, initialized in dict_init().
------------------------------------------------------------------------
r4491 | marko | 2009-03-20 12:45:18 +0200 (Fri, 20 Mar 2009) | 2 lines
branches/zip: Add const qualifiers or in/out comments to some function
parameters in log0log.
------------------------------------------------------------------------
r4492 | marko | 2009-03-20 12:52:14 +0200 (Fri, 20 Mar 2009) | 5 lines
branches/zip: page_validate(): Always report the space id and the
name of the index.
In Hot Backup, do not invoke comparison functions, as MySQL collations
will be unavailable.
------------------------------------------------------------------------
r4493 | marko | 2009-03-20 13:24:06 +0200 (Fri, 20 Mar 2009) | 1 line
branches/zip: Replace fil_get_space_for_id_low() with fil_space_get_by_id().
------------------------------------------------------------------------
r4494 | marko | 2009-03-20 13:51:35 +0200 (Fri, 20 Mar 2009) | 3 lines
branches/zip: fil0fil.c: Refer to fil_system directly, not via local vars.
This eliminates some "unused variable" warnings when building
InnoDB Hot Backup in such a way that all mutex operations are no-ops.
------------------------------------------------------------------------
r4495 | marko | 2009-03-20 14:15:52 +0200 (Fri, 20 Mar 2009) | 1 line
branches/zip: innobase_get_at_most_n_mbchars(): Declare in ha_prototypes.h.
------------------------------------------------------------------------
r4496 | marko | 2009-03-20 14:48:26 +0200 (Fri, 20 Mar 2009) | 1 line
branches/zip: recv_recover_page(): Remove compile-time constant parameters.
------------------------------------------------------------------------
r4497 | marko | 2009-03-20 14:56:19 +0200 (Fri, 20 Mar 2009) | 1 line
branches/zip: recv_sys_init(): Remove a compile-time constant parameter.
------------------------------------------------------------------------
r4498 | marko | 2009-03-20 15:08:05 +0200 (Fri, 20 Mar 2009) | 4 lines
branches/zip: Non-functional change: Add const qualifiers.
log_block_checksum_is_ok_or_old_format(), recv_sys_add_to_parsing_buf():
The log block is read-only. Make it const.
------------------------------------------------------------------------
r4499 | marko | 2009-03-20 15:10:25 +0200 (Fri, 20 Mar 2009) | 1 line
branches/zip: recv_scan_log_recs(): Remove a compile-time constant parameter.
------------------------------------------------------------------------
r4500 | marko | 2009-03-20 15:47:17 +0200 (Fri, 20 Mar 2009) | 1 line
branches/zip: fil_init(): Add the parameter hash_size.
------------------------------------------------------------------------
r4501 | vasil | 2009-03-20 16:50:41 +0200 (Fri, 20 Mar 2009) | 4 lines
branches/zip:
Add any entry about the release of 1.0.3 in the ChangeLog.
------------------------------------------------------------------------
r4515 | marko | 2009-03-23 10:49:53 +0200 (Mon, 23 Mar 2009) | 1 line
branches/zip: hash_table_t: adaptive: Remove from UNIV_HOTBACKUP builds.
------------------------------------------------------------------------
r4516 | marko | 2009-03-23 10:57:16 +0200 (Mon, 23 Mar 2009) | 2 lines
branches/zip: Define and use ASSERT_HASH_MUTEX_OWN.
Make it a no-op in UNIV_HOTBACKUP builds.
------------------------------------------------------------------------
r4517 | marko | 2009-03-23 11:07:20 +0200 (Mon, 23 Mar 2009) | 2 lines
branches/zip: Define and use PAGE_ZIP_MATCH.
In UNIV_HOTBACKUP builds, assume fixed allocation.
------------------------------------------------------------------------
r4521 | marko | 2009-03-23 12:05:47 +0200 (Mon, 23 Mar 2009) | 1 line
branches/zip: buf_page_print(): Clean up the code #ifdef UNIV_HOTBACKUP.
------------------------------------------------------------------------
r4522 | marko | 2009-03-23 12:20:50 +0200 (Mon, 23 Mar 2009) | 2 lines
branches/zip: Exclude some operating system interface code
from UNIV_HOTBACKUP builds.
------------------------------------------------------------------------
r4523 | marko | 2009-03-23 13:00:43 +0200 (Mon, 23 Mar 2009) | 2 lines
branches/zip: Remove the remaining references to hash_table_t::adapive
from UNIV_HOTBACKUP builds. This should have been done in r4515.
------------------------------------------------------------------------
r4524 | marko | 2009-03-23 14:05:18 +0200 (Mon, 23 Mar 2009) | 2 lines
branches/zip: Enclose recv_recovery_from_backup_on and
recv_recovery_from_backup_is_on() in #ifdef UNIV_LOG_ARCHIVE.
------------------------------------------------------------------------
r4525 | marko | 2009-03-23 14:57:45 +0200 (Mon, 23 Mar 2009) | 2 lines
branches/zip: recv_parse_or_apply_log_rec_body(): Add debug assertions
ensuring that FIL_PAGE_TYPE makes sense when applying log records.
------------------------------------------------------------------------
r4526 | marko | 2009-03-23 16:21:34 +0200 (Mon, 23 Mar 2009) | 2 lines
branches/zip: Remove unneeded definitions and dependencies
from UNIV_HOTBACKUP builds.
------------------------------------------------------------------------
r4527 | calvin | 2009-03-23 23:15:33 +0200 (Mon, 23 Mar 2009) | 5 lines
branches/zip: adjust build files on Windows
Adjust the patch positions based on the latest MySQL source.
Also add the patches to the .bat files for vs9.
------------------------------------------------------------------------
2009-03-24 09:32:21 +01:00
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 11:52:16 +02:00
|
|
|
/**************************************************//**
|
2012-08-01 16:27:34 +02:00
|
|
|
@file os/os0file.cc
|
2005-10-27 09:29:40 +02:00
|
|
|
The interface to the operating system file i/o primitives
|
|
|
|
|
|
|
|
Created 10/21/1995 Heikki Tuuri
|
|
|
|
*******************************************************/
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#ifndef UNIV_INNOCHECKSUM
|
|
|
|
|
|
|
|
#include "ha_prototypes.h"
|
|
|
|
#include "sql_const.h"
|
|
|
|
|
2005-10-27 09:29:40 +02:00
|
|
|
#include "os0file.h"
|
2010-03-29 09:34:42 +02:00
|
|
|
|
|
|
|
#ifdef UNIV_NONINL
|
|
|
|
#include "os0file.ic"
|
|
|
|
#endif
|
|
|
|
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
#ifdef UNIV_LINUX
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#endif
|
|
|
|
|
2005-10-27 09:29:40 +02:00
|
|
|
#include "srv0srv.h"
|
|
|
|
#include "srv0start.h"
|
|
|
|
#include "fil0fil.h"
|
2015-04-01 10:50:21 +02:00
|
|
|
#include "fil0crypt.h"
|
2014-12-22 15:53:17 +01:00
|
|
|
#include "fsp0fsp.h"
|
2013-12-19 13:36:38 +01:00
|
|
|
#include "fil0pagecompress.h"
|
|
|
|
#include "srv0srv.h"
|
2015-10-06 14:40:26 +02:00
|
|
|
#ifdef HAVE_LINUX_UNISTD_H
|
2014-12-03 09:41:52 +01:00
|
|
|
#include "unistd.h"
|
2013-12-19 13:36:38 +01:00
|
|
|
#endif
|
2016-12-30 14:04:10 +01:00
|
|
|
#include "os0event.h"
|
|
|
|
#include "os0thread.h"
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#include <vector>
|
|
|
|
|
|
|
|
#ifdef LINUX_NATIVE_AIO
|
2009-01-13 19:20:49 +01:00
|
|
|
#include <libaio.h>
|
2016-08-12 10:17:45 +02:00
|
|
|
#endif /* LINUX_NATIVE_AIO */
|
|
|
|
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
#ifdef HAVE_FALLOC_PUNCH_HOLE_AND_KEEP_SIZE
|
|
|
|
# include <fcntl.h>
|
|
|
|
# include <linux/falloc.h>
|
|
|
|
#endif /* HAVE_FALLOC_PUNCH_HOLE_AND_KEEP_SIZE */
|
2016-08-12 10:17:45 +02:00
|
|
|
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
#if defined(UNIV_LINUX) && defined(HAVE_SYS_IOCTL_H)
|
|
|
|
# include <sys/ioctl.h>
|
|
|
|
# ifndef DFS_IOCTL_ATOMIC_WRITE_SET
|
|
|
|
# define DFS_IOCTL_ATOMIC_WRITE_SET _IOW(0x95, 2, uint)
|
|
|
|
# endif
|
|
|
|
#endif
|
|
|
|
|
2014-10-28 11:49:31 +01:00
|
|
|
#if defined(UNIV_LINUX) && defined(HAVE_SYS_STATVFS_H)
|
|
|
|
#include <sys/statvfs.h>
|
|
|
|
#endif
|
|
|
|
|
2014-12-03 09:41:52 +01:00
|
|
|
#if defined(UNIV_LINUX) && defined(HAVE_LINUX_FALLOC_H)
|
|
|
|
#include <linux/falloc.h>
|
|
|
|
#endif
|
|
|
|
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
#ifdef _WIN32
|
|
|
|
#include <winioctl.h>
|
2015-02-19 16:42:18 +01:00
|
|
|
#endif
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/** Insert buffer segment id */
|
|
|
|
static const ulint IO_IBUF_SEGMENT = 0;
|
|
|
|
|
|
|
|
/** Log segment id */
|
|
|
|
static const ulint IO_LOG_SEGMENT = 1;
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Number of retries for partial I/O's */
|
|
|
|
static const ulint NUM_RETRIES_ON_PARTIAL_IO = 10;
|
|
|
|
|
2005-10-27 09:29:40 +02:00
|
|
|
/* This specifies the file permissions InnoDB uses when it creates files in
|
|
|
|
Unix; the value of os_innodb_umask is initialized in ha_innodb.cc to
|
|
|
|
my_umask */
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#ifndef _WIN32
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 11:52:16 +02:00
|
|
|
/** Umask for creating files */
|
2016-08-12 10:17:45 +02:00
|
|
|
static ulint os_innodb_umask = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP;
|
2005-10-27 09:29:40 +02:00
|
|
|
#else
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 11:52:16 +02:00
|
|
|
/** Umask for creating files */
|
2016-08-12 10:17:45 +02:00
|
|
|
static ulint os_innodb_umask = 0;
|
|
|
|
#ifndef ECANCELED
|
2015-03-16 17:22:50 +01:00
|
|
|
#define ECANCELED 125
|
2016-08-12 10:17:45 +02:00
|
|
|
#endif
|
2016-09-19 14:31:20 +02:00
|
|
|
static HANDLE completion_port;
|
|
|
|
static HANDLE read_completion_port;
|
|
|
|
static DWORD fls_sync_io = FLS_OUT_OF_INDEXES;
|
|
|
|
#define IOCP_SHUTDOWN_KEY (ULONG_PTR)-1
|
2016-08-12 10:17:45 +02:00
|
|
|
#endif /* _WIN32 */
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** In simulated aio, merge at most this many consecutive i/os */
|
|
|
|
static const ulint OS_AIO_MERGE_N_CONSECUTIVE = 64;
|
|
|
|
|
|
|
|
/** Flag indicating if the page_cleaner is in active state. */
|
|
|
|
extern bool buf_page_cleaner_is_active;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2014-08-06 14:39:15 +02:00
|
|
|
#ifdef WITH_INNODB_DISALLOW_WRITES
|
|
|
|
#define WAIT_ALLOW_WRITES() os_event_wait(srv_allow_writes_event)
|
|
|
|
#else
|
|
|
|
#define WAIT_ALLOW_WRITES() do { } while (0)
|
|
|
|
#endif /* WITH_INNODB_DISALLOW_WRITES */
|
|
|
|
|
2009-01-13 19:20:49 +01:00
|
|
|
/**********************************************************************
|
|
|
|
|
|
|
|
InnoDB AIO Implementation:
|
|
|
|
=========================
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
We support native AIO for Windows and Linux. For rest of the platforms
|
|
|
|
we simulate AIO by special IO-threads servicing the IO-requests.
|
2009-01-13 19:20:49 +01:00
|
|
|
|
|
|
|
Simulated AIO:
|
|
|
|
==============
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
On platforms where we 'simulate' AIO, the following is a rough explanation
|
2009-01-13 19:20:49 +01:00
|
|
|
of the high level design.
|
|
|
|
There are four io-threads (for ibuf, log, read, write).
|
|
|
|
All synchronous IO requests are serviced by the calling thread using
|
|
|
|
os_file_write/os_file_read. The Asynchronous requests are queued up
|
2012-08-01 16:27:34 +02:00
|
|
|
in an array (there are four such arrays) by the calling thread.
|
2016-08-12 10:17:45 +02:00
|
|
|
Later these requests are picked up by the IO-thread and are serviced
|
2009-01-13 19:20:49 +01:00
|
|
|
synchronously.
|
|
|
|
|
|
|
|
Windows native AIO:
|
|
|
|
==================
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
If srv_use_native_aio is not set then Windows follow the same
|
2009-01-13 19:20:49 +01:00
|
|
|
code as simulated AIO. If the flag is set then native AIO interface
|
|
|
|
is used. On windows, one of the limitation is that if a file is opened
|
|
|
|
for AIO no synchronous IO can be done on it. Therefore we have an
|
|
|
|
extra fifth array to queue up synchronous IO requests.
|
|
|
|
There are innodb_file_io_threads helper threads. These threads work
|
|
|
|
on the four arrays mentioned above in Simulated AIO. No thread is
|
|
|
|
required for the sync array.
|
|
|
|
If a synchronous IO request is made, it is first queued in the sync
|
|
|
|
array. Then the calling thread itself waits on the request, thus
|
|
|
|
making the call synchronous.
|
|
|
|
If an AIO request is made the calling thread not only queues it in the
|
|
|
|
array but also submits the requests. The helper thread then collects
|
|
|
|
the completed IO request and calls completion routine on it.
|
|
|
|
|
|
|
|
Linux native AIO:
|
|
|
|
=================
|
|
|
|
|
|
|
|
If we have libaio installed on the system and innodb_use_native_aio
|
2016-08-12 10:17:45 +02:00
|
|
|
is set to true we follow the code path of native AIO, otherwise we
|
2009-01-13 19:20:49 +01:00
|
|
|
do simulated AIO.
|
|
|
|
There are innodb_file_io_threads helper threads. These threads work
|
|
|
|
on the four arrays mentioned above in Simulated AIO.
|
|
|
|
If a synchronous IO request is made, it is handled by calling
|
|
|
|
os_file_write/os_file_read.
|
|
|
|
If an AIO request is made the calling thread not only queues it in the
|
|
|
|
array but also submits the requests. The helper thread then collects
|
|
|
|
the completed IO request and calls completion routine on it.
|
|
|
|
|
|
|
|
**********************************************************************/
|
2005-10-27 09:29:40 +02:00
|
|
|
|
|
|
|
|
2010-03-29 09:34:42 +02:00
|
|
|
#ifdef UNIV_PFS_IO
|
|
|
|
/* Keys to register InnoDB I/O with performance schema */
|
2016-08-12 10:17:45 +02:00
|
|
|
mysql_pfs_key_t innodb_data_file_key;
|
|
|
|
mysql_pfs_key_t innodb_log_file_key;
|
|
|
|
mysql_pfs_key_t innodb_temp_file_key;
|
2010-03-29 09:34:42 +02:00
|
|
|
#endif /* UNIV_PFS_IO */
|
|
|
|
|
2016-09-19 14:31:20 +02:00
|
|
|
class AIO;
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** The asynchronous I/O context */
|
|
|
|
struct Slot {
|
2016-09-19 14:31:20 +02:00
|
|
|
|
|
|
|
#ifdef WIN_ASYNC_IO
|
|
|
|
/** Windows control block for the aio request
|
|
|
|
must be at the very start of Slot, so we can
|
|
|
|
cast Slot* to OVERLAPPED*
|
|
|
|
*/
|
|
|
|
OVERLAPPED control;
|
|
|
|
#endif
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** index of the slot in the aio array */
|
|
|
|
uint16_t pos;
|
|
|
|
|
|
|
|
/** true if this slot is reserved */
|
|
|
|
bool is_reserved;
|
|
|
|
|
|
|
|
/** time when reserved */
|
|
|
|
time_t reservation_time;
|
|
|
|
|
|
|
|
/** buffer used in i/o */
|
|
|
|
byte* buf;
|
2015-10-06 14:40:26 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Buffer pointer used for actual IO. We advance this
|
|
|
|
when partial IO is required and not buf */
|
|
|
|
byte* ptr;
|
2013-12-19 13:36:38 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** OS_FILE_READ or OS_FILE_WRITE */
|
|
|
|
IORequest type;
|
2013-12-19 13:36:38 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** file offset in bytes */
|
|
|
|
os_offset_t offset;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** file where to read or write */
|
|
|
|
os_file_t file;
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** file name or path */
|
|
|
|
const char* name;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** used only in simulated aio: true if the physical i/o
|
|
|
|
already made and only the slot message needs to be passed
|
|
|
|
to the caller of os_aio_simulated_handle */
|
|
|
|
bool io_already_done;
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-09-06 08:43:16 +02:00
|
|
|
/*!< file block size */
|
|
|
|
ulint file_block_size;
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** The file node for which the IO is requested. */
|
|
|
|
fil_node_t* m1;
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** the requester of an aio operation and which can be used
|
|
|
|
to identify which pending aio operation was completed */
|
|
|
|
void* m2;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** AIO completion status */
|
|
|
|
dberr_t err;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#ifdef WIN_ASYNC_IO
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** bytes written/read */
|
|
|
|
DWORD n_bytes;
|
2013-12-19 13:36:38 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** length of the block to read or write */
|
|
|
|
DWORD len;
|
2013-12-19 13:36:38 +01:00
|
|
|
|
2016-09-19 14:31:20 +02:00
|
|
|
/** aio array containing this slot */
|
|
|
|
AIO *array;
|
2016-08-12 10:17:45 +02:00
|
|
|
#elif defined(LINUX_NATIVE_AIO)
|
|
|
|
/** Linux control block for aio */
|
|
|
|
struct iocb control;
|
|
|
|
|
|
|
|
/** AIO return code */
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
/** bytes written/read. */
|
|
|
|
ssize_t n_bytes;
|
2013-12-19 13:36:38 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** length of the block to read or write */
|
|
|
|
ulint len;
|
2013-12-19 13:36:38 +01:00
|
|
|
#else
|
2016-08-12 10:17:45 +02:00
|
|
|
/** length of the block to read or write */
|
|
|
|
ulint len;
|
2013-12-19 13:36:38 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** bytes written/read. */
|
|
|
|
ulint n_bytes;
|
|
|
|
#endif /* WIN_ASYNC_IO */
|
2013-12-19 13:36:38 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Length of the block before it was compressed */
|
|
|
|
uint32 original_len;
|
2010-12-01 09:43:33 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
/** The asynchronous i/o array structure */
|
|
|
|
class AIO {
|
|
|
|
public:
|
|
|
|
/** Constructor
|
|
|
|
@param[in] id Latch ID
|
|
|
|
@param[in] n_slots Number of slots to configure
|
|
|
|
@param[in] segments Number of segments to configure */
|
|
|
|
AIO(latch_id_t id, ulint n_slots, ulint segments);
|
|
|
|
|
|
|
|
/** Destructor */
|
|
|
|
~AIO();
|
|
|
|
|
|
|
|
/** Initialize the instance
|
|
|
|
@return DB_SUCCESS or error code */
|
|
|
|
dberr_t init();
|
|
|
|
|
|
|
|
/** Requests for a slot in the aio array. If no slot is available, waits
|
|
|
|
until not_full-event becomes signaled.
|
|
|
|
|
|
|
|
@param[in,out] type IO context
|
|
|
|
@param[in,out] m1 message to be passed along with the AIO
|
|
|
|
operation
|
|
|
|
@param[in,out] m2 message to be passed along with the AIO
|
|
|
|
operation
|
|
|
|
@param[in] file file handle
|
|
|
|
@param[in] name name of the file or path as a null-terminated
|
|
|
|
string
|
|
|
|
@param[in,out] buf buffer where to read or from which to write
|
|
|
|
@param[in] offset file offset, where to read from or start writing
|
|
|
|
@param[in] len length of the block to read or write
|
|
|
|
@return pointer to slot */
|
|
|
|
Slot* reserve_slot(
|
|
|
|
IORequest& type,
|
|
|
|
fil_node_t* m1,
|
|
|
|
void* m2,
|
|
|
|
os_file_t file,
|
|
|
|
const char* name,
|
|
|
|
void* buf,
|
|
|
|
os_offset_t offset,
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
ulint len)
|
2016-09-06 08:43:16 +02:00
|
|
|
MY_ATTRIBUTE((warn_unused_result));
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
/** @return number of reserved slots */
|
|
|
|
ulint pending_io_count() const;
|
|
|
|
|
|
|
|
/** Returns a pointer to the nth slot in the aio array.
|
|
|
|
@param[in] index Index of the slot in the array
|
|
|
|
@return pointer to slot */
|
|
|
|
const Slot* at(ulint i) const
|
2016-09-06 08:43:16 +02:00
|
|
|
MY_ATTRIBUTE((warn_unused_result))
|
2016-08-12 10:17:45 +02:00
|
|
|
{
|
|
|
|
ut_a(i < m_slots.size());
|
|
|
|
|
|
|
|
return(&m_slots[i]);
|
2006-02-23 20:25:29 +01:00
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Non const version */
|
|
|
|
Slot* at(ulint i)
|
2016-09-06 08:43:16 +02:00
|
|
|
MY_ATTRIBUTE((warn_unused_result))
|
2016-08-12 10:17:45 +02:00
|
|
|
{
|
|
|
|
ut_a(i < m_slots.size());
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(&m_slots[i]);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Frees a slot in the AIO array, assumes caller owns the mutex.
|
|
|
|
@param[in,out] slot Slot to release */
|
|
|
|
void release(Slot* slot);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Frees a slot in the AIO array, assumes caller doesn't own the mutex.
|
|
|
|
@param[in,out] slot Slot to release */
|
|
|
|
void release_with_mutex(Slot* slot);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Prints info about the aio array.
|
|
|
|
@param[in,out] file Where to print */
|
|
|
|
void print(FILE* file);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** @return the number of slots per segment */
|
|
|
|
ulint slots_per_segment() const
|
2016-09-06 08:43:16 +02:00
|
|
|
MY_ATTRIBUTE((warn_unused_result))
|
2016-08-12 10:17:45 +02:00
|
|
|
{
|
|
|
|
return(m_slots.size() / m_n_segments);
|
|
|
|
}
|
2014-04-16 15:55:36 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** @return accessor for n_segments */
|
|
|
|
ulint get_n_segments() const
|
2016-09-06 08:43:16 +02:00
|
|
|
MY_ATTRIBUTE((warn_unused_result))
|
2016-08-12 10:17:45 +02:00
|
|
|
{
|
|
|
|
return(m_n_segments);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
/** @return true if the thread owns the mutex */
|
|
|
|
bool is_mutex_owned() const
|
2016-09-06 08:43:16 +02:00
|
|
|
MY_ATTRIBUTE((warn_unused_result))
|
2016-08-12 10:17:45 +02:00
|
|
|
{
|
|
|
|
return(mutex_own(&m_mutex));
|
|
|
|
}
|
|
|
|
#endif /* UNIV_DEBUG */
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Acquire the mutex */
|
|
|
|
void acquire() const
|
|
|
|
{
|
|
|
|
mutex_enter(&m_mutex);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
/** Release the mutex */
|
|
|
|
void release() const
|
|
|
|
{
|
|
|
|
mutex_exit(&m_mutex);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Write out the state to the file/stream
|
|
|
|
@param[in, out] file File to write to */
|
|
|
|
void to_file(FILE* file) const;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#ifdef LINUX_NATIVE_AIO
|
|
|
|
/** Dispatch an AIO request to the kernel.
|
|
|
|
@param[in,out] slot an already reserved slot
|
|
|
|
@return true on success. */
|
|
|
|
bool linux_dispatch(Slot* slot)
|
2016-09-06 08:43:16 +02:00
|
|
|
MY_ATTRIBUTE((warn_unused_result));
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Accessor for an AIO event
|
|
|
|
@param[in] index Index into the array
|
|
|
|
@return the event at the index */
|
|
|
|
io_event* io_events(ulint index)
|
2016-09-06 08:43:16 +02:00
|
|
|
MY_ATTRIBUTE((warn_unused_result))
|
2016-08-12 10:17:45 +02:00
|
|
|
{
|
|
|
|
ut_a(index < m_events.size());
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(&m_events[index]);
|
|
|
|
}
|
2013-12-19 13:36:38 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Accessor for the AIO context
|
|
|
|
@param[in] segment Segment for which to get the context
|
|
|
|
@return the AIO context for the segment */
|
|
|
|
io_context* io_ctx(ulint segment)
|
2016-09-06 08:43:16 +02:00
|
|
|
MY_ATTRIBUTE((warn_unused_result))
|
2016-08-12 10:17:45 +02:00
|
|
|
{
|
|
|
|
ut_ad(segment < get_n_segments());
|
|
|
|
|
|
|
|
return(m_aio_ctx[segment]);
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Creates an io_context for native linux AIO.
|
|
|
|
@param[in] max_events number of events
|
|
|
|
@param[out] io_ctx io_ctx to initialize.
|
|
|
|
@return true on success. */
|
|
|
|
static bool linux_create_io_ctx(ulint max_events, io_context_t* io_ctx)
|
2016-09-06 08:43:16 +02:00
|
|
|
MY_ATTRIBUTE((warn_unused_result));
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Checks if the system supports native linux aio. On some kernel
|
|
|
|
versions where native aio is supported it won't work on tmpfs. In such
|
|
|
|
cases we can't use native aio as it is not possible to mix simulated
|
|
|
|
and native aio.
|
|
|
|
@return true if supported, false otherwise. */
|
|
|
|
static bool is_linux_native_aio_supported()
|
2016-09-06 08:43:16 +02:00
|
|
|
MY_ATTRIBUTE((warn_unused_result));
|
2016-08-12 10:17:45 +02:00
|
|
|
#endif /* LINUX_NATIVE_AIO */
|
|
|
|
|
|
|
|
#ifdef WIN_ASYNC_IO
|
2016-09-19 14:31:20 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Wake up all AIO threads in Windows native aio */
|
2016-09-19 14:31:20 +02:00
|
|
|
static void wake_at_shutdown() {
|
|
|
|
PostQueuedCompletionStatus(completion_port, 0, IOCP_SHUTDOWN_KEY, NULL);
|
|
|
|
PostQueuedCompletionStatus(read_completion_port, 0, IOCP_SHUTDOWN_KEY, NULL);
|
2016-08-12 10:17:45 +02:00
|
|
|
}
|
|
|
|
#endif /* WIN_ASYNC_IO */
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#ifdef _WIN32
|
|
|
|
/** This function can be called if one wants to post a batch of reads
|
|
|
|
and prefers an I/O - handler thread to handle them all at once later.You
|
|
|
|
must call os_aio_simulated_wake_handler_threads later to ensure the
|
|
|
|
threads are not left sleeping! */
|
|
|
|
static void simulated_put_read_threads_to_sleep();
|
|
|
|
#endif /* _WIN32 */
|
|
|
|
|
|
|
|
/** Create an instance using new(std::nothrow)
|
|
|
|
@param[in] id Latch ID
|
|
|
|
@param[in] n_slots The number of AIO request slots
|
|
|
|
@param[in] segments The number of segments
|
|
|
|
@return a new AIO instance */
|
|
|
|
static AIO* create(
|
|
|
|
latch_id_t id,
|
|
|
|
ulint n_slots,
|
|
|
|
ulint segments)
|
2016-09-06 08:43:16 +02:00
|
|
|
MY_ATTRIBUTE((warn_unused_result));
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
/** Initializes the asynchronous io system. Creates one array each
|
|
|
|
for ibuf and log I/O. Also creates one array each for read and write
|
|
|
|
where each array is divided logically into n_readers and n_writers
|
|
|
|
respectively. The caller must create an i/o handler thread for each
|
|
|
|
segment in these arrays. This function also creates the sync array.
|
|
|
|
No I/O handler thread needs to be created for that
|
|
|
|
@param[in] n_per_seg maximum number of pending aio
|
|
|
|
operations allowed per segment
|
|
|
|
@param[in] n_readers number of reader threads
|
|
|
|
@param[in] n_writers number of writer threads
|
|
|
|
@param[in] n_slots_sync number of slots in the sync aio array
|
|
|
|
@return true if AIO sub-system was started successfully */
|
|
|
|
static bool start(
|
|
|
|
ulint n_per_seg,
|
|
|
|
ulint n_readers,
|
|
|
|
ulint n_writers,
|
|
|
|
ulint n_slots_sync)
|
2016-09-06 08:43:16 +02:00
|
|
|
MY_ATTRIBUTE((warn_unused_result));
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
/** Free the AIO arrays */
|
|
|
|
static void shutdown();
|
|
|
|
|
|
|
|
/** Print all the AIO segments
|
|
|
|
@param[in,out] file Where to print */
|
|
|
|
static void print_all(FILE* file);
|
|
|
|
|
|
|
|
/** Calculates local segment number and aio array from global
|
|
|
|
segment number.
|
|
|
|
@param[out] array AIO wait array
|
|
|
|
@param[in] segment global segment number
|
|
|
|
@return local segment number within the aio array */
|
|
|
|
static ulint get_array_and_local_segment(
|
|
|
|
AIO** array,
|
|
|
|
ulint segment)
|
2016-09-06 08:43:16 +02:00
|
|
|
MY_ATTRIBUTE((warn_unused_result));
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
/** Select the IO slot array
|
|
|
|
@param[in] type Type of IO, READ or WRITE
|
|
|
|
@param[in] read_only true if running in read-only mode
|
|
|
|
@param[in] mode IO mode
|
|
|
|
@return slot array or NULL if invalid mode specified */
|
|
|
|
static AIO* select_slot_array(
|
|
|
|
IORequest& type,
|
|
|
|
bool read_only,
|
|
|
|
ulint mode)
|
2016-09-06 08:43:16 +02:00
|
|
|
MY_ATTRIBUTE((warn_unused_result));
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
/** Calculates segment number for a slot.
|
|
|
|
@param[in] array AIO wait array
|
|
|
|
@param[in] slot slot in this array
|
|
|
|
@return segment number (which is the number used by, for example,
|
|
|
|
I/O handler threads) */
|
|
|
|
static ulint get_segment_no_from_slot(
|
|
|
|
const AIO* array,
|
|
|
|
const Slot* slot)
|
2016-09-06 08:43:16 +02:00
|
|
|
MY_ATTRIBUTE((warn_unused_result));
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
/** Wakes up a simulated AIO I/O-handler thread if it has something
|
|
|
|
to do.
|
|
|
|
@param[in] global_segment the number of the segment in the
|
|
|
|
AIO arrays */
|
|
|
|
static void wake_simulated_handler_thread(ulint global_segment);
|
|
|
|
|
|
|
|
/** Check if it is a read request
|
|
|
|
@param[in] aio The AIO instance to check
|
|
|
|
@return true if the AIO instance is for reading. */
|
|
|
|
static bool is_read(const AIO* aio)
|
2016-09-06 08:43:16 +02:00
|
|
|
MY_ATTRIBUTE((warn_unused_result))
|
2016-08-12 10:17:45 +02:00
|
|
|
{
|
|
|
|
return(s_reads == aio);
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Wait on an event until no pending writes */
|
|
|
|
static void wait_until_no_pending_writes()
|
|
|
|
{
|
|
|
|
os_event_wait(AIO::s_writes->m_is_empty);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Print to file
|
|
|
|
@param[in] file File to write to */
|
|
|
|
static void print_to_file(FILE* file);
|
|
|
|
|
|
|
|
/** Check for pending IO. Gets the count and also validates the
|
|
|
|
data structures.
|
|
|
|
@return count of pending IO requests */
|
|
|
|
static ulint total_pending_io_count();
|
|
|
|
|
|
|
|
private:
|
|
|
|
/** Initialise the slots
|
|
|
|
@return DB_SUCCESS or error code */
|
|
|
|
dberr_t init_slots()
|
2016-09-06 08:43:16 +02:00
|
|
|
MY_ATTRIBUTE((warn_unused_result));
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
/** Wakes up a simulated AIO I/O-handler thread if it has something
|
|
|
|
to do for a local segment in the AIO array.
|
|
|
|
@param[in] global_segment the number of the segment in the
|
|
|
|
AIO arrays
|
|
|
|
@param[in] segment the local segment in the AIO array */
|
|
|
|
void wake_simulated_handler_thread(ulint global_segment, ulint segment);
|
|
|
|
|
|
|
|
/** Prints pending IO requests per segment of an aio array.
|
|
|
|
We probably don't need per segment statistics but they can help us
|
|
|
|
during development phase to see if the IO requests are being
|
|
|
|
distributed as expected.
|
|
|
|
@param[in,out] file file where to print
|
|
|
|
@param[in] segments pending IO array */
|
|
|
|
void print_segment_info(
|
|
|
|
FILE* file,
|
|
|
|
const ulint* segments);
|
|
|
|
|
|
|
|
#ifdef LINUX_NATIVE_AIO
|
|
|
|
/** Initialise the Linux native AIO data structures
|
|
|
|
@return DB_SUCCESS or error code */
|
|
|
|
dberr_t init_linux_native_aio()
|
2016-09-06 08:43:16 +02:00
|
|
|
MY_ATTRIBUTE((warn_unused_result));
|
2016-08-12 10:17:45 +02:00
|
|
|
#endif /* LINUX_NATIVE_AIO */
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
private:
|
|
|
|
typedef std::vector<Slot> Slots;
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** the mutex protecting the aio array */
|
|
|
|
mutable SysMutex m_mutex;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Pointer to the slots in the array.
|
|
|
|
Number of elements must be divisible by n_threads. */
|
|
|
|
Slots m_slots;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Number of segments in the aio array of pending aio requests.
|
|
|
|
A thread can wait separately for any one of the segments. */
|
|
|
|
ulint m_n_segments;
|
2013-12-19 13:36:38 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** The event which is set to the signaled state when
|
2017-02-17 09:32:21 +01:00
|
|
|
there is space in the aio outside the ibuf segment;
|
|
|
|
os_event_set() and os_event_reset() are protected by AIO::m_mutex */
|
2016-08-12 10:17:45 +02:00
|
|
|
os_event_t m_not_full;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** The event which is set to the signaled state when
|
2017-02-17 09:32:21 +01:00
|
|
|
there are no pending i/os in this array;
|
|
|
|
os_event_set() and os_event_reset() are protected by AIO::m_mutex */
|
2016-08-12 10:17:45 +02:00
|
|
|
os_event_t m_is_empty;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Number of reserved slots in the AIO array outside
|
|
|
|
the ibuf segment */
|
|
|
|
ulint m_n_reserved;
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#if defined(LINUX_NATIVE_AIO)
|
|
|
|
typedef std::vector<io_event> IOEvents;
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** completion queue for IO. There is one such queue per
|
|
|
|
segment. Each thread will work on one ctx exclusively. */
|
|
|
|
io_context_t* m_aio_ctx;
|
2007-05-14 11:07:15 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** The array to collect completed IOs. There is one such
|
|
|
|
event for each possible pending IO. The size of the array
|
|
|
|
is equal to m_slots.size(). */
|
|
|
|
IOEvents m_events;
|
|
|
|
#endif /* LINUX_NATIV_AIO */
|
branches/innodb+: Merge revisions r5971:6130 from branches/zip.
------------------------------------------------------------------------
r5971 | marko | 2009-09-23 23:03:51 +1000 (Wed, 23 Sep 2009) | 2 lines
branches/zip: os_file_pwrite(): Make the code compile in InnoDB Hot Backup
when the pwrite system call is not available.
------------------------------------------------------------------------
r5972 | marko | 2009-09-24 05:44:52 +1000 (Thu, 24 Sep 2009) | 5 lines
branches/zip: fil_node_open_file(): In InnoDB Hot Backup,
determine the page size of single-file tablespaces before computing
the file node size. Otherwise, the space->size of compressed tablespaces
would be computed with UNIV_PAGE_SIZE instead of key_block_size.
This should fix Issue #313.
------------------------------------------------------------------------
r5973 | marko | 2009-09-24 05:53:21 +1000 (Thu, 24 Sep 2009) | 2 lines
branches/zip: recv_add_to_hash_table():
Simplify obfuscated pointer arithmetics.
------------------------------------------------------------------------
r5978 | marko | 2009-09-24 17:47:56 +1000 (Thu, 24 Sep 2009) | 1 line
branches/zip: Fix warnings and errors when UNIV_HOTBACKUP is defined.
------------------------------------------------------------------------
r5979 | marko | 2009-09-24 20:16:10 +1000 (Thu, 24 Sep 2009) | 4 lines
branches/zip: ha_innodb.cc: Define MYSQL_PLUGIN_IMPORT when necessary.
This preprocessor symbol has been recently introduced in MySQL 5.1.
The InnoDB Plugin should remain source compatible with MySQL 5.1.24
and later.
------------------------------------------------------------------------
r5988 | calvin | 2009-09-26 05:14:43 +1000 (Sat, 26 Sep 2009) | 8 lines
branches/zip: fix bug#47055 unconditional exit(1) on ERROR_WORKING_SET_QUOTA
1453 (0x5AD) for InnoDB backend
When error ERROR_WORKING_SET_QUOTA or ERROR_NO_SYSTEM_RESOURCES
occurs, yields for 100ms and retries the operation.
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r5992 | vasil | 2009-09-28 17:10:29 +1000 (Mon, 28 Sep 2009) | 4 lines
branches/zip:
Add ChangeLog entry for c5988.
------------------------------------------------------------------------
r5994 | marko | 2009-09-28 18:33:59 +1000 (Mon, 28 Sep 2009) | 17 lines
branches/zip: Try to prevent the reuse of tablespace identifiers after
InnoDB has crashed during table creation. Also, refuse to start if
files with duplicate tablespace identifiers are encountered.
fil_node_create(): Update fil_system->max_assigned_id. This should
prevent the reuse of a space->id when InnoDB does a full crash
recovery and invokes fil_load_single_table_tablespaces(). Normally,
fil_system->max_assigned_id is initialized from
SELECT MAX(ID) FROM SYS_TABLES.
fil_open_single_table_tablespace(): Return FALSE when
fil_space_create() fails.
fil_load_single_table_tablespace(): Exit if fil_space_create() fails
and innodb_force_recovery=0.
rb://173 approved by Heikki Tuuri. This addresses Issue #335.
------------------------------------------------------------------------
r5995 | marko | 2009-09-28 18:52:25 +1000 (Mon, 28 Sep 2009) | 17 lines
branches/zip: Do not write to PAGE_INDEX_ID after page creation,
not even when restoring an uncompressed page after a compression failure.
btr_page_reorganize_low(): On compression failure, do not restore
those page header fields that should not be affected by the
reorganization. Instead, compare the fields.
page_zip_decompress(): Add the parameter ibool all, for copying all
page header fields. Pass the parameter all=TRUE on block read
completion, redo log application, and page_zip_validate(); pass
all=FALSE in all other cases.
page_zip_reorganize(): Do not restore the uncompressed page on
failure. It will be restored (to pre-modification state) by the
caller anyway.
rb://167, Issue #346
------------------------------------------------------------------------
r5996 | marko | 2009-09-28 22:46:02 +1000 (Mon, 28 Sep 2009) | 4 lines
branches/zip: Address Issue #350 in comments.
lock_rec_queue_validate(), lock_rec_queue_validate(): Note that
this debug code may violate the latching order and cause deadlocks.
------------------------------------------------------------------------
r5997 | marko | 2009-09-28 23:03:58 +1000 (Mon, 28 Sep 2009) | 12 lines
branches/zip: Remove an assertion failure when the InnoDB data dictionary
is inconsistent with the MySQL .frm file.
ha_innobase::index_read(): When the index cannot be found,
return an error.
ha_innobase::change_active_index(): When prebuilt->index == NULL,
set also prebuilt->index_usable = FALSE. This is not needed for
correctness, because prebuilt->index_usable is only checked by
row_search_for_mysql(), which requires prebuilt->index != NULL.
This addresses Issue #349. Approved by Heikki Tuuri over IM.
------------------------------------------------------------------------
r6005 | vasil | 2009-09-29 18:09:52 +1000 (Tue, 29 Sep 2009) | 4 lines
branches/zip:
ChangeLog: wrap around 78th column, not earlier.
------------------------------------------------------------------------
r6006 | vasil | 2009-09-29 20:15:25 +1000 (Tue, 29 Sep 2009) | 4 lines
branches/zip:
Add ChangeLog entry for the release of 1.0.4.
------------------------------------------------------------------------
r6007 | vasil | 2009-09-29 23:19:59 +1000 (Tue, 29 Sep 2009) | 6 lines
branches/zip:
Fix the year, should be 2009.
Pointed by: Calvin
------------------------------------------------------------------------
r6026 | marko | 2009-09-30 17:18:24 +1000 (Wed, 30 Sep 2009) | 1 line
branches/zip: Add some debug assertions for checking FSEG_MAGIC_N.
------------------------------------------------------------------------
r6028 | marko | 2009-09-30 23:55:23 +1000 (Wed, 30 Sep 2009) | 3 lines
branches/zip: recv_no_log_write: New debug flag for tracking down
Mantis Issue #347. No modifications should be made to the database
while recv_apply_hashed_log_recs() is about to complete.
------------------------------------------------------------------------
r6029 | calvin | 2009-10-01 06:32:02 +1000 (Thu, 01 Oct 2009) | 4 lines
branches/zip: non-functional changes
Fix typo.
------------------------------------------------------------------------
r6031 | marko | 2009-10-01 21:24:33 +1000 (Thu, 01 Oct 2009) | 49 lines
branches/zip: Clean up after a crash during DROP INDEX.
When InnoDB crashes while dropping an index, ensure that
the index will be completely dropped during crash recovery.
row_merge_drop_index(): Before dropping an index, rename the index to
start with TEMP_INDEX_PREFIX_STR and commit the change, so that
row_merge_drop_temp_indexes() will drop the index after crash
recovery if the server crashes while dropping the index.
fseg_inode_try_get(): New function, forked from fseg_inode_get().
Return NULL if the file segment index node is free.
fseg_inode_get(): Assert that the file segment index node is not free.
fseg_free_step(): If the file segment index node is already free,
print a diagnostic message and return TRUE.
fsp_free_seg_inode(): Write a nonzero number to FSEG_MAGIC_N, so that
allocated-and-freed file segment index nodes can be better
distinguished from uninitialized ones.
This is rb://174, addressing Issue #348.
Tested by restarting mysqld upon the completion of the added
log_write_up_to() invocation below, during DROP INDEX. The index was
dropped after crash recovery, and re-issuing the DROP INDEX did not
crash the server.
Index: btr/btr0btr.c
===================================================================
--- btr/btr0btr.c (revision 6026)
+++ btr/btr0btr.c (working copy)
@@ -42,6 +42,7 @@ Created 6/2/1994 Heikki Tuuri
#include "ibuf0ibuf.h"
#include "trx0trx.h"
+#include "log0log.h"
/*
Latching strategy of the InnoDB B-tree
--------------------------------------
@@ -873,6 +874,8 @@ leaf_loop:
goto leaf_loop;
}
+
+ log_write_up_to(mtr.end_lsn, LOG_WAIT_ALL_GROUPS, TRUE);
top_loop:
mtr_start(&mtr);
------------------------------------------------------------------------
r6033 | calvin | 2009-10-02 06:19:46 +1000 (Fri, 02 Oct 2009) | 4 lines
branches/zip: fix a typo in error message
Reported as bug#47763.
------------------------------------------------------------------------
r6043 | inaam | 2009-10-06 01:45:35 +1100 (Tue, 06 Oct 2009) | 12 lines
branches/zip rb://176
Do not invalidate buffer pool while an LRU batch is active. Added
code to buf_pool_invalidate() to wait for the running batches to finish.
This patch also resets the state of buf_pool struct at invalidation. This
addresses the concern where buf_pool->freed_page_clock becomes non-zero
because we read in a system tablespace page for file format info at
startup.
Approved by: Marko
------------------------------------------------------------------------
r6044 | pekka | 2009-10-07 01:44:54 +1100 (Wed, 07 Oct 2009) | 5 lines
branches/zip:
Add os_file_is_same() function for Hot Backup (inside ifdef UNIV_HOTBACKUP).
This is part of the fix for Issue #186.
Note! The Windows implementation is incomplete.
------------------------------------------------------------------------
r6046 | pekka | 2009-10-08 20:24:56 +1100 (Thu, 08 Oct 2009) | 3 lines
branches/zip: Revert r6044 which added os_file_is_same() function
(issue#186). This functionality is moved to Hot Backup source tree.
------------------------------------------------------------------------
r6048 | vasil | 2009-10-09 16:42:55 +1100 (Fri, 09 Oct 2009) | 16 lines
branches/zip:
When scanning a directory readdir() is called and stat() after it,
if a file is deleted between the two calls stat will fail and the
whole precedure will fail. Change this behavior to continue with the
next entry if stat() fails because of nonexistent file. This is
transparent change as it will make it look as if the file was deleted
before the readdir() call.
This change is needed in order to fix
https://svn.innodb.com/mantis/view.php?id=174
in which we need to abort if os_file_readdir_next_file()
encounters "real" errors.
Approved by: Marko, Pekka (rb://177)
------------------------------------------------------------------------
r6049 | vasil | 2009-10-10 03:05:26 +1100 (Sat, 10 Oct 2009) | 7 lines
branches/zip:
Fix compilation warning in Hot Backup:
innodb/fil/fil0fil.c: In function 'fil_load_single_table_tablespace':
innodb/fil/fil0fil.c:3253: warning: format '%lld' expects type 'long long int', but argument 6 has type 'ib_int64_t'
------------------------------------------------------------------------
r6064 | calvin | 2009-10-14 02:23:35 +1100 (Wed, 14 Oct 2009) | 4 lines
branches/zip: non-functional changes
Changes from MySQL to fix build issue.
------------------------------------------------------------------------
r6065 | inaam | 2009-10-14 04:43:13 +1100 (Wed, 14 Oct 2009) | 7 lines
branches/zip rb://182
Call fsync() on datafiles after a batch of pages is written to disk
even when skip_innodb_doublewrite is set.
Approved by: Heikki
------------------------------------------------------------------------
r6080 | sunny | 2009-10-15 09:29:01 +1100 (Thu, 15 Oct 2009) | 3 lines
branches/zip: Change page_mem_alloc_free() to inline.
Fix Bug #47058 - Failure to compile innodb_plugin on solaris 10u7 + spro cc/CC 5.10
------------------------------------------------------------------------
r6084 | vasil | 2009-10-15 16:21:17 +1100 (Thu, 15 Oct 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r6080.
------------------------------------------------------------------------
r6095 | vasil | 2009-10-20 00:04:59 +1100 (Tue, 20 Oct 2009) | 7 lines
branches/zip:
Fix Bug#47808 innodb_information_schema.test fails when run under valgrind
by using the wait_until_rows_count macro that loops until the number of
rows becomes 14 instead of sleep 0.1, which is obviously very fragile.
------------------------------------------------------------------------
r6096 | vasil | 2009-10-20 00:06:09 +1100 (Tue, 20 Oct 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r6095.
------------------------------------------------------------------------
r6099 | jyang | 2009-10-22 13:58:39 +1100 (Thu, 22 Oct 2009) | 7 lines
branches/zip: Port bug #46000 related changes from 5.1 to zip
branch. Due to different code path for creating index in zip
branch comparing to 5.1), the index reserved name check function
is extended to be used in ha_innobase::add_index().
rb://190 Approved by: Marko
------------------------------------------------------------------------
r6100 | jyang | 2009-10-22 14:51:07 +1100 (Thu, 22 Oct 2009) | 6 lines
branches/zip: As a request from mysql, WARN_LEVEL_ERROR cannot
be used for push_warning_* call any more. Switch to
WARN_LEVEL_WARN. Bug #47233.
rb://172 approved by Sunny Bains and Marko.
------------------------------------------------------------------------
r6101 | jyang | 2009-10-23 19:45:50 +1100 (Fri, 23 Oct 2009) | 7 lines
branches/zip: Update test result with the WARN_LEVEL_ERROR
to WARN_LEVEL_WARN change. This is the same result as
submitted in rb://172 review, which approved by Sunny Bains
and Marko.
------------------------------------------------------------------------
r6102 | marko | 2009-10-26 18:32:23 +1100 (Mon, 26 Oct 2009) | 1 line
branches/zip: row_prebuilt_struct::prebuilts: Unused field, remove.
------------------------------------------------------------------------
r6103 | marko | 2009-10-27 00:46:18 +1100 (Tue, 27 Oct 2009) | 4 lines
branches/zip: row_ins_alloc_sys_fields(): Zero out the system columns
DB_TRX_ID, DB_ROLL_PTR and DB_ROW_ID, in order to avoid harmless
Valgrind warnings about uninitialized data. (The warnings were
harmless, because the fields would be initialized at a later stage.)
------------------------------------------------------------------------
r6105 | calvin | 2009-10-28 09:05:52 +1100 (Wed, 28 Oct 2009) | 6 lines
branches/zip: backport r3848 from 6.0 branch
----
branches/6.0: innobase_start_or_create_for_mysql(): Make the 10 MB
minimum tablespace limit independent of UNIV_PAGE_SIZE. (Bug #41490)
------------------------------------------------------------------------
r6107 | marko | 2009-10-29 01:10:34 +1100 (Thu, 29 Oct 2009) | 5 lines
branches/zip: buf_page_set_old(): Improve UNIV_LRU_DEBUG diagnostics
in order to catch the buf_pool->LRU_old corruption reported in Issue #381.
buf_LRU_old_init(): Set the property from the tail towards the front
of the buf_pool->LRU list, in order not to trip the debug check.
------------------------------------------------------------------------
r6108 | calvin | 2009-10-29 16:58:04 +1100 (Thu, 29 Oct 2009) | 5 lines
branches/zip: close file handle when building with UNIV_HOTBACKUP
The change does not affect regular InnoDB engine. Confirmed by
Marko.
------------------------------------------------------------------------
r6109 | jyang | 2009-10-29 19:37:32 +1100 (Thu, 29 Oct 2009) | 7 lines
branches/zip: In os_mem_alloc_large(), if we fail to attach
the shared memory, reset memory pointer ptr to NULL, and
allocate memory from conventional pool.
Bug #48237 Error handling in os_mem_alloc_large appears to be incorrect
rb://198 Approved by: Marko
------------------------------------------------------------------------
r6110 | marko | 2009-10-29 21:44:57 +1100 (Thu, 29 Oct 2009) | 2 lines
branches/zip: Makefile.am (INCLUDES): Merge a change from MySQL:
Use $(srcdir)/include instead of $(top_srcdir)/storage/innobase/include.
------------------------------------------------------------------------
r6111 | marko | 2009-10-29 22:04:11 +1100 (Thu, 29 Oct 2009) | 33 lines
branches/zip: Fix corruption of buf_pool->LRU_old and improve debug assertions.
This was reported as Issue #381.
buf_page_set_old(): Assert that blocks may only be set old if
buf_pool->LRU_old is initialized and buf_pool->LRU_old_len is nonzero.
Assert that buf_pool->LRU_old points to the block at the old/new boundary.
buf_LRU_old_adjust_len(): Invoke buf_page_set_old() after adjusting
buf_pool->LRU_old and buf_pool->LRU_old_len, in order not to violate
the added assertions.
buf_LRU_old_init(): Replace buf_page_set_old() with a direct
assignment to bpage->old, because these loops that initialize all the
blocks would temporarily violate the assertions about
buf_pool->LRU_old.
buf_LRU_remove_block(): When setting buf_pool->LRU_old = NULL, also
clear all bpage->old flags and set buf_pool->LRU_old_len = 0.
buf_LRU_add_block_to_end_low(), buf_LRU_add_block_low(): Move the
buf_page_set_old() call later in order not to violate the debug
assertions. If buf_pool->LRU_old is NULL, set old=FALSE.
buf_LRU_free_block(): Replace the UNIV_LRU_DEBUG assertion with a
dummy buf_page_set_old() call that performs more thorough checks.
buf_LRU_validate(): Do not tolerate garbage in buf_pool->LRU_old_len
even if buf_pool->LRU_old is NULL. Check that bpage->old is monotonic.
buf_relocate(): Make the UNIV_LRU_DEBUG checks stricter.
buf0buf.h: Revise the documentation of buf_page_t::old and
buf_pool_t::LRU_old_len.
------------------------------------------------------------------------
r6112 | calvin | 2009-10-30 01:21:15 +1100 (Fri, 30 Oct 2009) | 4 lines
branches/zip: consideration for icc compilers
Proposed by MySQL, and approved by Marko.
------------------------------------------------------------------------
r6113 | vasil | 2009-10-30 03:15:50 +1100 (Fri, 30 Oct 2009) | 93 lines
branches/zip: Merge r5912:6112 from branches/5.1:
(after this merge the innodb-autoinc test starts to fail, but
I commit anyway because it would be easier to investigate the
failure this way)
------------------------------------------------------------------------
r5952 | calvin | 2009-09-22 19:45:07 +0300 (Tue, 22 Sep 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: fix bug#42383: Can't create table 'test.bug39438'
For embedded server, MySQL may pass in full path, which is
currently disallowed. It is needed to relax the condition by
accepting full paths in the embedded case.
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r6032 | vasil | 2009-10-01 15:55:49 +0300 (Thu, 01 Oct 2009) | 8 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Fix Bug#38996 Race condition in ANALYZE TABLE
by serializing ANALYZE TABLE inside InnoDB.
Approved by: Heikki (rb://175)
------------------------------------------------------------------------
r6045 | jyang | 2009-10-08 02:27:08 +0300 (Thu, 08 Oct 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug47777.result
A /branches/5.1/mysql-test/innodb_bug47777.test
branches/5.1: Fix bug #47777. Treat the Geometry data same as
Binary BLOB in ha_innobase::store_key_val_for_row(), since the
Geometry data is stored as Binary BLOB in Innodb.
Review: rb://180 approved by Marko Makela.
------------------------------------------------------------------------
r6051 | sunny | 2009-10-12 07:05:00 +0300 (Mon, 12 Oct 2009) | 6 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Ignore negative values supplied by the user when calculating the
next value to store in dict_table_t. Setting autoincrement columns top negative
values is undefined behavior and this change should bring the behavior of
InnoDB closer to what users expect. Added several tests to check.
rb://162
------------------------------------------------------------------------
r6052 | sunny | 2009-10-12 07:09:56 +0300 (Mon, 12 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Reset the statement level autoinc counter on ROLLBACK. Fix
the test results too.
rb://164
------------------------------------------------------------------------
r6053 | sunny | 2009-10-12 07:37:49 +0300 (Mon, 12 Oct 2009) | 6 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Copy the maximum AUTOINC value from the old table to the new
table when MySQL does a CREATE INDEX ON T. This is required because MySQL
does a table copy, rename and drops the old table.
Fix Bug#47125: auto_increment start value is ignored if an index is created and engine=innodb
rb://168
------------------------------------------------------------------------
r6076 | vasil | 2009-10-14 19:30:12 +0300 (Wed, 14 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/row/row0mysql.c
branches/5.1:
Fix typo.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6114 | vasil | 2009-10-30 03:43:51 +1100 (Fri, 30 Oct 2009) | 6 lines
branches/zip:
* Add ChangeLog entries for latest changes
* Obey alphabetical order in the list of the files
* White-space fixup
------------------------------------------------------------------------
r6121 | sunny | 2009-10-30 10:42:11 +1100 (Fri, 30 Oct 2009) | 7 lines
branches/zip: This test has been problematic for sometime now. The underlying
bug is that the data dictionaries get out of sync. In the AUTOINC code we
try and apply salve to the symptoms. In the past MySQL made some unrelated
change and the dictionaries stopped getting out of sync and this test started
to fail. Now, it seems they have reverted that changed and the test is
passing again. I suspect this is not he last time that this test will change.
------------------------------------------------------------------------
r6124 | jyang | 2009-10-30 19:02:31 +1100 (Fri, 30 Oct 2009) | 5 lines
branches/zip: Correct the bug number for -r6109 change
from # 48273 to #48237
------------------------------------------------------------------------
r6126 | vasil | 2009-10-30 19:36:07 +1100 (Fri, 30 Oct 2009) | 45 lines
branches/zip: Merge r6112:6125 from branches/5.1:
(skipping r6122 and r6123, Jimmy says these are already present and need
not be merged):
------------------------------------------------------------------------
r6122 | jyang | 2009-10-30 05:18:38 +0200 (Fri, 30 Oct 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb_bug44369.result
M /branches/5.1/mysql-test/innodb_bug44369.test
M /branches/5.1/mysql-test/innodb_bug46000.result
M /branches/5.1/mysql-test/innodb_bug46000.test
branches/5.1: Chnage WARN_LEVEL_ERROR to WARN_LEVEL_WARN
for push_warning_printf() call in innodb.
Fix Bug#47233: Innodb calls push_warning(MYSQL_ERROR::WARN_LEVEL_ERROR)
rb://170 approved by Marko.
------------------------------------------------------------------------
r6123 | jyang | 2009-10-30 05:43:06 +0200 (Fri, 30 Oct 2009) | 8 lines
Changed paths:
M /branches/5.1/os/os0proc.c
branches/5.1: In os_mem_alloc_large(), if we fail to attach
the shared memory, reset memory pointer ptr to NULL, and
allocate memory from conventional pool. This is a port
from branches/zip.
Bug #48237 Error handling in os_mem_alloc_large appears to be incorrect
rb://198 Approved by: Marko
------------------------------------------------------------------------
r6125 | vasil | 2009-10-30 10:31:23 +0200 (Fri, 30 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
White-space fixup.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6130 | marko | 2009-11-02 20:42:56 +1100 (Mon, 02 Nov 2009) | 9 lines
branches/zip: Free all resources at shutdown. Set pointers to NULL, so
that Valgrind will not complain about freed data structures that are
reachable via pointers. This addresses Bug #45992 and Bug #46656.
This patch is mostly based on changes copied from branches/embedded-1.0,
mainly c5432, c3439, c3134, c2994, c2978, but also some other code was
copied. Some added cleanup code is specific to MySQL/InnoDB.
rb://199 approved by Sunny Bains
------------------------------------------------------------------------
2009-11-04 07:02:00 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** The aio arrays for non-ibuf i/o and ibuf i/o, as well as
|
|
|
|
sync AIO. These are NULL when the module has not yet been
|
|
|
|
initialized. */
|
branches/innodb+: Merge revisions 6130:6364 from branches/zip:
------------------------------------------------------------------------
r6130 | marko | 2009-11-02 11:42:56 +0200 (Mon, 02 Nov 2009) | 9 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/btr/btr0sea.c
M /branches/zip/buf/buf0buf.c
M /branches/zip/dict/dict0dict.c
M /branches/zip/fil/fil0fil.c
M /branches/zip/ibuf/ibuf0ibuf.c
M /branches/zip/include/btr0sea.h
M /branches/zip/include/dict0dict.h
M /branches/zip/include/fil0fil.h
M /branches/zip/include/ibuf0ibuf.h
M /branches/zip/include/lock0lock.h
M /branches/zip/include/log0log.h
M /branches/zip/include/log0recv.h
M /branches/zip/include/mem0mem.h
M /branches/zip/include/mem0pool.h
M /branches/zip/include/os0file.h
M /branches/zip/include/pars0pars.h
M /branches/zip/include/srv0srv.h
M /branches/zip/include/thr0loc.h
M /branches/zip/include/trx0i_s.h
M /branches/zip/include/trx0purge.h
M /branches/zip/include/trx0rseg.h
M /branches/zip/include/trx0sys.h
M /branches/zip/include/trx0undo.h
M /branches/zip/include/usr0sess.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/log/log0recv.c
M /branches/zip/mem/mem0dbg.c
M /branches/zip/mem/mem0pool.c
M /branches/zip/os/os0file.c
M /branches/zip/os/os0sync.c
M /branches/zip/os/os0thread.c
M /branches/zip/pars/lexyy.c
M /branches/zip/pars/pars0lex.l
M /branches/zip/que/que0que.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
M /branches/zip/sync/sync0arr.c
M /branches/zip/sync/sync0sync.c
M /branches/zip/thr/thr0loc.c
M /branches/zip/trx/trx0i_s.c
M /branches/zip/trx/trx0purge.c
M /branches/zip/trx/trx0rseg.c
M /branches/zip/trx/trx0sys.c
M /branches/zip/trx/trx0undo.c
M /branches/zip/usr/usr0sess.c
M /branches/zip/ut/ut0mem.c
branches/zip: Free all resources at shutdown. Set pointers to NULL, so
that Valgrind will not complain about freed data structures that are
reachable via pointers. This addresses Bug #45992 and Bug #46656.
This patch is mostly based on changes copied from branches/embedded-1.0,
mainly c5432, c3439, c3134, c2994, c2978, but also some other code was
copied. Some added cleanup code is specific to MySQL/InnoDB.
rb://199 approved by Sunny Bains
------------------------------------------------------------------------
r6134 | marko | 2009-11-04 09:57:29 +0200 (Wed, 04 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
branches/zip: innobase_convert_identifier(): Convert table names with
explain_filename() to address Bug #32430: 'show innodb status'
causes errors Invalid (old?) table or database name in logs.
rb://134 approved by Sunny Bains
------------------------------------------------------------------------
r6137 | marko | 2009-11-04 15:24:28 +0200 (Wed, 04 Nov 2009) | 1 line
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_index_too_big_for_undo(): Correct a typo.
------------------------------------------------------------------------
r6153 | vasil | 2009-11-10 15:33:22 +0200 (Tue, 10 Nov 2009) | 145 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Merge r6125:6152 from branches/5.1:
(everything except the last white-space change was skipped as it is already
in branches/zip)
------------------------------------------------------------------------
r6127 | vasil | 2009-10-30 11:18:25 +0200 (Fri, 30 Oct 2009) | 18 lines
Changed paths:
M /branches/5.1/Makefile.am
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1:
Backport c6121 from branches/zip:
------------------------------------------------------------------------
r6121 | sunny | 2009-10-30 01:42:11 +0200 (Fri, 30 Oct 2009) | 7 lines
Changed paths:
M /branches/zip/mysql-test/innodb-autoinc.result
branches/zip: This test has been problematic for sometime now. The underlying
bug is that the data dictionaries get out of sync. In the AUTOINC code we
try and apply salve to the symptoms. In the past MySQL made some unrelated
change and the dictionaries stopped getting out of sync and this test started
to fail. Now, it seems they have reverted that changed and the test is
passing again. I suspect this is not he last time that this test will change.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6129 | vasil | 2009-10-30 17:14:22 +0200 (Fri, 30 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/Makefile.am
branches/5.1:
Revert a change to Makefile.am that sneaked unnoticed in c6127.
------------------------------------------------------------------------
r6136 | marko | 2009-11-04 12:28:10 +0200 (Wed, 04 Nov 2009) | 15 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/ha_prototypes.h
M /branches/5.1/ut/ut0ut.c
branches/5.1: Port r6134 from branches/zip:
------------------------------------------------------------------------
r6134 | marko | 2009-11-04 07:57:29 +0000 (Wed, 04 Nov 2009) | 5 lines
branches/zip: innobase_convert_identifier(): Convert table names with
explain_filename() to address Bug #32430: 'show innodb status'
causes errors Invalid (old?) table or database name in logs.
rb://134 approved by Sunny Bains
------------------------------------------------------------------------
innobase_print_identifier(): Replace with innobase_convert_name().
innobase_convert_identifier(): New function, called by innobase_convert_name().
------------------------------------------------------------------------
r6149 | vasil | 2009-11-09 11:15:01 +0200 (Mon, 09 Nov 2009) | 5 lines
Changed paths:
M /branches/5.1/CMakeLists.txt
branches/5.1:
Followup to r5700: Adjust the changes so they are the same as in the BZR
repository.
------------------------------------------------------------------------
r6150 | vasil | 2009-11-09 11:43:31 +0200 (Mon, 09 Nov 2009) | 58 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Merge a part of r2911.5.5 from MySQL:
(the other part of this was merged in c5700)
------------------------------------------------------------
revno: 2911.5.5
committer: Vladislav Vaintroub <vvaintroub@mysql.com>
branch nick: 5.1-innodb_plugin
timestamp: Wed 2009-06-10 10:59:49 +0200
message:
Backport WL#3653 to 5.1 to enable bundled innodb plugin.
Remove custom DLL loader code from innodb plugin code, use
symbols exported from mysqld.
removed:
storage/innodb_plugin/handler/handler0vars.h
storage/innodb_plugin/handler/win_delay_loader.cc
added:
storage/mysql_storage_engine.cmake
win/create_def_file.js
modified:
CMakeLists.txt
include/m_ctype.h
include/my_global.h
include/my_sys.h
include/mysql/plugin.h
libmysqld/CMakeLists.txt
mysql-test/mysql-test-run.pl
mysql-test/t/plugin.test
mysql-test/t/plugin_load-master.opt
mysys/charset.c
sql/CMakeLists.txt
sql/handler.h
sql/mysql_priv.h
sql/mysqld.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_list.h
sql/sql_profile.h
storage/Makefile.am
storage/archive/CMakeLists.txt
storage/blackhole/CMakeLists.txt
storage/csv/CMakeLists.txt
storage/example/CMakeLists.txt
storage/federated/CMakeLists.txt
storage/heap/CMakeLists.txt
storage/innobase/CMakeLists.txt
storage/innobase/handler/ha_innodb.cc
storage/innodb_plugin/CMakeLists.txt
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/handler0alter.cc
storage/innodb_plugin/handler/i_s.cc
storage/innodb_plugin/plug.in
storage/myisam/CMakeLists.txt
storage/myisammrg/CMakeLists.txt
win/Makefile.am
win/configure.js
------------------------------------------------------------------------
r6152 | vasil | 2009-11-10 15:30:20 +0200 (Tue, 10 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
White space fixup.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6157 | jyang | 2009-11-11 14:27:09 +0200 (Wed, 11 Nov 2009) | 10 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
A /branches/zip/mysql-test/innodb_bug47167.result
A /branches/zip/mysql-test/innodb_bug47167.test
M /branches/zip/mysql-test/innodb_file_format.result
branches/zip: Fix an issue that a local variable defined
in innodb_file_format_check_validate() is being referenced
across function in innodb_file_format_check_update().
In addition, fix "set global innodb_file_format_check =
DEFAULT" call.
Bug #47167: "set global innodb_file_format_check" cannot
set value by User-Defined Variable."
rb://169 approved by Sunny Bains and Marko.
------------------------------------------------------------------------
r6159 | vasil | 2009-11-11 15:13:01 +0200 (Wed, 11 Nov 2009) | 37 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
branches/zip:
Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)
------------------------------------------------------------
revno: 3092.5.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-09-24 15:52:52 +0100
message:
BUG#42829: binlogging enabled for all schemas regardless of
binlog-db-db / binlog-ignore-db
InnoDB will return an error if statement based replication is used
along with transaction isolation level READ-COMMITTED (or weaker),
even if the statement in question is filtered out according to the
binlog-do-db rules set. In this case, an error should not be printed.
This patch addresses this issue by extending the existing check in
external_lock to take into account the filter rules before deciding to
print an error. Furthermore, it also changes decide_logging_format to
take into consideration whether the statement is filtered out from
binlog before decision is made.
added:
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
modified:
sql/sql_base.cc
sql/sql_class.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
------------------------------------------------------------------------
r6160 | vasil | 2009-11-11 15:33:49 +0200 (Wed, 11 Nov 2009) | 72 lines
Changed paths:
M /branches/zip/include/os0file.h
M /branches/zip/os/os0file.c
branches/zip: Merge r6152:6159 from branches/5.1:
(r6158 was skipped as an equivallent change has already been merged from MySQL)
------------------------------------------------------------------------
r6154 | calvin | 2009-11-11 02:51:17 +0200 (Wed, 11 Nov 2009) | 17 lines
Changed paths:
M /branches/5.1/include/os0file.h
M /branches/5.1/os/os0file.c
branches/5.1: fix bug#3139: Mysql crashes: 'windows error 995'
after several selects on a large DB
During stress environment, Windows AIO may fail with error code
ERROR_OPERATION_ABORTED. InnoDB does not handle the error, rather
crashes. The cause of the error is unknown, but likely due to
faulty hardware or driver.
This patch introduces a new error code OS_FILE_OPERATION_ABORTED,
which maps to Windows ERROR_OPERATION_ABORTED (995). When the error
is detected during AIO, the InnoDB will issue a synchronous retry
(read/write).
This patch has been extensively tested by MySQL support.
Approved by: Marko
rb://196
------------------------------------------------------------------------
r6158 | vasil | 2009-11-11 14:52:14 +0200 (Wed, 11 Nov 2009) | 37 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/handler/ha_innodb.h
branches/5.1:
Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)
------------------------------------------------------------
revno: 3092.5.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-09-24 15:52:52 +0100
message:
BUG#42829: binlogging enabled for all schemas regardless of
binlog-db-db / binlog-ignore-db
InnoDB will return an error if statement based replication is used
along with transaction isolation level READ-COMMITTED (or weaker),
even if the statement in question is filtered out according to the
binlog-do-db rules set. In this case, an error should not be printed.
This patch addresses this issue by extending the existing check in
external_lock to take into account the filter rules before deciding to
print an error. Furthermore, it also changes decide_logging_format to
take into consideration whether the statement is filtered out from
binlog before decision is made.
added:
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
modified:
sql/sql_base.cc
sql/sql_class.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
------------------------------------------------------------------------
------------------------------------------------------------------------
r6161 | vasil | 2009-11-11 15:36:16 +0200 (Wed, 11 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add changelog entry for r6160.
------------------------------------------------------------------------
r6162 | vasil | 2009-11-11 16:00:12 +0200 (Wed, 11 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog for r6157.
------------------------------------------------------------------------
r6163 | calvin | 2009-11-11 17:53:20 +0200 (Wed, 11 Nov 2009) | 8 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
branches/zip: Exclude thd_binlog_filter_ok() when building
with older version of MySQL.
thd_binlog_filter_ok() is introduced in MySQL 5.1.41. But the
plugin can be built with MySQL prior to 5.1.41.
Approved by Heikki (on IM).
------------------------------------------------------------------------
r6169 | calvin | 2009-11-12 14:40:43 +0200 (Thu, 12 Nov 2009) | 6 lines
Changed paths:
A /branches/zip/mysql-test/innodb_bug46676.result
A /branches/zip/mysql-test/innodb_bug46676.test
branches/zip: add test case for bug#46676
This crash is reproducible with InnoDB plugin 1.0.4 + MySQL 5.1.37.
But no longer reproducible after MySQL 5.1.38 (with plugin 1.0.5).
Add test case to catch future regression.
------------------------------------------------------------------------
r6170 | marko | 2009-11-12 15:49:08 +0200 (Thu, 12 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/db0err.h
M /branches/zip/row/row0merge.c
M /branches/zip/row/row0mysql.c
branches/zip: Allow CREATE INDEX to be interrupted. (Issue #354)
rb://183 approved by Heikki Tuuri
------------------------------------------------------------------------
r6175 | vasil | 2009-11-16 20:07:39 +0200 (Mon, 16 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Wrap line at 78th char in the ChangeLog
------------------------------------------------------------------------
r6177 | calvin | 2009-11-16 20:20:38 +0200 (Mon, 16 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip: add an entry to ChangeLog for r6065
------------------------------------------------------------------------
r6179 | marko | 2009-11-17 10:19:34 +0200 (Tue, 17 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: ha_innobase::change_active_index(): When the history is
missing, report it to the client, not to the error log.
------------------------------------------------------------------------
r6181 | vasil | 2009-11-17 12:21:41 +0200 (Tue, 17 Nov 2009) | 33 lines
Changed paths:
M /branches/zip/mysql-test/innodb-index.test
branches/zip:
At the end of innodb-index.test: restore the environment as it was before
the test was started to silence this warning:
MTR's internal check of the test case 'main.innodb-index' failed.
This means that the test case does not preserve the state that existed
before the test case was executed. Most likely the test case did not
do a proper clean-up.
This is the diff of the states of the servers before and after the
test case was executed:
mysqltest: Logging to '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.log'.
mysqltest: Results saved in '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result'.
mysqltest: Connecting to server localhost:13000 (socket /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/mysqld.1.sock) as 'root', connection 'default', attempt 0 ...
mysqltest: ... Connected.
mysqltest: Start processing test commands from './include/check-testcase.test' ...
mysqltest: ... Done processing test commands.
--- /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result 2009-11-17 13:10:40.000000000 +0300
+++ /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.reject 2009-11-17 13:10:54.000000000 +0300
@@ -84,7 +84,7 @@
INNODB_DOUBLEWRITE ON
INNODB_FAST_SHUTDOWN 1
INNODB_FILE_FORMAT Antelope
-INNODB_FILE_FORMAT_CHECK Antelope
+INNODB_FILE_FORMAT_CHECK Barracuda
INNODB_FILE_PER_TABLE OFF
INNODB_FLUSH_LOG_AT_TRX_COMMIT 1
INNODB_FLUSH_METHOD
mysqltest: Result content mismatch
not ok
------------------------------------------------------------------------
r6182 | marko | 2009-11-17 13:49:15 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-consistent-master.opt
M /branches/zip/mysql-test/innodb-consistent.result
M /branches/zip/mysql-test/innodb-consistent.test
M /branches/zip/mysql-test/innodb-use-sys-malloc-master.opt
M /branches/zip/mysql-test/innodb-use-sys-malloc.result
M /branches/zip/mysql-test/innodb-use-sys-malloc.test
M /branches/zip/mysql-test/innodb_bug21704.result
M /branches/zip/mysql-test/innodb_bug21704.test
M /branches/zip/mysql-test/innodb_bug40360.test
M /branches/zip/mysql-test/innodb_bug40565.result
M /branches/zip/mysql-test/innodb_bug40565.test
M /branches/zip/mysql-test/innodb_bug41904.result
M /branches/zip/mysql-test/innodb_bug41904.test
M /branches/zip/mysql-test/innodb_bug42101-nonzero-master.opt
M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
M /branches/zip/mysql-test/innodb_bug42101.result
M /branches/zip/mysql-test/innodb_bug42101.test
M /branches/zip/mysql-test/innodb_bug44032.result
M /branches/zip/mysql-test/innodb_bug44032.test
M /branches/zip/mysql-test/innodb_bug44369.result
M /branches/zip/mysql-test/innodb_bug44369.test
M /branches/zip/mysql-test/innodb_bug44571.result
M /branches/zip/mysql-test/innodb_bug44571.test
M /branches/zip/mysql-test/innodb_bug45357.test
M /branches/zip/mysql-test/innodb_bug46000.result
M /branches/zip/mysql-test/innodb_bug46000.test
M /branches/zip/mysql-test/innodb_bug46676.result
M /branches/zip/mysql-test/innodb_bug46676.test
M /branches/zip/mysql-test/innodb_bug47167.result
M /branches/zip/mysql-test/innodb_bug47167.test
M /branches/zip/mysql-test/innodb_bug47777.result
M /branches/zip/mysql-test/innodb_bug47777.test
M /branches/zip/mysql-test/innodb_file_format.result
M /branches/zip/mysql-test/innodb_file_format.test
branches/zip: Set svn:eol-style on mysql-test files.
------------------------------------------------------------------------
r6183 | marko | 2009-11-17 13:51:16 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-consistent-master.opt
M /branches/zip/mysql-test/innodb-master.opt
M /branches/zip/mysql-test/innodb-semi-consistent-master.opt
M /branches/zip/mysql-test/innodb-use-sys-malloc-master.opt
M /branches/zip/mysql-test/innodb_bug42101-nonzero-master.opt
branches/zip: Prepend loose_ to plugin-only mysql-test options.
------------------------------------------------------------------------
r6184 | marko | 2009-11-17 13:52:01 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-index.result
M /branches/zip/mysql-test/innodb-index.test
branches/zip: innodb-index.test: Restore innodb_file_format_check.
------------------------------------------------------------------------
r6185 | marko | 2009-11-17 16:44:20 +0200 (Tue, 17 Nov 2009) | 16 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/mysql-test/innodb.result
M /branches/zip/mysql-test/innodb.test
M /branches/zip/mysql-test/innodb_bug44369.result
M /branches/zip/mysql-test/innodb_bug44369.test
D /branches/zip/mysql-test/patches/innodb-index.diff
M /branches/zip/row/row0mysql.c
branches/zip: Report duplicate table names
to the client connection, not to the error log. This change will allow
innodb-index.test to be re-enabled. It was previously disabled, because
mysql-test-run does not like output in the error log.
row_create_table_for_mysql(): Do not output anything to the error log
when reporting DB_DUPLICATE_KEY. Let the caller report the error.
Add a TODO comment that the dict_table_t object is apparently not freed
when an error occurs.
create_table_def(): Convert InnoDB table names to the character set
of the client connection for reporting. Use my_error(ER_WRONG_COLUMN_NAME)
for reporting reserved column names. Report my_error(ER_TABLE_EXISTS_ERROR)
when row_create_table_for_mysql() returns DB_DUPLICATE_KEY.
rb://206
------------------------------------------------------------------------
r6186 | vasil | 2009-11-17 16:48:14 +0200 (Tue, 17 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for r6185.
------------------------------------------------------------------------
r6189 | marko | 2009-11-18 11:36:18 +0200 (Wed, 18 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): When creating the primary key
and the table is being locked by another transaction,
do not attempt to drop the table. (Bug #48782)
Approved by Sunny Bains over IM
------------------------------------------------------------------------
r6194 | vasil | 2009-11-19 09:24:45 +0200 (Thu, 19 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/include/univ.i
branches/zip:
Increment version number from 1.0.5 to 1.0.6 since 1.0.5 was just released
by MySQL and we will soon release 1.0.6.
------------------------------------------------------------------------
r6197 | calvin | 2009-11-19 09:32:55 +0200 (Thu, 19 Nov 2009) | 6 lines
Changed paths:
M /branches/zip/CMakeLists.txt
branches/zip: merge the fix of bug#48317 (CMake file)
Due to MySQL changes to the CMake, it is no longer able
to build InnoDB plugin as a static library on Windows.
The fix is proposed by Vlad of MySQL.
------------------------------------------------------------------------
r6198 | vasil | 2009-11-19 09:44:31 +0200 (Thu, 19 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for r6197.
------------------------------------------------------------------------
r6199 | vasil | 2009-11-19 12:10:12 +0200 (Thu, 19 Nov 2009) | 31 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/btr/btr0btr.c
M /branches/zip/data/data0type.c
branches/zip: Merge r6159:6198 from branches/5.1:
------------------------------------------------------------------------
r6187 | jyang | 2009-11-18 05:27:30 +0200 (Wed, 18 Nov 2009) | 9 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1: Fix bug #48469 "when innodb tablespace is
configured too small, crash and corruption!". Function
btr_create() did not check the return status of fseg_create(),
and continue the index creation even there is no sufficient
space.
rb://205 Approved by Marko
------------------------------------------------------------------------
r6188 | jyang | 2009-11-18 07:14:23 +0200 (Wed, 18 Nov 2009) | 8 lines
Changed paths:
M /branches/5.1/data/data0type.c
branches/5.1: Fix bug #48526 "Data type for float and
double is incorrectly reported in InnoDB table monitor".
Certain datatypes are not printed correctly in
dtype_print().
rb://204 Approved by Marko.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6201 | marko | 2009-11-19 14:09:11 +0200 (Thu, 19 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): Clarify the comment
on orphaned tables when creating a primary key.
------------------------------------------------------------------------
r6202 | jyang | 2009-11-19 15:01:00 +0200 (Thu, 19 Nov 2009) | 8 lines
Changed paths:
M /branches/zip/btr/btr0btr.c
branches/zip: Function fseg_free() is no longer defined
in branches/zip. To port fix for bug #48469 to zip,
we can use btr_free_root() which frees the page,
and also does not require mini-transaction.
Approved by Marko.
------------------------------------------------------------------------
r6207 | vasil | 2009-11-20 10:19:14 +0200 (Fri, 20 Nov 2009) | 54 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Merge r6198:6206 from branches/5.1:
(r6203 was skipped as it is already in branches/zip)
------------------------------------------------------------------------
r6200 | vasil | 2009-11-19 12:14:23 +0200 (Thu, 19 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1:
White space fixup - indent under the opening (
------------------------------------------------------------------------
r6203 | jyang | 2009-11-19 15:12:22 +0200 (Thu, 19 Nov 2009) | 8 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1: Use btr_free_root() instead of fseg_free() for
the fix of bug #48469, because fseg_free() is not defined
in the zip branch. And we could save one mini-trasaction started
by fseg_free().
Approved by Marko.
------------------------------------------------------------------------
r6205 | jyang | 2009-11-20 07:55:48 +0200 (Fri, 20 Nov 2009) | 11 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Add a special case to handle the Duplicated Key error
and return DB_ERROR instead. This is to avoid a possible SIGSEGV
by mysql error handling re-entering the storage layer for dup key
info without proper table handle.
This is to prevent a server crash when error situation in bug
#45961 "DDL on partitioned innodb tables leaves data dictionary
in an inconsistent state" happens.
rb://157 approved by Sunny Bains.
------------------------------------------------------------------------
r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 5 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Fix a minor code formating issue for
the parenthesis iplacement of the if condition in
rename_table().
------------------------------------------------------------------------
------------------------------------------------------------------------
r6208 | vasil | 2009-11-20 10:49:24 +0200 (Fri, 20 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for c6207.
------------------------------------------------------------------------
r6210 | vasil | 2009-11-20 23:39:48 +0200 (Fri, 20 Nov 2009) | 3 lines
Changed paths:
M /branches/zip/trx/trx0i_s.c
branches/zip:
Whitespace fixup.
------------------------------------------------------------------------
r6248 | marko | 2009-11-30 12:19:50 +0200 (Mon, 30 Nov 2009) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: ChangeLog: Document r4922 that was forgotten.
------------------------------------------------------------------------
r6252 | marko | 2009-11-30 12:50:11 +0200 (Mon, 30 Nov 2009) | 23 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/dict/dict0boot.c
M /branches/zip/dict/dict0crea.c
M /branches/zip/dict/dict0load.c
M /branches/zip/dict/dict0mem.c
M /branches/zip/fil/fil0fil.c
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/dict0mem.h
M /branches/zip/row/row0mysql.c
branches/zip: Suppress errors about non-found temporary tables.
Write the is_temp flag to SYS_TABLES.MIX_LEN.
dict_table_t::flags: Add a flag for is_temporary, DICT_TF2_TEMPORARY.
Unlike other flags, this will not be written to the tablespace flags
or SYS_TABLES.TYPE, but only to SYS_TABLES.MIX_LEN.
dict_build_table_def_step(): Only pass DICT_TF_BITS to tablespaces.
dict_check_tablespaces_and_store_max_id(), dict_load_table():
Suppress errors about temporary tables not being found.
dict_create_sys_tables_tuple(): Write the DICT_TF2_TEMPORARY flag
to SYS_TABLES.MIX_LEN.
fil_space_create(), fil_create_new_single_table_tablespace(): Add assertions
about space->flags.
row_drop_table_for_mysql(): Do not complain about non-found temporary tables.
rb://160 approved by Heikki Tuuri. This addresses the second part of
Bug #41609 Crash recovery does not work for InnoDB temporary tables.
------------------------------------------------------------------------
r6263 | vasil | 2009-12-01 14:49:05 +0200 (Tue, 01 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/include/univ.i
branches/zip: Increment version number from 1.0.6 to 1.0.7
1.0.6 has been released
------------------------------------------------------------------------
r6264 | vasil | 2009-12-01 16:19:44 +0200 (Tue, 01 Dec 2009) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: Add ChangeLog entry for the release of 1.0.6.
------------------------------------------------------------------------
r6269 | marko | 2009-12-02 11:35:22 +0200 (Wed, 02 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/srv/srv0start.c
branches/zip: innobase_start_or_create_for_mysql(): UNIV_IBUF_DEBUG
should not break crash recovery, but UNIV_IBUF_COUNT_DEBUG will.
------------------------------------------------------------------------
r6270 | marko | 2009-12-02 11:36:47 +0200 (Wed, 02 Dec 2009) | 1 line
Changed paths:
M /branches/zip/srv/srv0start.c
branches/zip: innobase_start_or_create_for_mysql(): Log the zlib version.
------------------------------------------------------------------------
r6271 | marko | 2009-12-02 11:43:49 +0200 (Wed, 02 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/Makefile.am
M /branches/zip/include/univ.i
M /branches/zip/plug.in
branches/zip: ChangeLog: Document that since r6270, the zlib version number
will be displayed at start-up.
------------------------------------------------------------------------
r6272 | marko | 2009-12-02 11:46:05 +0200 (Wed, 02 Dec 2009) | 1 line
Changed paths:
M /branches/zip/Makefile.am
M /branches/zip/include/univ.i
M /branches/zip/plug.in
branches/zip: Revert changes that were accidentally committed in r6271.
------------------------------------------------------------------------
r6274 | marko | 2009-12-03 14:47:12 +0200 (Thu, 03 Dec 2009) | 6 lines
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_table_check_for_dup_indexes(): Assert that the
data dictionary mutex is being held while table->indexes is accessed.
This is already the case.
Currently, only dict_table_get_next_index() and dict_table_get_first_index()
are being invoked without holding dict_sys->mutex.
------------------------------------------------------------------------
r6275 | pekka | 2009-12-03 18:32:47 +0200 (Thu, 03 Dec 2009) | 10 lines
Changed paths:
M /branches/zip/include/log0recv.h
M /branches/zip/include/trx0sys.h
M /branches/zip/log/log0recv.c
M /branches/zip/trx/trx0sys.c
branches/zip: Minor changes which allow build with UNIV_HOTBACKUP
defined to succeed:
include/trx0sys.h: Allow Hot Backup build to see some
TRX_SYS_DOUBLEWRITE_... macros.
trx/trx0sys.c: Exclude trx_sys_close() function from Hot Backup build.
log/log0recv.[ch]: Exclude recv_sys_var_init() function from Hot Backup build.
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r6277 | marko | 2009-12-08 11:13:36 +0200 (Tue, 08 Dec 2009) | 1 line
Changed paths:
M /branches/zip/fsp/fsp0fsp.c
branches/zip: fsp0fsp.c: Add some missing in/out and const qualifiers.
------------------------------------------------------------------------
r6285 | marko | 2009-12-09 09:24:50 +0200 (Wed, 09 Dec 2009) | 13 lines
Changed paths:
M /branches/zip/row/row0sel.c
branches/zip: row_sel_fetch_columns(): Remove redundant code that was
accidentally added in r1591, which introduced dfield_t::ext in order
to make the merge sort of fast index creation support externally
stored columns,
Initially, I tried to allocate the bit for dfield_t::ext from
dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
to something that would fit in it. Then I decided that it would be
too risky. The redundant check was part of the mapping. The
condition may have been dfield_is_null() initially.
This redundant code was noticed by Sergey Petrunya on the MySQL
internals list.
------------------------------------------------------------------------
r6288 | marko | 2009-12-09 09:51:00 +0200 (Wed, 09 Dec 2009) | 15 lines
Changed paths:
M /branches/zip/row/row0upd.c
branches/zip: row_upd_copy_columns(): Remove redundant code that was
accidentally added in r1591, which introduced dfield_t::ext in order
to make the merge sort of fast index creation support externally
stored columns.
Initially, I tried to allocate the bit for dfield_t::ext from
dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
to something that would fit in it. Then I decided that it would be
too risky. The redundant check was part of the mapping. The
condition may have been dfield_is_null() initially.
This is similar to the redundant code in row_sel_fetch_columns() that
was noticed by Sergey Petrunya on the MySQL internals list and removed
in r6285. As far as I can tell, there are no redundant UNIV_SQL_NULL
assignments remaining after this change.
------------------------------------------------------------------------
r6305 | marko | 2009-12-14 13:03:57 +0200 (Mon, 14 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/row/row0umod.c
branches/zip: row_undo_mod_del_unmark_sec_and_undo_update(): Add a missing
const qualifier.
------------------------------------------------------------------------
r6309 | marko | 2009-12-15 14:05:50 +0200 (Tue, 15 Dec 2009) | 3 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: lock_rec_insert_check_and_lock(): Avoid casting away constness.
Use page_rec_get_next_const() instead. This silences a gcc 4.2.4 warning.
Reported by Sunny Bains.
------------------------------------------------------------------------
r6312 | marko | 2009-12-16 10:10:36 +0200 (Wed, 16 Dec 2009) | 6 lines
Changed paths:
M /branches/zip/fil/fil0fil.c
branches/zip: fil_close(): Add #ifndef UNIV_HOTBACKUP around a debug
assertion on mutex.magic_n. InnoDB Hot Backup is a single-threaded
program and does not contain mutexes. This change allows InnoDB Hot
Backup to be compiled with UNIV_DEBUG.
Suggested by Michael Izioumtchenko.
------------------------------------------------------------------------
r6321 | marko | 2009-12-16 16:16:33 +0200 (Wed, 16 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/row/row0merge.c
branches/zip: row_merge_drop_temp_indexes(): Revert a hack to
transaction isolation level that was made unnecessary by r5826 (Issue #337).
When this function is called, any active data dictionary transaction
should have been rolled back.
------------------------------------------------------------------------
r6345 | marko | 2009-12-21 10:46:14 +0200 (Mon, 21 Dec 2009) | 7 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_scan_log_recs(): Non-functional change: Replace a
debug assertion ut_ad(len > 0) with ut_ad(len >= OS_FILE_LOG_BLOCK_SIZE).
This change is only for readability, for Issue #428. Another
assertion on len being an integer multiple of OS_FILE_LOG_BLOCK_SIZE
already ensured together with the old ut_ad(len > 0) that actually len
must be at least OS_FILE_LOG_BLOCK_SIZE.
------------------------------------------------------------------------
r6346 | marko | 2009-12-21 12:03:25 +0200 (Mon, 21 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_recovery_from_checkpoint_finish():
Revert a change that was accidentally committed in r6345.
------------------------------------------------------------------------
r6348 | marko | 2009-12-22 11:04:34 +0200 (Tue, 22 Dec 2009) | 37 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/ha_prototypes.h
M /branches/zip/include/trx0trx.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/trx/trx0i_s.c
M /branches/zip/trx/trx0trx.c
branches/zip: Merge a change from MySQL:
------------------------------------------------------------
revno: 3236
committer: Satya B <satya.bn@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-12-01 17:48:57 +0530
message:
merge to mysql-5.1-bugteam
------------------------------------------------------------
revno: 3234.1.1
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-12-01 14:38:40 +0400
message:
Bug #38883 (reopened): thd_security_context is not thread safe, crashes?
manual merge 5.0-->5.1, updating InnoDB plugin.
------------------------------------------------------------
revno: 1810.3968.13
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.0-bugteam
timestamp: Tue 2009-12-01 14:24:44 +0400
message:
Bug #38883 (reopened): thd_security_context is not thread safe, crashes?
The bug 38816 changed the lock that protects THD::query from
LOCK_thread_count to LOCK_thd_data, but didn't update the associated
InnoDB functions.
1. The innobase_mysql_prepare_print_arbitrary_thd and the
innobase_mysql_end_print_arbitrary_thd InnoDB functions have been
removed, since now we have a per-thread mutex: now we don't need to wrap
several inter-thread access tries to THD::query with a single global
LOCK_thread_count lock, so we can simplify the code.
2. The innobase_mysql_print_thd function has been modified to lock
LOCK_thd_data in direct way.
------------------------------------------------------------------------
r6351 | marko | 2009-12-22 11:11:18 +0200 (Tue, 22 Dec 2009) | 1 line
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Remove an obsolete declaration of LOCK_thread_count.
------------------------------------------------------------------------
r6352 | marko | 2009-12-22 12:33:01 +0200 (Tue, 22 Dec 2009) | 104 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/lock0lock.h
M /branches/zip/include/srv0srv.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/mysql-test/innodb-autoinc.result
M /branches/zip/mysql-test/innodb-autoinc.test
M /branches/zip/row/row0sel.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
branches/zip: Merge revisions 6206:6350 from branches/5.1,
except r6347, r6349, r6350 which were committed separately
to both branches, and r6310, which was backported from zip to 5.1.
------------------------------------------------------------------------
r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 3 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Non-functional change, fix formatting.
------------------------------------------------------------------------
r6230 | sunny | 2009-11-24 23:52:43 +0200 (Tue, 24 Nov 2009) | 3 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
branches/5.1: Fix autoinc failing test results.
(this should be skipped when merging 5.1 into zip)
------------------------------------------------------------------------
r6231 | sunny | 2009-11-25 10:26:27 +0200 (Wed, 25 Nov 2009) | 7 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
M /branches/5.1/row/row0sel.c
branches/5.1: Fix BUG#49032 - auto_increment field does not initialize to last value in InnoDB Storage Engine.
We use the appropriate function to read the column value for non-integer
autoinc column types, namely float and double.
rb://208. Approved by Marko.
------------------------------------------------------------------------
r6232 | sunny | 2009-11-25 10:27:39 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix white space errors.
------------------------------------------------------------------------
r6233 | sunny | 2009-11-25 10:28:35 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/include/mach0data.h
M /branches/5.1/include/mach0data.ic
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix tests and make read float/double arg const.
------------------------------------------------------------------------
r6234 | sunny | 2009-11-25 10:29:03 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix whitepsace issues.
------------------------------------------------------------------------
r6235 | sunny | 2009-11-26 01:14:42 +0200 (Thu, 26 Nov 2009) | 9 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Fix Bug#47720 - REPLACE INTO Autoincrement column with negative values.
This bug is similiar to the negative autoinc filter patch from earlier,
with the additional handling of filtering out the negative column values
set explicitly by the user.
rb://184
Approved by Heikki.
------------------------------------------------------------------------
r6242 | vasil | 2009-11-27 22:07:12 +0200 (Fri, 27 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/export.sh
branches/5.1:
Minor changes to support plugin snapshots.
------------------------------------------------------------------------
r6306 | calvin | 2009-12-14 15:12:46 +0200 (Mon, 14 Dec 2009) | 5 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: fix bug#49267: innodb-autoinc.test fails on windows
because of different case mode
There is no change to the InnoDB code, only to fix test case by
changing "T1" to "t1".
------------------------------------------------------------------------
r6324 | jyang | 2009-12-17 06:54:24 +0200 (Thu, 17 Dec 2009) | 8 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/lock0lock.h
M /branches/5.1/include/srv0srv.h
M /branches/5.1/lock/lock0lock.c
M /branches/5.1/log/log0log.c
M /branches/5.1/srv/srv0srv.c
M /branches/5.1/srv/srv0start.c
branches/5.1: Fix bug #47814 - Diagnostics are frequently not
printed after a long lock wait in InnoDB. Separate out the
lock wait timeout check thread from monitor information
printing thread.
rb://200 Approved by Marko.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6364 | marko | 2009-12-26 21:06:31 +0200 (Sat, 26 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/ibuf/ibuf0ibuf.c
branches/zip: ibuf_bitmap_get_map_page():
Define a wrapper macro that passes __FILE__, __LINE__ of the caller
to buf_page_get_gen().
This will ease the diagnosis of the likes of Issue #135.
------------------------------------------------------------------------
2009-12-26 20:17:43 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Insert buffer */
|
|
|
|
static AIO* s_ibuf;
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Redo log */
|
|
|
|
static AIO* s_log;
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Reads */
|
|
|
|
static AIO* s_reads;
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Writes */
|
|
|
|
static AIO* s_writes;
|
2014-08-13 08:03:28 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Synchronous I/O */
|
|
|
|
static AIO* s_sync;
|
|
|
|
};
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Static declarations */
|
|
|
|
AIO* AIO::s_reads;
|
|
|
|
AIO* AIO::s_writes;
|
|
|
|
AIO* AIO::s_ibuf;
|
|
|
|
AIO* AIO::s_log;
|
|
|
|
AIO* AIO::s_sync;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#if defined(LINUX_NATIVE_AIO)
|
|
|
|
/** timeout for each io_getevents() call = 500ms. */
|
|
|
|
static const ulint OS_AIO_REAP_TIMEOUT = 500000000UL;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** time to sleep, in microseconds if io_setup() returns EAGAIN. */
|
|
|
|
static const ulint OS_AIO_IO_SETUP_RETRY_SLEEP = 500000UL;
|
|
|
|
|
|
|
|
/** number of attempts before giving up on io_setup(). */
|
|
|
|
static const int OS_AIO_IO_SETUP_RETRY_ATTEMPTS = 5;
|
|
|
|
#endif /* LINUX_NATIVE_AIO */
|
|
|
|
|
|
|
|
/** Array of events used in simulated AIO */
|
2017-02-17 09:32:21 +01:00
|
|
|
static os_event_t* os_aio_segment_wait_events;
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
/** Number of asynchronous I/O segments. Set by os_aio_init(). */
|
|
|
|
static ulint os_aio_n_segments = ULINT_UNDEFINED;
|
|
|
|
|
|
|
|
/** If the following is true, read i/o handler threads try to
|
|
|
|
wait until a batch of new read requests have been posted */
|
|
|
|
static bool os_aio_recommend_sleep_for_read_threads = false;
|
|
|
|
|
|
|
|
ulint os_n_file_reads = 0;
|
|
|
|
ulint os_bytes_read_since_printout = 0;
|
|
|
|
ulint os_n_file_writes = 0;
|
|
|
|
ulint os_n_fsyncs = 0;
|
|
|
|
ulint os_n_file_reads_old = 0;
|
|
|
|
ulint os_n_file_writes_old = 0;
|
|
|
|
ulint os_n_fsyncs_old = 0;
|
|
|
|
/** Number of pending write operations */
|
|
|
|
ulint os_n_pending_writes = 0;
|
|
|
|
/** Number of pending read operations */
|
|
|
|
ulint os_n_pending_reads = 0;
|
|
|
|
|
|
|
|
time_t os_last_printout;
|
|
|
|
bool os_has_said_disk_full = false;
|
|
|
|
|
|
|
|
/** Default Zip compression level */
|
|
|
|
extern uint page_zip_level;
|
|
|
|
|
|
|
|
#if DATA_TRX_ID_LEN > 6
|
|
|
|
#error "COMPRESSION_ALGORITHM will not fit"
|
|
|
|
#endif /* DATA_TRX_ID_LEN */
|
|
|
|
|
|
|
|
/** Validates the consistency of the aio system.
|
|
|
|
@return true if ok */
|
|
|
|
static
|
|
|
|
bool
|
|
|
|
os_aio_validate();
|
|
|
|
|
|
|
|
/** Does error handling when a file operation fails.
|
|
|
|
@param[in] name File name or NULL
|
|
|
|
@param[in] operation Name of operation e.g., "read", "write"
|
|
|
|
@return true if we should retry the operation */
|
2007-04-02 07:39:41 +02:00
|
|
|
static
|
2016-08-12 10:17:45 +02:00
|
|
|
bool
|
2007-04-02 07:39:41 +02:00
|
|
|
os_file_handle_error(
|
2016-08-12 10:17:45 +02:00
|
|
|
const char* name,
|
|
|
|
const char* operation);
|
2007-04-02 07:39:41 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/**
|
2009-05-25 08:46:10 +02:00
|
|
|
Does error handling when a file operation fails.
|
2016-08-12 10:17:45 +02:00
|
|
|
@param[in] name File name or NULL
|
|
|
|
@param[in] operation Name of operation e.g., "read", "write"
|
|
|
|
@param[in] silent if true then don't print any message to the log.
|
|
|
|
@return true if we should retry the operation */
|
|
|
|
static
|
|
|
|
bool
|
2007-04-02 07:39:41 +02:00
|
|
|
os_file_handle_error_no_exit(
|
2016-08-12 10:17:45 +02:00
|
|
|
const char* name,
|
|
|
|
const char* operation,
|
|
|
|
bool silent);
|
|
|
|
|
|
|
|
/** Does simulated AIO. This function should be called by an i/o-handler
|
|
|
|
thread.
|
2007-04-02 07:39:41 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
@param[in] segment The number of the segment in the aio arrays to wait
|
|
|
|
for; segment 0 is the ibuf i/o thread, segment 1 the
|
|
|
|
log i/o thread, then follow the non-ibuf read threads,
|
|
|
|
and as the last are the non-ibuf write threads
|
|
|
|
@param[out] m1 the messages passed with the AIO request; note that
|
|
|
|
also in the case where the AIO operation failed, these
|
|
|
|
output parameters are valid and can be used to restart
|
|
|
|
the operation, for example
|
|
|
|
@param[out] m2 Callback argument
|
|
|
|
@param[in] type IO context
|
|
|
|
@return DB_SUCCESS or error code */
|
2005-10-27 09:29:40 +02:00
|
|
|
static
|
2016-08-12 10:17:45 +02:00
|
|
|
dberr_t
|
|
|
|
os_aio_simulated_handler(
|
|
|
|
ulint global_segment,
|
|
|
|
fil_node_t** m1,
|
|
|
|
void** m2,
|
|
|
|
IORequest* type);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
#ifdef _WIN32
|
|
|
|
static HANDLE win_get_syncio_event();
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef _WIN32
|
|
|
|
/**
|
|
|
|
Wrapper around Windows DeviceIoControl() function.
|
|
|
|
|
|
|
|
Works synchronously, also in case for handle opened
|
|
|
|
for async access (i.e with FILE_FLAG_OVERLAPPED).
|
|
|
|
|
|
|
|
Accepts the same parameters as DeviceIoControl(),except
|
|
|
|
last parameter (OVERLAPPED).
|
|
|
|
*/
|
|
|
|
static
|
|
|
|
BOOL
|
|
|
|
os_win32_device_io_control(
|
|
|
|
HANDLE handle,
|
|
|
|
DWORD code,
|
|
|
|
LPVOID inbuf,
|
|
|
|
DWORD inbuf_size,
|
|
|
|
LPVOID outbuf,
|
|
|
|
DWORD outbuf_size,
|
|
|
|
LPDWORD bytes_returned
|
|
|
|
)
|
|
|
|
{
|
|
|
|
OVERLAPPED overlapped = { 0 };
|
|
|
|
overlapped.hEvent = win_get_syncio_event();
|
|
|
|
BOOL result = DeviceIoControl(handle, code, inbuf, inbuf_size, outbuf,
|
|
|
|
outbuf_size, bytes_returned, &overlapped);
|
|
|
|
|
|
|
|
if (!result && (GetLastError() == ERROR_IO_PENDING)) {
|
|
|
|
/* Wait for async io to complete */
|
|
|
|
result = GetOverlappedResult(handle, &overlapped, bytes_returned, TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/***********************************************************************//**
|
|
|
|
Try to get number of bytes per sector from file system.
|
|
|
|
@return file block size */
|
|
|
|
UNIV_INTERN
|
|
|
|
ulint
|
|
|
|
os_file_get_block_size(
|
|
|
|
/*===================*/
|
|
|
|
os_file_t file, /*!< in: handle to a file */
|
|
|
|
const char* name) /*!< in: file name */
|
|
|
|
{
|
|
|
|
ulint fblock_size = 512;
|
|
|
|
|
|
|
|
#if defined(UNIV_LINUX)
|
|
|
|
struct stat local_stat;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = fstat((int)file, &local_stat);
|
|
|
|
|
|
|
|
if (err != 0) {
|
|
|
|
os_file_handle_error_no_exit(name, "fstat()", FALSE);
|
|
|
|
} else {
|
|
|
|
fblock_size = local_stat.st_blksize;
|
|
|
|
}
|
|
|
|
#endif /* UNIV_LINUX */
|
|
|
|
#ifdef _WIN32
|
2017-01-26 18:39:15 +01:00
|
|
|
|
|
|
|
fblock_size = 0;
|
|
|
|
|
|
|
|
// Open volume for this file, find out it "physical bytes per sector"
|
|
|
|
|
|
|
|
HANDLE volume_handle = INVALID_HANDLE_VALUE;
|
|
|
|
char volume[MAX_PATH + 4]="\\\\.\\"; // Special prefix required for volume names.
|
|
|
|
if (!GetVolumePathName(name , volume + 4, MAX_PATH)) {
|
|
|
|
os_file_handle_error_no_exit(name,
|
|
|
|
"GetVolumePathName()", FALSE);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
size_t len = strlen(volume);
|
|
|
|
if (volume[len - 1] == '\\') {
|
|
|
|
// Trim trailing backslash from volume name.
|
|
|
|
volume[len - 1] = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
volume_handle = CreateFile(volume, FILE_READ_ATTRIBUTES,
|
|
|
|
FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
|
|
|
|
0, OPEN_EXISTING, 0, 0);
|
|
|
|
|
|
|
|
if (volume_handle == INVALID_HANDLE_VALUE) {
|
|
|
|
os_file_handle_error_no_exit(volume,
|
|
|
|
"CreateFile()", FALSE);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
DWORD tmp;
|
|
|
|
STORAGE_ACCESS_ALIGNMENT_DESCRIPTOR disk_alignment;
|
|
|
|
|
|
|
|
STORAGE_PROPERTY_QUERY storage_query;
|
|
|
|
memset(&storage_query, 0, sizeof(storage_query));
|
|
|
|
storage_query.PropertyId = StorageAccessAlignmentProperty;
|
|
|
|
storage_query.QueryType = PropertyStandardQuery;
|
|
|
|
|
|
|
|
BOOL result = os_win32_device_io_control(volume_handle,
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
IOCTL_STORAGE_QUERY_PROPERTY,
|
2017-01-26 18:39:15 +01:00
|
|
|
&storage_query,
|
|
|
|
sizeof(storage_query),
|
|
|
|
&disk_alignment,
|
|
|
|
sizeof(disk_alignment),
|
|
|
|
&tmp);
|
|
|
|
|
|
|
|
CloseHandle(volume_handle);
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
|
|
|
|
if (!result) {
|
2017-01-26 18:39:15 +01:00
|
|
|
os_file_handle_error_no_exit(volume,
|
|
|
|
"DeviceIoControl(IOCTL_STORAGE_QUERY_PROPERTY)", FALSE);
|
|
|
|
goto end;
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
}
|
|
|
|
|
2017-01-26 18:39:15 +01:00
|
|
|
fblock_size = disk_alignment.BytesPerPhysicalSector;
|
|
|
|
|
|
|
|
end:
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
#endif /* _WIN32 */
|
|
|
|
|
|
|
|
/* Currently we support file block size up to 4Kb */
|
|
|
|
if (fblock_size > 4096 || fblock_size < 512) {
|
|
|
|
if (fblock_size < 512) {
|
|
|
|
fblock_size = 512;
|
|
|
|
} else {
|
|
|
|
fblock_size = 4096;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return fblock_size;
|
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#ifdef WIN_ASYNC_IO
|
|
|
|
/** This function is only used in Windows asynchronous i/o.
|
|
|
|
Waits for an aio operation to complete. This function is used to wait the
|
|
|
|
for completed requests. The aio array of pending requests is divided
|
|
|
|
into segments. The thread specifies which segment or slot it wants to wait
|
|
|
|
for. NOTE: this function will also take care of freeing the aio slot,
|
|
|
|
therefore no other thread is allowed to do the freeing!
|
|
|
|
@param[in] segment The number of the segment in the aio arrays to
|
|
|
|
wait for; segment 0 is the ibuf I/O thread,
|
|
|
|
segment 1 the log I/O thread, then follow the
|
|
|
|
non-ibuf read threads, and as the last are the
|
|
|
|
non-ibuf write threads; if this is
|
|
|
|
ULINT_UNDEFINED, then it means that sync AIO
|
|
|
|
is used, and this parameter is ignored
|
|
|
|
@param[in] pos this parameter is used only in sync AIO:
|
|
|
|
wait for the aio slot at this position
|
|
|
|
@param[out] m1 the messages passed with the AIO request; note
|
|
|
|
that also in the case where the AIO operation
|
|
|
|
failed, these output parameters are valid and
|
|
|
|
can be used to restart the operation,
|
|
|
|
for example
|
|
|
|
@param[out] m2 callback message
|
|
|
|
@param[out] type OS_FILE_WRITE or ..._READ
|
|
|
|
@return DB_SUCCESS or error code */
|
|
|
|
static
|
|
|
|
dberr_t
|
|
|
|
os_aio_windows_handler(
|
|
|
|
ulint segment,
|
|
|
|
ulint pos,
|
|
|
|
fil_node_t** m1,
|
|
|
|
void** m2,
|
|
|
|
IORequest* type);
|
|
|
|
#endif /* WIN_ASYNC_IO */
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Generic AIO Handler methods. Currently handles IO post processing. */
|
|
|
|
class AIOHandler {
|
|
|
|
public:
|
|
|
|
/** Do any post processing after a read/write
|
|
|
|
@return DB_SUCCESS or error code. */
|
|
|
|
static dberr_t post_io_processing(Slot* slot);
|
|
|
|
};
|
|
|
|
|
|
|
|
/** Helper class for doing synchronous file IO. Currently, the objective
|
|
|
|
is to hide the OS specific code, so that the higher level functions aren't
|
|
|
|
peppered with #ifdef. Makes the code flow difficult to follow. */
|
|
|
|
class SyncFileIO {
|
|
|
|
public:
|
|
|
|
/** Constructor
|
|
|
|
@param[in] fh File handle
|
|
|
|
@param[in,out] buf Buffer to read/write
|
|
|
|
@param[in] n Number of bytes to read/write
|
|
|
|
@param[in] offset Offset where to read or write */
|
|
|
|
SyncFileIO(os_file_t fh, void* buf, ulint n, os_offset_t offset)
|
|
|
|
:
|
|
|
|
m_fh(fh),
|
|
|
|
m_buf(buf),
|
|
|
|
m_n(static_cast<ssize_t>(n)),
|
|
|
|
m_offset(offset)
|
|
|
|
{
|
|
|
|
ut_ad(m_n > 0);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Destructor */
|
|
|
|
~SyncFileIO()
|
|
|
|
{
|
|
|
|
/* No op */
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Do the read/write
|
|
|
|
@param[in] request The IO context and type
|
|
|
|
@return the number of bytes read/written or negative value on error */
|
|
|
|
ssize_t execute(const IORequest& request);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Do the read/write
|
|
|
|
@param[in,out] slot The IO slot, it has the IO context
|
|
|
|
@return the number of bytes read/written or negative value on error */
|
|
|
|
static ssize_t execute(Slot* slot);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Move the read/write offset up to where the partial IO succeeded.
|
|
|
|
@param[in] n_bytes The number of bytes to advance */
|
|
|
|
void advance(ssize_t n_bytes)
|
|
|
|
{
|
|
|
|
m_offset += n_bytes;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_ad(m_n >= n_bytes);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
m_n -= n_bytes;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
m_buf = reinterpret_cast<uchar*>(m_buf) + n_bytes;
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
private:
|
|
|
|
/** Open file handle */
|
|
|
|
os_file_t m_fh;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Buffer to read/write */
|
|
|
|
void* m_buf;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Number of bytes to read/write */
|
|
|
|
ssize_t m_n;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Offset from where to read/write */
|
|
|
|
os_offset_t m_offset;
|
|
|
|
};
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Do any post processing after a read/write
|
|
|
|
@return DB_SUCCESS or error code. */
|
|
|
|
dberr_t
|
|
|
|
AIOHandler::post_io_processing(Slot* slot)
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_ad(slot->is_reserved);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Total bytes read so far */
|
|
|
|
ulint n_bytes = (slot->ptr - slot->buf) + slot->n_bytes;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2017-01-16 13:03:36 +01:00
|
|
|
return(n_bytes == slot->original_len ? DB_SUCCESS : DB_FAIL);
|
2016-08-12 10:17:45 +02:00
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Count the number of free slots
|
|
|
|
@return number of reserved slots */
|
|
|
|
ulint
|
|
|
|
AIO::pending_io_count() const
|
|
|
|
{
|
|
|
|
acquire();
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
ut_a(m_n_segments > 0);
|
|
|
|
ut_a(!m_slots.empty());
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ulint count = 0;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
for (ulint i = 0; i < m_slots.size(); ++i) {
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
const Slot& slot = m_slots[i];
|
|
|
|
|
|
|
|
if (slot.is_reserved) {
|
|
|
|
++count;
|
|
|
|
ut_a(slot.len > 0);
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_a(m_n_reserved == count);
|
|
|
|
#endif /* UNIV_DEBUG */
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ulint reserved = m_n_reserved;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
release();
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(reserved);
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
/** Validates the consistency the aio system some of the time.
|
|
|
|
@return true if ok or the check was skipped */
|
|
|
|
bool
|
|
|
|
os_aio_validate_skip()
|
|
|
|
{
|
|
|
|
/** Try os_aio_validate() every this many times */
|
|
|
|
# define OS_AIO_VALIDATE_SKIP 13
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** The os_aio_validate() call skip counter.
|
|
|
|
Use a signed type because of the race condition below. */
|
|
|
|
static int os_aio_validate_count = OS_AIO_VALIDATE_SKIP;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* There is a race condition below, but it does not matter,
|
|
|
|
because this call is only for heuristic purposes. We want to
|
|
|
|
reduce the call frequency of the costly os_aio_validate()
|
|
|
|
check in debug builds. */
|
|
|
|
--os_aio_validate_count;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (os_aio_validate_count > 0) {
|
|
|
|
return(true);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
os_aio_validate_count = OS_AIO_VALIDATE_SKIP;
|
|
|
|
return(os_aio_validate());
|
|
|
|
}
|
|
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
|
|
|
|
#undef USE_FILE_LOCK
|
2016-12-30 14:04:10 +01:00
|
|
|
#ifndef _WIN32
|
|
|
|
/* On Windows, mandatory locking is used */
|
|
|
|
# define USE_FILE_LOCK
|
2016-08-12 10:17:45 +02:00
|
|
|
#endif
|
|
|
|
#ifdef USE_FILE_LOCK
|
|
|
|
/** Obtain an exclusive lock on a file.
|
|
|
|
@param[in] fd file descriptor
|
|
|
|
@param[in] name file name
|
|
|
|
@return 0 on success */
|
|
|
|
static
|
|
|
|
int
|
|
|
|
os_file_lock(
|
|
|
|
int fd,
|
|
|
|
const char* name)
|
|
|
|
{
|
|
|
|
struct flock lk;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
lk.l_type = F_WRLCK;
|
|
|
|
lk.l_whence = SEEK_SET;
|
|
|
|
lk.l_start = lk.l_len = 0;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (fcntl(fd, F_SETLK, &lk) == -1) {
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ib::error()
|
|
|
|
<< "Unable to lock " << name
|
|
|
|
<< " error: " << errno;
|
|
|
|
|
|
|
|
if (errno == EAGAIN || errno == EACCES) {
|
|
|
|
|
|
|
|
ib::info()
|
|
|
|
<< "Check that you do not already have"
|
|
|
|
" another mysqld process using the"
|
|
|
|
" same InnoDB data or log files.";
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(-1);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(0);
|
|
|
|
}
|
|
|
|
#endif /* USE_FILE_LOCK */
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Calculates local segment number and aio array from global segment number.
|
|
|
|
@param[out] array aio wait array
|
|
|
|
@param[in] segment global segment number
|
|
|
|
@return local segment number within the aio array */
|
|
|
|
ulint
|
|
|
|
AIO::get_array_and_local_segment(
|
|
|
|
AIO** array,
|
|
|
|
ulint segment)
|
|
|
|
{
|
|
|
|
ulint local_segment;
|
|
|
|
ulint n_extra_segs = (srv_read_only_mode) ? 0 : 2;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_a(segment < os_aio_n_segments);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (!srv_read_only_mode && segment < n_extra_segs) {
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* We don't support ibuf/log IO during read only mode. */
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (segment == IO_IBUF_SEGMENT) {
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
*array = s_ibuf;
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
} else if (segment == IO_LOG_SEGMENT) {
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
*array = s_log;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2005-10-27 09:29:40 +02:00
|
|
|
} else {
|
2016-08-12 10:17:45 +02:00
|
|
|
*array = NULL;
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
local_segment = 0;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
} else if (segment < s_reads->m_n_segments + n_extra_segs) {
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
*array = s_reads;
|
|
|
|
local_segment = segment - n_extra_segs;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
} else {
|
|
|
|
*array = s_writes;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
local_segment = segment
|
|
|
|
- (s_reads->m_n_segments + n_extra_segs);
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(local_segment);
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Frees a slot in the aio array. Assumes caller owns the mutex.
|
|
|
|
@param[in,out] slot Slot to release */
|
|
|
|
void
|
|
|
|
AIO::release(Slot* slot)
|
|
|
|
{
|
|
|
|
ut_ad(is_mutex_owned());
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_ad(slot->is_reserved);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
slot->is_reserved = false;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
--m_n_reserved;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (m_n_reserved == m_slots.size() - 1) {
|
|
|
|
os_event_set(m_not_full);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (m_n_reserved == 0) {
|
|
|
|
os_event_set(m_is_empty);
|
|
|
|
}
|
|
|
|
|
2016-09-19 14:31:20 +02:00
|
|
|
#if defined(LINUX_NATIVE_AIO)
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (srv_use_native_aio) {
|
|
|
|
memset(&slot->control, 0x0, sizeof(slot->control));
|
|
|
|
slot->ret = 0;
|
|
|
|
slot->n_bytes = 0;
|
|
|
|
} else {
|
|
|
|
/* These fields should not be used if we are not
|
|
|
|
using native AIO. */
|
|
|
|
ut_ad(slot->n_bytes == 0);
|
|
|
|
ut_ad(slot->ret == 0);
|
2006-02-23 20:25:29 +01:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#endif /* WIN_ASYNC_IO */
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Frees a slot in the AIO array. Assumes caller doesn't own the mutex.
|
|
|
|
@param[in,out] slot Slot to release */
|
|
|
|
void
|
|
|
|
AIO::release_with_mutex(Slot* slot)
|
|
|
|
{
|
|
|
|
acquire();
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
release(slot);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
release();
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Creates a temporary file. This function is like tmpfile(3), but
|
2016-09-06 08:43:16 +02:00
|
|
|
the temporary file is created in the given parameter path. If the path
|
|
|
|
is NULL then it will create the file in the MySQL server configuration
|
|
|
|
parameter (--tmpdir).
|
|
|
|
@param[in] path location for creating temporary file
|
|
|
|
@@return temporary file handle, or NULL on error */
|
2016-08-12 10:17:45 +02:00
|
|
|
FILE*
|
2016-09-06 08:43:16 +02:00
|
|
|
os_file_create_tmpfile(
|
|
|
|
const char* path)
|
2016-08-12 10:17:45 +02:00
|
|
|
{
|
|
|
|
FILE* file = NULL;
|
2017-01-31 11:25:25 +01:00
|
|
|
WAIT_ALLOW_WRITES();
|
2016-09-06 08:43:16 +02:00
|
|
|
int fd = innobase_mysql_tmpfile(path);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (fd >= 0) {
|
|
|
|
file = fdopen(fd, "w+b");
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (file == NULL) {
|
|
|
|
|
|
|
|
ib::error()
|
|
|
|
<< "Unable to create temporary file; errno: "
|
|
|
|
<< errno;
|
|
|
|
|
|
|
|
if (fd >= 0) {
|
|
|
|
close(fd);
|
|
|
|
}
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
return(file);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Rewind file to its start, read at most size - 1 bytes from it to str, and
|
|
|
|
NUL-terminate str. All errors are silently ignored. This function is
|
|
|
|
mostly meant to be used with temporary files.
|
|
|
|
@param[in,out] file File to read from
|
|
|
|
@param[in,out] str Buffer where to read
|
|
|
|
@param[in] size Size of buffer */
|
|
|
|
void
|
|
|
|
os_file_read_string(
|
|
|
|
FILE* file,
|
|
|
|
char* str,
|
|
|
|
ulint size)
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
2016-08-12 10:17:45 +02:00
|
|
|
if (size != 0) {
|
|
|
|
rewind(file);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
size_t flen = fread(str, 1, size - 1, file);
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
str[flen] = '\0';
|
|
|
|
}
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** This function returns a new path name after replacing the basename
|
|
|
|
in an old path with a new basename. The old_path is a full path
|
|
|
|
name including the extension. The tablename is in the normal
|
|
|
|
form "databasename/tablename". The new base name is found after
|
|
|
|
the forward slash. Both input strings are null terminated.
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
This function allocates memory to be returned. It is the callers
|
|
|
|
responsibility to free the return value after it is no longer needed.
|
2015-08-03 13:03:47 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
@param[in] old_path Pathname
|
|
|
|
@param[in] tablename Contains new base name
|
|
|
|
@return own: new full pathname */
|
|
|
|
char*
|
|
|
|
os_file_make_new_pathname(
|
|
|
|
const char* old_path,
|
|
|
|
const char* tablename)
|
|
|
|
{
|
|
|
|
ulint dir_len;
|
|
|
|
char* last_slash;
|
|
|
|
char* base_name;
|
|
|
|
char* new_path;
|
|
|
|
ulint new_path_len;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Split the tablename into its database and table name components.
|
|
|
|
They are separated by a '/'. */
|
|
|
|
last_slash = strrchr((char*) tablename, '/');
|
|
|
|
base_name = last_slash ? last_slash + 1 : (char*) tablename;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Find the offset of the last slash. We will strip off the
|
|
|
|
old basename.ibd which starts after that slash. */
|
|
|
|
last_slash = strrchr((char*) old_path, OS_PATH_SEPARATOR);
|
|
|
|
dir_len = last_slash ? last_slash - old_path : strlen(old_path);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* allocate a new path and move the old directory path to it. */
|
|
|
|
new_path_len = dir_len + strlen(base_name) + sizeof "/.ibd";
|
|
|
|
new_path = static_cast<char*>(ut_malloc_nokey(new_path_len));
|
|
|
|
memcpy(new_path, old_path, dir_len);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_snprintf(new_path + dir_len,
|
|
|
|
new_path_len - dir_len,
|
|
|
|
"%c%s.ibd",
|
|
|
|
OS_PATH_SEPARATOR,
|
|
|
|
base_name);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(new_path);
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** This function reduces a null-terminated full remote path name into
|
|
|
|
the path that is sent by MySQL for DATA DIRECTORY clause. It replaces
|
|
|
|
the 'databasename/tablename.ibd' found at the end of the path with just
|
|
|
|
'tablename'.
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
Since the result is always smaller than the path sent in, no new memory
|
|
|
|
is allocated. The caller should allocate memory for the path sent in.
|
|
|
|
This function manipulates that path in place.
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
If the path format is not as expected, just return. The result is used
|
|
|
|
to inform a SHOW CREATE TABLE command.
|
|
|
|
@param[in,out] data_dir_path Full path/data_dir_path */
|
|
|
|
void
|
|
|
|
os_file_make_data_dir_path(
|
|
|
|
char* data_dir_path)
|
|
|
|
{
|
|
|
|
/* Replace the period before the extension with a null byte. */
|
|
|
|
char* ptr = strrchr((char*) data_dir_path, '.');
|
2015-08-03 13:03:47 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (ptr == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ptr[0] = '\0';
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* The tablename starts after the last slash. */
|
|
|
|
ptr = strrchr((char*) data_dir_path, OS_PATH_SEPARATOR);
|
2015-08-03 13:03:47 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (ptr == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ptr[0] = '\0';
|
|
|
|
|
|
|
|
char* tablename = ptr + 1;
|
|
|
|
|
|
|
|
/* The databasename starts after the next to last slash. */
|
|
|
|
ptr = strrchr((char*) data_dir_path, OS_PATH_SEPARATOR);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (ptr == NULL) {
|
|
|
|
return;
|
2006-02-23 20:25:29 +01:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ulint tablename_len = ut_strlen(tablename);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_memmove(++ptr, tablename, tablename_len);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ptr[tablename_len] = '\0';
|
|
|
|
}
|
2015-08-03 13:03:47 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Check if the path refers to the root of a drive using a pointer
|
|
|
|
to the last directory separator that the caller has fixed.
|
|
|
|
@param[in] path path name
|
|
|
|
@param[in] path last directory separator in the path
|
|
|
|
@return true if this path is a drive root, false if not */
|
|
|
|
UNIV_INLINE
|
|
|
|
bool
|
|
|
|
os_file_is_root(
|
|
|
|
const char* path,
|
|
|
|
const char* last_slash)
|
|
|
|
{
|
|
|
|
return(
|
|
|
|
#ifdef _WIN32
|
|
|
|
(last_slash == path + 2 && path[1] == ':') ||
|
|
|
|
#endif /* _WIN32 */
|
|
|
|
last_slash == path);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Return the parent directory component of a null-terminated path.
|
|
|
|
Return a new buffer containing the string up to, but not including,
|
|
|
|
the final component of the path.
|
|
|
|
The path returned will not contain a trailing separator.
|
|
|
|
Do not return a root path, return NULL instead.
|
|
|
|
The final component trimmed off may be a filename or a directory name.
|
|
|
|
If the final component is the only component of the path, return NULL.
|
|
|
|
It is the caller's responsibility to free the returned string after it
|
|
|
|
is no longer needed.
|
|
|
|
@param[in] path Path name
|
|
|
|
@return own: parent directory of the path */
|
|
|
|
static
|
|
|
|
char*
|
|
|
|
os_file_get_parent_dir(
|
|
|
|
const char* path)
|
|
|
|
{
|
|
|
|
bool has_trailing_slash = false;
|
|
|
|
|
|
|
|
/* Find the offset of the last slash */
|
|
|
|
const char* last_slash = strrchr(path, OS_PATH_SEPARATOR);
|
|
|
|
|
|
|
|
if (!last_slash) {
|
|
|
|
/* No slash in the path, return NULL */
|
|
|
|
return(NULL);
|
2015-08-03 13:03:47 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Ok, there is a slash. Is there anything after it? */
|
|
|
|
if (static_cast<size_t>(last_slash - path + 1) == strlen(path)) {
|
|
|
|
has_trailing_slash = true;
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Reduce repetative slashes. */
|
|
|
|
while (last_slash > path
|
|
|
|
&& last_slash[-1] == OS_PATH_SEPARATOR) {
|
|
|
|
last_slash--;
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Check for the root of a drive. */
|
|
|
|
if (os_file_is_root(path, last_slash)) {
|
|
|
|
return(NULL);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* If a trailing slash prevented the first strrchr() from trimming
|
|
|
|
the last component of the path, trim that component now. */
|
|
|
|
if (has_trailing_slash) {
|
|
|
|
/* Back up to the previous slash. */
|
|
|
|
last_slash--;
|
|
|
|
while (last_slash > path
|
|
|
|
&& last_slash[0] != OS_PATH_SEPARATOR) {
|
|
|
|
last_slash--;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Reduce repetative slashes. */
|
|
|
|
while (last_slash > path
|
|
|
|
&& last_slash[-1] == OS_PATH_SEPARATOR) {
|
|
|
|
last_slash--;
|
2014-04-16 15:55:36 +02:00
|
|
|
}
|
2013-12-19 13:36:38 +01:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Check for the root of a drive. */
|
|
|
|
if (os_file_is_root(path, last_slash)) {
|
|
|
|
return(NULL);
|
|
|
|
}
|
2014-01-10 11:11:36 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Non-trivial directory component */
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(mem_strdupl(path, last_slash - path));
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
2016-08-12 10:17:45 +02:00
|
|
|
#ifdef UNIV_ENABLE_UNIT_TEST_GET_PARENT_DIR
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Test the function os_file_get_parent_dir. */
|
2007-04-02 07:39:41 +02:00
|
|
|
void
|
2016-08-12 10:17:45 +02:00
|
|
|
test_os_file_get_parent_dir(
|
|
|
|
const char* child_dir,
|
|
|
|
const char* expected_dir)
|
2007-04-02 07:39:41 +02:00
|
|
|
{
|
2016-08-12 10:17:45 +02:00
|
|
|
char* child = mem_strdup(child_dir);
|
|
|
|
char* expected = expected_dir == NULL ? NULL
|
|
|
|
: mem_strdup(expected_dir);
|
|
|
|
|
|
|
|
/* os_file_get_parent_dir() assumes that separators are
|
|
|
|
converted to OS_PATH_SEPARATOR. */
|
|
|
|
os_normalize_path(child);
|
|
|
|
os_normalize_path(expected);
|
|
|
|
|
|
|
|
char* parent = os_file_get_parent_dir(child);
|
|
|
|
|
|
|
|
bool unexpected = (expected == NULL
|
|
|
|
? (parent != NULL)
|
|
|
|
: (0 != strcmp(parent, expected)));
|
|
|
|
if (unexpected) {
|
|
|
|
ib::fatal() << "os_file_get_parent_dir('" << child
|
|
|
|
<< "') returned '" << parent
|
|
|
|
<< "', instead of '" << expected << "'.";
|
|
|
|
}
|
|
|
|
ut_free(parent);
|
|
|
|
ut_free(child);
|
|
|
|
ut_free(expected);
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Test the function os_file_get_parent_dir. */
|
|
|
|
void
|
|
|
|
unit_test_os_file_get_parent_dir()
|
|
|
|
{
|
|
|
|
test_os_file_get_parent_dir("/usr/lib/a", "/usr/lib");
|
|
|
|
test_os_file_get_parent_dir("/usr/", NULL);
|
|
|
|
test_os_file_get_parent_dir("//usr//", NULL);
|
|
|
|
test_os_file_get_parent_dir("usr", NULL);
|
|
|
|
test_os_file_get_parent_dir("usr//", NULL);
|
|
|
|
test_os_file_get_parent_dir("/", NULL);
|
|
|
|
test_os_file_get_parent_dir("//", NULL);
|
|
|
|
test_os_file_get_parent_dir(".", NULL);
|
|
|
|
test_os_file_get_parent_dir("..", NULL);
|
|
|
|
# ifdef _WIN32
|
|
|
|
test_os_file_get_parent_dir("D:", NULL);
|
|
|
|
test_os_file_get_parent_dir("D:/", NULL);
|
|
|
|
test_os_file_get_parent_dir("D:\\", NULL);
|
|
|
|
test_os_file_get_parent_dir("D:/data", NULL);
|
|
|
|
test_os_file_get_parent_dir("D:/data/", NULL);
|
|
|
|
test_os_file_get_parent_dir("D:\\data\\", NULL);
|
|
|
|
test_os_file_get_parent_dir("D:///data/////", NULL);
|
|
|
|
test_os_file_get_parent_dir("D:\\\\\\data\\\\\\\\", NULL);
|
|
|
|
test_os_file_get_parent_dir("D:/data//a", "D:/data");
|
|
|
|
test_os_file_get_parent_dir("D:\\data\\\\a", "D:\\data");
|
|
|
|
test_os_file_get_parent_dir("D:///data//a///b/", "D:///data//a");
|
|
|
|
test_os_file_get_parent_dir("D:\\\\\\data\\\\a\\\\\\b\\", "D:\\\\\\data\\\\a");
|
|
|
|
#endif /* _WIN32 */
|
2013-04-06 00:36:10 +02:00
|
|
|
}
|
2016-08-12 10:17:45 +02:00
|
|
|
#endif /* UNIV_ENABLE_UNIT_TEST_GET_PARENT_DIR */
|
2013-04-06 00:36:10 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
/** Creates all missing subdirectories along the given path.
|
|
|
|
@param[in] path Path name
|
|
|
|
@return DB_SUCCESS if OK, otherwise error code. */
|
|
|
|
dberr_t
|
|
|
|
os_file_create_subdirs_if_needed(
|
|
|
|
const char* path)
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
2016-08-12 10:17:45 +02:00
|
|
|
if (srv_read_only_mode) {
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ib::error()
|
|
|
|
<< "read only mode set. Can't create "
|
|
|
|
<< "subdirectories '" << path << "'";
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(DB_READ_ONLY);
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
char* subdir = os_file_get_parent_dir(path);
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (subdir == NULL) {
|
|
|
|
/* subdir is root or cwd, nothing to do */
|
|
|
|
return(DB_SUCCESS);
|
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Test if subdir exists */
|
|
|
|
os_file_type_t type;
|
|
|
|
bool subdir_exists;
|
|
|
|
bool success = os_file_status(subdir, &subdir_exists, &type);
|
2013-01-31 09:48:19 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (success && !subdir_exists) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Subdir does not exist, create it */
|
|
|
|
dberr_t err = os_file_create_subdirs_if_needed(subdir);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (err != DB_SUCCESS) {
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_free(subdir);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(err);
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
success = os_file_create_directory(subdir, false);
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_free(subdir);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(success ? DB_SUCCESS : DB_ERROR);
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#ifndef _WIN32
|
|
|
|
|
|
|
|
/** Do the read/write
|
|
|
|
@param[in] request The IO context and type
|
|
|
|
@return the number of bytes read/written or negative value on error */
|
|
|
|
ssize_t
|
|
|
|
SyncFileIO::execute(const IORequest& request)
|
|
|
|
{
|
|
|
|
ssize_t n_bytes;
|
|
|
|
|
|
|
|
if (request.is_read()) {
|
|
|
|
n_bytes = pread(m_fh, m_buf, m_n, m_offset);
|
|
|
|
} else {
|
|
|
|
ut_ad(request.is_write());
|
|
|
|
n_bytes = pwrite(m_fh, m_buf, m_n, m_offset);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(n_bytes);
|
|
|
|
}
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
/** Free storage space associated with a section of the file.
|
|
|
|
@param[in] fh Open file handle
|
|
|
|
@param[in] off Starting offset (SEEK_SET)
|
|
|
|
@param[in] len Size of the hole
|
|
|
|
@return DB_SUCCESS or error code */
|
|
|
|
static
|
|
|
|
dberr_t
|
|
|
|
os_file_punch_hole_posix(
|
|
|
|
os_file_t fh,
|
|
|
|
os_offset_t off,
|
|
|
|
os_offset_t len)
|
|
|
|
{
|
|
|
|
|
|
|
|
#ifdef HAVE_FALLOC_PUNCH_HOLE_AND_KEEP_SIZE
|
|
|
|
const int mode = FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE;
|
|
|
|
|
|
|
|
int ret = fallocate(fh, mode, off, len);
|
|
|
|
|
|
|
|
if (ret == 0) {
|
|
|
|
return(DB_SUCCESS);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (errno == ENOTSUP) {
|
|
|
|
return(DB_IO_NO_PUNCH_HOLE);
|
|
|
|
}
|
|
|
|
|
|
|
|
ib::warn()
|
|
|
|
<< "fallocate("
|
|
|
|
<<", FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, "
|
|
|
|
<< off << ", " << len << ") returned errno: "
|
|
|
|
<< errno;
|
|
|
|
|
|
|
|
return(DB_IO_ERROR);
|
|
|
|
|
|
|
|
#elif defined(UNIV_SOLARIS)
|
|
|
|
|
|
|
|
// Use F_FREESP
|
|
|
|
|
|
|
|
#endif /* HAVE_FALLOC_PUNCH_HOLE_AND_KEEP_SIZE */
|
|
|
|
|
|
|
|
return(DB_IO_NO_PUNCH_HOLE);
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#if defined(LINUX_NATIVE_AIO)
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Linux native AIO handler */
|
|
|
|
class LinuxAIOHandler {
|
|
|
|
public:
|
|
|
|
/**
|
|
|
|
@param[in] global_segment The global segment*/
|
|
|
|
LinuxAIOHandler(ulint global_segment)
|
|
|
|
:
|
|
|
|
m_global_segment(global_segment)
|
|
|
|
{
|
|
|
|
/* Should never be doing Sync IO here. */
|
|
|
|
ut_a(m_global_segment != ULINT_UNDEFINED);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Find the array and the local segment. */
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
m_segment = AIO::get_array_and_local_segment(
|
|
|
|
&m_array, m_global_segment);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
m_n_slots = m_array->slots_per_segment();
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Destructor */
|
|
|
|
~LinuxAIOHandler()
|
|
|
|
{
|
|
|
|
// No op
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
Process a Linux AIO request
|
|
|
|
@param[out] m1 the messages passed with the
|
|
|
|
@param[out] m2 AIO request; note that in case the
|
|
|
|
AIO operation failed, these output
|
|
|
|
parameters are valid and can be used to
|
|
|
|
restart the operation.
|
|
|
|
@param[out] request IO context
|
|
|
|
@return DB_SUCCESS or error code */
|
|
|
|
dberr_t poll(fil_node_t** m1, void** m2, IORequest* request);
|
|
|
|
|
|
|
|
private:
|
|
|
|
/** Resubmit an IO request that was only partially successful
|
|
|
|
@param[in,out] slot Request to resubmit
|
|
|
|
@return DB_SUCCESS or DB_FAIL if the IO resubmit request failed */
|
|
|
|
dberr_t resubmit(Slot* slot);
|
|
|
|
|
|
|
|
/** Check if the AIO succeeded
|
|
|
|
@param[in,out] slot The slot to check
|
|
|
|
@return DB_SUCCESS, DB_FAIL if the operation should be retried or
|
|
|
|
DB_IO_ERROR on all other errors */
|
|
|
|
dberr_t check_state(Slot* slot);
|
|
|
|
|
|
|
|
/** @return true if a shutdown was detected */
|
|
|
|
bool is_shutdown() const
|
|
|
|
{
|
|
|
|
return(srv_shutdown_state == SRV_SHUTDOWN_EXIT_THREADS
|
|
|
|
&& !buf_page_cleaner_is_active);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** If no slot was found then the m_array->m_mutex will be released.
|
|
|
|
@param[out] n_pending The number of pending IOs
|
|
|
|
@return NULL or a slot that has completed IO */
|
|
|
|
Slot* find_completed_slot(ulint* n_pending);
|
|
|
|
|
|
|
|
/** This is called from within the IO-thread. If there are no completed
|
|
|
|
IO requests in the slot array, the thread calls this function to
|
|
|
|
collect more requests from the Linux kernel.
|
|
|
|
The IO-thread waits on io_getevents(), which is a blocking call, with
|
|
|
|
a timeout value. Unless the system is very heavy loaded, keeping the
|
|
|
|
IO-thread very busy, the io-thread will spend most of its time waiting
|
|
|
|
in this function.
|
|
|
|
The IO-thread also exits in this function. It checks server status at
|
|
|
|
each wakeup and that is why we use timed wait in io_getevents(). */
|
|
|
|
void collect();
|
|
|
|
|
|
|
|
private:
|
|
|
|
/** Slot array */
|
|
|
|
AIO* m_array;
|
|
|
|
|
|
|
|
/** Number of slots inthe local segment */
|
|
|
|
ulint m_n_slots;
|
|
|
|
|
|
|
|
/** The local segment to check */
|
|
|
|
ulint m_segment;
|
|
|
|
|
|
|
|
/** The global segment */
|
|
|
|
ulint m_global_segment;
|
|
|
|
};
|
|
|
|
|
|
|
|
/** Resubmit an IO request that was only partially successful
|
|
|
|
@param[in,out] slot Request to resubmit
|
|
|
|
@return DB_SUCCESS or DB_FAIL if the IO resubmit request failed */
|
|
|
|
dberr_t
|
|
|
|
LinuxAIOHandler::resubmit(Slot* slot)
|
|
|
|
{
|
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
/* Bytes already read/written out */
|
|
|
|
ulint n_bytes = slot->ptr - slot->buf;
|
|
|
|
|
|
|
|
ut_ad(m_array->is_mutex_owned());
|
|
|
|
|
|
|
|
ut_ad(n_bytes < slot->original_len);
|
|
|
|
ut_ad(static_cast<ulint>(slot->n_bytes) < slot->original_len - n_bytes);
|
|
|
|
/* Partial read or write scenario */
|
|
|
|
ut_ad(slot->len >= static_cast<ulint>(slot->n_bytes));
|
|
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
|
|
|
|
slot->len -= slot->n_bytes;
|
|
|
|
slot->ptr += slot->n_bytes;
|
|
|
|
slot->offset += slot->n_bytes;
|
|
|
|
|
|
|
|
/* Resetting the bytes read/written */
|
|
|
|
slot->n_bytes = 0;
|
|
|
|
slot->io_already_done = false;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
struct iocb* iocb = &slot->control;
|
|
|
|
|
|
|
|
if (slot->type.is_read()) {
|
|
|
|
|
|
|
|
io_prep_pread(
|
|
|
|
iocb,
|
|
|
|
slot->file,
|
|
|
|
slot->ptr,
|
|
|
|
slot->len,
|
|
|
|
static_cast<off_t>(slot->offset));
|
2005-10-27 09:29:40 +02:00
|
|
|
} else {
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_a(slot->type.is_write());
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
io_prep_pwrite(
|
|
|
|
iocb,
|
|
|
|
slot->file,
|
|
|
|
slot->ptr,
|
|
|
|
slot->len,
|
|
|
|
static_cast<off_t>(slot->offset));
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
iocb->data = slot;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Resubmit an I/O request */
|
|
|
|
int ret = io_submit(m_array->io_ctx(m_segment), 1, &iocb);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (ret < -1) {
|
|
|
|
errno = -ret;
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
2007-04-02 07:39:41 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(ret < 0 ? DB_IO_PARTIAL_FAILED : DB_SUCCESS);
|
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Check if the AIO succeeded
|
|
|
|
@param[in,out] slot The slot to check
|
|
|
|
@return DB_SUCCESS, DB_FAIL if the operation should be retried or
|
|
|
|
DB_IO_ERROR on all other errors */
|
|
|
|
dberr_t
|
|
|
|
LinuxAIOHandler::check_state(Slot* slot)
|
|
|
|
{
|
|
|
|
ut_ad(m_array->is_mutex_owned());
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Note that it may be that there is more then one completed
|
|
|
|
IO requests. We process them one at a time. We may have a case
|
|
|
|
here to improve the performance slightly by dealing with all
|
|
|
|
requests in one sweep. */
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
srv_set_io_thread_op_info(
|
|
|
|
m_global_segment, "processing completed aio requests");
|
2008-08-09 02:15:46 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_ad(slot->io_already_done);
|
2007-04-02 07:39:41 +02:00
|
|
|
|
2016-09-06 08:43:16 +02:00
|
|
|
dberr_t err = DB_SUCCESS;
|
2007-04-02 07:39:41 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (slot->ret == 0) {
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
err = AIOHandler::post_io_processing(slot);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
errno = -slot->ret;
|
|
|
|
|
|
|
|
/* os_file_handle_error does tell us if we should retry
|
|
|
|
this IO. As it stands now, we don't do this retry when
|
|
|
|
reaping requests from a different context than
|
|
|
|
the dispatcher. This non-retry logic is the same for
|
|
|
|
Windows and Linux native AIO.
|
|
|
|
We should probably look into this to transparently
|
|
|
|
re-submit the IO. */
|
|
|
|
os_file_handle_error(slot->name, "Linux aio");
|
|
|
|
|
|
|
|
err = DB_IO_ERROR;
|
2007-04-02 07:39:41 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(err);
|
|
|
|
}
|
2007-04-02 07:39:41 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** If no slot was found then the m_array->m_mutex will be released.
|
|
|
|
@param[out] n_pending The number of pending IOs
|
|
|
|
@return NULL or a slot that has completed IO */
|
|
|
|
Slot*
|
|
|
|
LinuxAIOHandler::find_completed_slot(ulint* n_pending)
|
|
|
|
{
|
|
|
|
ulint offset = m_n_slots * m_segment;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
*n_pending = 0;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
m_array->acquire();
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
Slot* slot = m_array->at(offset);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
for (ulint i = 0; i < m_n_slots; ++i, ++slot) {
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (slot->is_reserved) {
|
2007-04-02 07:39:41 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
++*n_pending;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (slot->io_already_done) {
|
|
|
|
|
|
|
|
/* Something for us to work on.
|
|
|
|
Note: We don't release the mutex. */
|
|
|
|
return(slot);
|
|
|
|
}
|
2014-04-16 15:55:36 +02:00
|
|
|
}
|
2013-12-19 13:36:38 +01:00
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
m_array->release();
|
|
|
|
|
|
|
|
return(NULL);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** This function is only used in Linux native asynchronous i/o. This is
|
|
|
|
called from within the io-thread. If there are no completed IO requests
|
|
|
|
in the slot array, the thread calls this function to collect more
|
|
|
|
requests from the kernel.
|
|
|
|
The io-thread waits on io_getevents(), which is a blocking call, with
|
|
|
|
a timeout value. Unless the system is very heavy loaded, keeping the
|
|
|
|
io-thread very busy, the io-thread will spend most of its time waiting
|
|
|
|
in this function.
|
|
|
|
The io-thread also exits in this function. It checks server status at
|
|
|
|
each wakeup and that is why we use timed wait in io_getevents(). */
|
|
|
|
void
|
|
|
|
LinuxAIOHandler::collect()
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_ad(m_n_slots > 0);
|
|
|
|
ut_ad(m_array != NULL);
|
|
|
|
ut_ad(m_segment < m_array->get_n_segments());
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Which io_context we are going to use. */
|
|
|
|
io_context* io_ctx = m_array->io_ctx(m_segment);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Starting point of the m_segment we will be working on. */
|
|
|
|
ulint start_pos = m_segment * m_n_slots;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* End point. */
|
|
|
|
ulint end_pos = start_pos + m_n_slots;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
for (;;) {
|
|
|
|
struct io_event* events;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Which part of event array we are going to work on. */
|
|
|
|
events = m_array->io_events(m_segment * m_n_slots);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Initialize the events. */
|
|
|
|
memset(events, 0, sizeof(*events) * m_n_slots);
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* The timeout value is arbitrary. We probably need
|
|
|
|
to experiment with it a little. */
|
|
|
|
struct timespec timeout;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
timeout.tv_sec = 0;
|
|
|
|
timeout.tv_nsec = OS_AIO_REAP_TIMEOUT;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
int ret;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ret = io_getevents(io_ctx, 1, m_n_slots, events, &timeout);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
for (int i = 0; i < ret; ++i) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
struct iocb* iocb;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
iocb = reinterpret_cast<struct iocb*>(events[i].obj);
|
|
|
|
ut_a(iocb != NULL);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
Slot* slot = reinterpret_cast<Slot*>(iocb->data);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Some sanity checks. */
|
|
|
|
ut_a(slot != NULL);
|
|
|
|
ut_a(slot->is_reserved);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* We are not scribbling previous segment. */
|
|
|
|
ut_a(slot->pos >= start_pos);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* We have not overstepped to next segment. */
|
|
|
|
ut_a(slot->pos < end_pos);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
/* Deallocate unused blocks from file system.
|
|
|
|
This is newer done to page 0 or to log files.*/
|
|
|
|
if (slot->offset > 0
|
|
|
|
&& !slot->type.is_log()
|
|
|
|
&& slot->type.is_write()
|
|
|
|
&& slot->type.punch_hole()) {
|
|
|
|
|
2017-01-25 09:04:14 +01:00
|
|
|
slot->err = slot->type.punch_hole(
|
|
|
|
slot->file,
|
|
|
|
slot->offset,
|
|
|
|
static_cast<os_offset_t>(slot->len));
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
} else {
|
|
|
|
slot->err = DB_SUCCESS;
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Mark this request as completed. The error handling
|
|
|
|
will be done in the calling function. */
|
|
|
|
m_array->acquire();
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
slot->ret = events[i].res2;
|
|
|
|
slot->io_already_done = true;
|
|
|
|
slot->n_bytes = events[i].res;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
m_array->release();
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (srv_shutdown_state == SRV_SHUTDOWN_EXIT_THREADS
|
|
|
|
|| !buf_page_cleaner_is_active
|
|
|
|
|| ret > 0) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
break;
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* This error handling is for any error in collecting the
|
|
|
|
IO requests. The errors, if any, for any particular IO
|
|
|
|
request are simply passed on to the calling routine. */
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
switch (ret) {
|
|
|
|
case -EAGAIN:
|
|
|
|
/* Not enough resources! Try again. */
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
case -EINTR:
|
|
|
|
/* Interrupted! The behaviour in case of an interrupt.
|
|
|
|
If we have some completed IOs available then the
|
|
|
|
return code will be the number of IOs. We get EINTR
|
|
|
|
only if there are no completed IOs and we have been
|
|
|
|
interrupted. */
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
case 0:
|
|
|
|
/* No pending request! Go back and check again. */
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
continue;
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* All other errors should cause a trap for now. */
|
|
|
|
ib::fatal()
|
|
|
|
<< "Unexpected ret_code[" << ret
|
|
|
|
<< "] from io_getevents()!";
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Process a Linux AIO request
|
|
|
|
@param[out] m1 the messages passed with the
|
|
|
|
@param[out] m2 AIO request; note that in case the
|
|
|
|
AIO operation failed, these output
|
|
|
|
parameters are valid and can be used to
|
|
|
|
restart the operation.
|
|
|
|
@param[out] request IO context
|
|
|
|
@return DB_SUCCESS or error code */
|
|
|
|
dberr_t
|
|
|
|
LinuxAIOHandler::poll(fil_node_t** m1, void** m2, IORequest* request)
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
2016-09-06 08:43:16 +02:00
|
|
|
dberr_t err = DB_SUCCESS;
|
2016-08-12 10:17:45 +02:00
|
|
|
Slot* slot;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Loop until we have found a completed request. */
|
|
|
|
for (;;) {
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ulint n_pending;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
slot = find_completed_slot(&n_pending);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (slot != NULL) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_ad(m_array->is_mutex_owned());
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
err = check_state(slot);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* DB_FAIL is not a hard error, we should retry */
|
|
|
|
if (err != DB_FAIL) {
|
|
|
|
break;
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Partial IO, resubmit request for
|
|
|
|
remaining bytes to read/write */
|
|
|
|
err = resubmit(slot);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (err != DB_SUCCESS) {
|
|
|
|
break;
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
m_array->release();
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
} else if (is_shutdown() && n_pending == 0) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* There is no completed request. If there is
|
|
|
|
no pending request at all, and the system is
|
|
|
|
being shut down, exit. */
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
*m1 = NULL;
|
|
|
|
*m2 = NULL;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(DB_SUCCESS);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
} else {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Wait for some request. Note that we return
|
|
|
|
from wait if we have found a request. */
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
srv_set_io_thread_op_info(
|
|
|
|
m_global_segment,
|
|
|
|
"waiting for completed aio requests");
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
collect();
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (err == DB_IO_PARTIAL_FAILED) {
|
|
|
|
/* Aborting in case of submit failure */
|
|
|
|
ib::fatal()
|
|
|
|
<< "Native Linux AIO interface. "
|
|
|
|
"io_submit() call failed when "
|
|
|
|
"resubmitting a partial I/O "
|
|
|
|
"request on the file " << slot->name
|
|
|
|
<< ".";
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
*m1 = slot->m1;
|
|
|
|
*m2 = slot->m2;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
*request = slot->type;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
m_array->release(slot);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
m_array->release();
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(err);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** This function is only used in Linux native asynchronous i/o.
|
|
|
|
Waits for an aio operation to complete. This function is used to wait for
|
|
|
|
the completed requests. The aio array of pending requests is divided
|
|
|
|
into segments. The thread specifies which segment or slot it wants to wait
|
|
|
|
for. NOTE: this function will also take care of freeing the aio slot,
|
|
|
|
therefore no other thread is allowed to do the freeing!
|
|
|
|
|
|
|
|
@param[in] global_seg segment number in the aio array
|
|
|
|
to wait for; segment 0 is the ibuf
|
|
|
|
i/o thread, segment 1 is log i/o thread,
|
|
|
|
then follow the non-ibuf read threads,
|
|
|
|
and the last are the non-ibuf write
|
|
|
|
threads.
|
|
|
|
@param[out] m1 the messages passed with the
|
|
|
|
@param[out] m2 AIO request; note that in case the
|
|
|
|
AIO operation failed, these output
|
|
|
|
parameters are valid and can be used to
|
|
|
|
restart the operation.
|
|
|
|
@param[out]xi request IO context
|
|
|
|
@return DB_SUCCESS if the IO was successful */
|
|
|
|
static
|
|
|
|
dberr_t
|
|
|
|
os_aio_linux_handler(
|
|
|
|
ulint global_segment,
|
|
|
|
fil_node_t** m1,
|
|
|
|
void** m2,
|
|
|
|
IORequest* request)
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
2017-01-16 13:03:36 +01:00
|
|
|
return LinuxAIOHandler(global_segment).poll(m1, m2, request);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Dispatch an AIO request to the kernel.
|
|
|
|
@param[in,out] slot an already reserved slot
|
|
|
|
@return true on success. */
|
|
|
|
bool
|
|
|
|
AIO::linux_dispatch(Slot* slot)
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_a(slot->is_reserved);
|
|
|
|
ut_ad(slot->type.validate());
|
|
|
|
|
|
|
|
/* Find out what we are going to work with.
|
|
|
|
The iocb struct is directly in the slot.
|
|
|
|
The io_context is one per segment. */
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ulint io_ctx_index;
|
|
|
|
struct iocb* iocb = &slot->control;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
io_ctx_index = (slot->pos * m_n_segments) / m_slots.size();
|
2013-08-23 08:03:57 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
int ret = io_submit(m_aio_ctx[io_ctx_index], 1, &iocb);
|
2013-08-23 08:03:57 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* io_submit() returns number of successfully queued requests
|
|
|
|
or -errno. */
|
2014-03-03 13:27:56 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (ret != 1) {
|
|
|
|
errno = -ret;
|
2013-08-23 08:03:57 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(ret == 1);
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Creates an io_context for native linux AIO.
|
|
|
|
@param[in] max_events number of events
|
|
|
|
@param[out] io_ctx io_ctx to initialize.
|
|
|
|
@return true on success. */
|
|
|
|
bool
|
|
|
|
AIO::linux_create_io_ctx(
|
|
|
|
ulint max_events,
|
|
|
|
io_context_t* io_ctx)
|
|
|
|
{
|
|
|
|
ssize_t n_retries = 0;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
for (;;) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
memset(io_ctx, 0x0, sizeof(*io_ctx));
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Initialize the io_ctx. Tell it how many pending
|
|
|
|
IO requests this context will handle. */
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
int ret = io_setup(max_events, io_ctx);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (ret == 0) {
|
|
|
|
/* Success. Return now. */
|
|
|
|
return(true);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* If we hit EAGAIN we'll make a few attempts before failing. */
|
|
|
|
|
|
|
|
switch (ret) {
|
|
|
|
case -EAGAIN:
|
|
|
|
if (n_retries == 0) {
|
|
|
|
/* First time around. */
|
|
|
|
ib::warn()
|
|
|
|
<< "io_setup() failed with EAGAIN."
|
|
|
|
" Will make "
|
|
|
|
<< OS_AIO_IO_SETUP_RETRY_ATTEMPTS
|
|
|
|
<< " attempts before giving up.";
|
|
|
|
}
|
2014-07-25 13:37:10 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (n_retries < OS_AIO_IO_SETUP_RETRY_ATTEMPTS) {
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
++n_retries;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ib::warn()
|
|
|
|
<< "io_setup() attempt "
|
|
|
|
<< n_retries << ".";
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
os_thread_sleep(OS_AIO_IO_SETUP_RETRY_SLEEP);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
continue;
|
|
|
|
}
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Have tried enough. Better call it a day. */
|
|
|
|
ib::error()
|
|
|
|
<< "io_setup() failed with EAGAIN after "
|
|
|
|
<< OS_AIO_IO_SETUP_RETRY_ATTEMPTS
|
|
|
|
<< " attempts.";
|
|
|
|
break;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
case -ENOSYS:
|
|
|
|
ib::error()
|
|
|
|
<< "Linux Native AIO interface"
|
|
|
|
" is not supported on this platform. Please"
|
|
|
|
" check your OS documentation and install"
|
|
|
|
" appropriate binary of InnoDB.";
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
ib::error()
|
|
|
|
<< "Linux Native AIO setup"
|
|
|
|
<< " returned following error["
|
|
|
|
<< ret << "]";
|
|
|
|
break;
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ib::info()
|
|
|
|
<< "You can disable Linux Native AIO by"
|
|
|
|
" setting innodb_use_native_aio = 0 in my.cnf";
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
break;
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(false);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Checks if the system supports native linux aio. On some kernel
|
|
|
|
versions where native aio is supported it won't work on tmpfs. In such
|
|
|
|
cases we can't use native aio as it is not possible to mix simulated
|
|
|
|
and native aio.
|
|
|
|
@return: true if supported, false otherwise. */
|
|
|
|
bool
|
|
|
|
AIO::is_linux_native_aio_supported()
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
2016-08-12 10:17:45 +02:00
|
|
|
int fd;
|
|
|
|
io_context_t io_ctx;
|
|
|
|
char name[1000];
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (!linux_create_io_ctx(1, &io_ctx)) {
|
2008-05-14 17:43:19 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* The platform does not support native aio. */
|
|
|
|
|
|
|
|
return(false);
|
2008-05-14 17:43:19 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
} else if (!srv_read_only_mode) {
|
2008-05-14 17:43:19 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Now check if tmpdir supports native aio ops. */
|
2016-09-06 08:43:16 +02:00
|
|
|
fd = innobase_mysql_tmpfile(NULL);
|
2008-05-14 17:43:19 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (fd < 0) {
|
|
|
|
ib::warn()
|
|
|
|
<< "Unable to create temp file to check"
|
|
|
|
" native AIO support.";
|
2008-05-14 17:43:19 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(false);
|
|
|
|
}
|
|
|
|
} else {
|
2008-05-14 17:43:19 +02:00
|
|
|
|
2016-09-06 08:43:16 +02:00
|
|
|
os_normalize_path(srv_log_group_home_dir);
|
2008-05-14 17:43:19 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ulint dirnamelen = strlen(srv_log_group_home_dir);
|
2008-05-14 17:43:19 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_a(dirnamelen < (sizeof name) - 10 - sizeof "ib_logfile");
|
2008-05-14 17:43:19 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
memcpy(name, srv_log_group_home_dir, dirnamelen);
|
2008-05-14 17:43:19 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Add a path separator if needed. */
|
|
|
|
if (dirnamelen && name[dirnamelen - 1] != OS_PATH_SEPARATOR) {
|
2008-05-14 17:43:19 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
name[dirnamelen++] = OS_PATH_SEPARATOR;
|
2008-05-14 17:43:19 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
strcpy(name + dirnamelen, "ib_logfile0");
|
2008-05-14 17:43:19 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
fd = ::open(name, O_RDONLY);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (fd == -1) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ib::warn()
|
|
|
|
<< "Unable to open"
|
|
|
|
<< " \"" << name << "\" to check native"
|
|
|
|
<< " AIO read support.";
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(false);
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
struct io_event io_event;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
memset(&io_event, 0x0, sizeof(io_event));
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
byte* buf = static_cast<byte*>(ut_malloc_nokey(UNIV_PAGE_SIZE * 2));
|
|
|
|
byte* ptr = static_cast<byte*>(ut_align(buf, UNIV_PAGE_SIZE));
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
struct iocb iocb;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Suppress valgrind warning. */
|
|
|
|
memset(buf, 0x00, UNIV_PAGE_SIZE * 2);
|
|
|
|
memset(&iocb, 0x0, sizeof(iocb));
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
struct iocb* p_iocb = &iocb;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (!srv_read_only_mode) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
io_prep_pwrite(p_iocb, fd, ptr, UNIV_PAGE_SIZE, 0);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
} else {
|
|
|
|
ut_a(UNIV_PAGE_SIZE >= 512);
|
|
|
|
io_prep_pread(p_iocb, fd, ptr, 512, 0);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
int err = io_submit(io_ctx, 1, &p_iocb);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (err >= 1) {
|
|
|
|
/* Now collect the submitted IO request. */
|
|
|
|
err = io_getevents(io_ctx, 1, 1, &io_event, NULL);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_free(buf);
|
|
|
|
close(fd);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
switch (err) {
|
|
|
|
case 1:
|
|
|
|
return(true);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
case -EINVAL:
|
|
|
|
case -ENOSYS:
|
|
|
|
ib::error()
|
|
|
|
<< "Linux Native AIO not supported. You can either"
|
|
|
|
" move "
|
|
|
|
<< (srv_read_only_mode ? name : "tmpdir")
|
|
|
|
<< " to a file system that supports native"
|
|
|
|
" AIO or you can set innodb_use_native_aio to"
|
|
|
|
" FALSE to avoid this message.";
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* fall through. */
|
|
|
|
default:
|
|
|
|
ib::error()
|
|
|
|
<< "Linux Native AIO check on "
|
|
|
|
<< (srv_read_only_mode ? name : "tmpdir")
|
|
|
|
<< "returned error[" << -err << "]";
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(false);
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#endif /* LINUX_NATIVE_AIO */
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Retrieves the last error number if an error occurs in a file io function.
|
|
|
|
The number should be retrieved before any other OS calls (because they may
|
|
|
|
overwrite the error number). If the number is not known to this program,
|
|
|
|
the OS error number + 100 is returned.
|
|
|
|
@param[in] report_all_errors true if we want an error message
|
|
|
|
printed of all errors
|
|
|
|
@param[in] on_error_silent true then don't print any diagnostic
|
|
|
|
to the log
|
|
|
|
@return error number, or OS error number + 100 */
|
|
|
|
static
|
|
|
|
ulint
|
|
|
|
os_file_get_last_error_low(
|
|
|
|
bool report_all_errors,
|
|
|
|
bool on_error_silent)
|
|
|
|
{
|
|
|
|
int err = errno;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (err == 0) {
|
|
|
|
return(0);
|
2006-02-23 20:25:29 +01:00
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (report_all_errors
|
|
|
|
|| (err != ENOSPC && err != EEXIST && !on_error_silent)) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ib::error()
|
|
|
|
<< "Operating system error number "
|
|
|
|
<< err
|
|
|
|
<< " in a file operation.";
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (err == ENOENT) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ib::error()
|
|
|
|
<< "The error means the system"
|
|
|
|
" cannot find the path specified.";
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (srv_is_being_started) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ib::error()
|
|
|
|
<< "If you are installing InnoDB,"
|
|
|
|
" remember that you must create"
|
|
|
|
" directories yourself, InnoDB"
|
|
|
|
" does not create them.";
|
|
|
|
}
|
|
|
|
} else if (err == EACCES) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ib::error()
|
|
|
|
<< "The error means mysqld does not have"
|
|
|
|
" the access rights to the directory.";
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2006-08-29 11:30:31 +02:00
|
|
|
} else {
|
2016-08-12 10:17:45 +02:00
|
|
|
if (strerror(err) != NULL) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ib::error()
|
|
|
|
<< "Error number " << err << " means '"
|
|
|
|
<< strerror(err) << "'";
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ib::info() << OPERATING_SYSTEM_ERROR_MSG;
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
2006-02-23 20:25:29 +01:00
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
switch (err) {
|
|
|
|
case ENOSPC:
|
|
|
|
return(OS_FILE_DISK_FULL);
|
|
|
|
case ENOENT:
|
|
|
|
return(OS_FILE_NOT_FOUND);
|
|
|
|
case EEXIST:
|
|
|
|
return(OS_FILE_ALREADY_EXISTS);
|
|
|
|
case EXDEV:
|
|
|
|
case ENOTDIR:
|
|
|
|
case EISDIR:
|
|
|
|
return(OS_FILE_PATH_ERROR);
|
|
|
|
case EAGAIN:
|
|
|
|
if (srv_use_native_aio) {
|
|
|
|
return(OS_FILE_AIO_RESOURCES_RESERVED);
|
2006-08-29 11:30:31 +02:00
|
|
|
}
|
2016-08-12 10:17:45 +02:00
|
|
|
break;
|
|
|
|
case EINTR:
|
|
|
|
if (srv_use_native_aio) {
|
|
|
|
return(OS_FILE_AIO_INTERRUPTED);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case EACCES:
|
|
|
|
return(OS_FILE_ACCESS_VIOLATION);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
2016-08-12 10:17:45 +02:00
|
|
|
return(OS_FILE_ERROR_MAX + err);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Wrapper to fsync(2) that retries the call on some errors.
|
|
|
|
Returns the value 0 if successful; otherwise the value -1 is returned and
|
|
|
|
the global variable errno is set to indicate the error.
|
|
|
|
@param[in] file open file handle
|
|
|
|
@return 0 if success, -1 otherwise */
|
|
|
|
static
|
|
|
|
int
|
|
|
|
os_file_fsync_posix(
|
|
|
|
os_file_t file)
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
2016-08-12 10:17:45 +02:00
|
|
|
ulint failures = 0;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
for (;;) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
++os_n_fsyncs;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
int ret = fsync(file);
|
2006-02-17 15:19:39 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (ret == 0) {
|
|
|
|
return(ret);
|
|
|
|
}
|
2006-02-17 15:19:39 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
switch(errno) {
|
|
|
|
case ENOLCK:
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
++failures;
|
|
|
|
ut_a(failures < 1000);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (!(failures % 100)) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ib::warn()
|
|
|
|
<< "fsync(): "
|
|
|
|
<< "No locks available; retrying";
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* 0.2 sec */
|
|
|
|
os_thread_sleep(200000);
|
|
|
|
break;
|
2006-02-17 15:19:39 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
case EIO:
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
++failures;
|
|
|
|
ut_a(failures < 1000);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (!(failures % 100)) {
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ib::warn()
|
|
|
|
<< "fsync(): "
|
|
|
|
<< "An error occurred during "
|
|
|
|
<< "synchronization,"
|
|
|
|
<< " retrying";
|
|
|
|
}
|
2006-02-17 15:19:39 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* 0.2 sec */
|
|
|
|
os_thread_sleep(200000);
|
|
|
|
break;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
case EINTR:
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
++failures;
|
|
|
|
ut_a(failures < 2000);
|
|
|
|
break;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
default:
|
|
|
|
ut_error;
|
|
|
|
break;
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2005-10-27 09:29:40 +02:00
|
|
|
ut_error;
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(-1);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Check the existence and type of the given file.
|
|
|
|
@param[in] path path name of file
|
|
|
|
@param[out] exists true if the file exists
|
|
|
|
@param[out] type Type of the file, if it exists
|
|
|
|
@return true if call succeeded */
|
|
|
|
bool
|
|
|
|
os_file_status_posix(
|
|
|
|
const char* path,
|
|
|
|
bool* exists,
|
|
|
|
os_file_type_t* type)
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
2016-08-12 10:17:45 +02:00
|
|
|
struct stat statinfo;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
int ret = stat(path, &statinfo);
|
2006-02-17 15:19:39 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
*exists = !ret;
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (!ret) {
|
|
|
|
/* file exists, everything OK */
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
} else if (errno == ENOENT || errno == ENOTDIR || errno == ENAMETOOLONG) {
|
|
|
|
/* file does not exist */
|
|
|
|
return(true);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
} else {
|
|
|
|
/* file exists, but stat call failed */
|
|
|
|
os_file_handle_error_no_exit(path, "stat", false);
|
|
|
|
return(false);
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (S_ISDIR(statinfo.st_mode)) {
|
|
|
|
*type = OS_FILE_TYPE_DIR;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
} else if (S_ISLNK(statinfo.st_mode)) {
|
|
|
|
*type = OS_FILE_TYPE_LINK;
|
2006-02-17 15:19:39 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
} else if (S_ISREG(statinfo.st_mode)) {
|
|
|
|
*type = OS_FILE_TYPE_FILE;
|
|
|
|
} else {
|
|
|
|
*type = OS_FILE_TYPE_UNKNOWN;
|
2006-02-23 20:25:29 +01:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(true);
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** NOTE! Use the corresponding macro os_file_flush(), not directly this
|
|
|
|
function!
|
|
|
|
Flushes the write buffers of a given file to the disk.
|
|
|
|
@param[in] file handle to a file
|
|
|
|
@return true if success */
|
|
|
|
bool
|
|
|
|
os_file_flush_func(
|
|
|
|
os_file_t file)
|
|
|
|
{
|
|
|
|
int ret;
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2017-01-31 11:25:25 +01:00
|
|
|
WAIT_ALLOW_WRITES();
|
2016-08-12 10:17:45 +02:00
|
|
|
ret = os_file_fsync_posix(file);
|
2006-02-17 15:19:39 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (ret == 0) {
|
|
|
|
return(true);
|
2006-02-23 20:25:29 +01:00
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Since Linux returns EINVAL if the 'file' is actually a raw device,
|
|
|
|
we choose to ignore that error if we are using raw disks */
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (srv_start_raw_disk_in_use && errno == EINVAL) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(true);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ib::error() << "The OS said file flush did not succeed";
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
os_file_handle_error(NULL, "flush");
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* It is a fatal error if a file flush does not succeed, because then
|
|
|
|
the database can get corrupt on disk */
|
|
|
|
ut_error;
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(false);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** NOTE! Use the corresponding macro os_file_create_simple(), not directly
|
2010-03-29 09:34:42 +02:00
|
|
|
this function!
|
2016-08-12 10:17:45 +02:00
|
|
|
A simple function to open or create a file.
|
|
|
|
@param[in] name name of the file or path as a null-terminated
|
|
|
|
string
|
|
|
|
@param[in] create_mode create mode
|
|
|
|
@param[in] access_type OS_FILE_READ_ONLY or OS_FILE_READ_WRITE
|
|
|
|
@param[in] read_only if true, read only checks are enforced
|
|
|
|
@param[out] success true if succeed, false if error
|
|
|
|
@return handle to the file, not defined if error, error number
|
|
|
|
can be retrieved with os_file_get_last_error */
|
|
|
|
os_file_t
|
|
|
|
os_file_create_simple_func(
|
|
|
|
const char* name,
|
|
|
|
ulint create_mode,
|
|
|
|
ulint access_type,
|
|
|
|
bool read_only,
|
|
|
|
bool* success)
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
2016-08-12 10:17:45 +02:00
|
|
|
os_file_t file;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
*success = false;
|
2014-07-25 13:37:10 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
int create_flag;
|
|
|
|
const char* mode_str = NULL;
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2017-01-31 11:25:25 +01:00
|
|
|
if (create_mode != OS_FILE_OPEN && create_mode != OS_FILE_OPEN_RAW) {
|
|
|
|
WAIT_ALLOW_WRITES();
|
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_a(!(create_mode & OS_FILE_ON_ERROR_SILENT));
|
|
|
|
ut_a(!(create_mode & OS_FILE_ON_ERROR_NO_EXIT));
|
2006-02-17 15:19:39 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (create_mode == OS_FILE_OPEN) {
|
|
|
|
mode_str = "OPEN";
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (access_type == OS_FILE_READ_ONLY) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
create_flag = O_RDONLY;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
} else if (read_only) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
create_flag = O_RDONLY;
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
} else {
|
|
|
|
create_flag = O_RDWR;
|
|
|
|
}
|
2006-02-17 15:19:39 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
} else if (read_only) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
mode_str = "OPEN";
|
|
|
|
create_flag = O_RDONLY;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
} else if (create_mode == OS_FILE_CREATE) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
mode_str = "CREATE";
|
|
|
|
create_flag = O_RDWR | O_CREAT | O_EXCL;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
} else if (create_mode == OS_FILE_CREATE_PATH) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
mode_str = "CREATE PATH";
|
|
|
|
/* Create subdirs along the path if needed. */
|
2006-02-17 15:19:39 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
*success = os_file_create_subdirs_if_needed(name);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (!*success) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ib::error()
|
|
|
|
<< "Unable to create subdirectories '"
|
|
|
|
<< name << "'";
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(OS_FILE_CLOSED);
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
create_flag = O_RDWR | O_CREAT | O_EXCL;
|
|
|
|
create_mode = OS_FILE_CREATE;
|
|
|
|
} else {
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ib::error()
|
|
|
|
<< "Unknown file create mode ("
|
|
|
|
<< create_mode
|
|
|
|
<< " for file '" << name << "'";
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(OS_FILE_CLOSED);
|
2006-02-23 20:25:29 +01:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
bool retry;
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
do {
|
|
|
|
file = ::open(name, create_flag, os_innodb_umask);
|
2014-07-22 09:10:56 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (file == -1) {
|
|
|
|
*success = false;
|
|
|
|
retry = os_file_handle_error(
|
|
|
|
name,
|
|
|
|
create_mode == OS_FILE_OPEN
|
|
|
|
? "open" : "create");
|
|
|
|
} else {
|
|
|
|
*success = true;
|
|
|
|
retry = false;
|
2014-07-22 09:10:56 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
} while (retry);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* This function is always called for data files, we should disable
|
|
|
|
OS caching (O_DIRECT) here as we do in os_file_create_func(), so
|
|
|
|
we open the same file in the same mode, see man page of open(2). */
|
|
|
|
if (!srv_read_only_mode
|
|
|
|
&& *success
|
|
|
|
&& (srv_unix_file_flush_method == SRV_UNIX_O_DIRECT
|
|
|
|
|| srv_unix_file_flush_method == SRV_UNIX_O_DIRECT_NO_FSYNC)) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
os_file_set_nocache(file, name, mode_str);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#ifdef USE_FILE_LOCK
|
|
|
|
if (!read_only
|
|
|
|
&& *success
|
|
|
|
&& (access_type == OS_FILE_READ_WRITE)
|
|
|
|
&& os_file_lock(file, name)) {
|
|
|
|
|
|
|
|
*success = false;
|
|
|
|
close(file);
|
|
|
|
file = -1;
|
|
|
|
}
|
|
|
|
#endif /* USE_FILE_LOCK */
|
|
|
|
|
|
|
|
return(file);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** This function attempts to create a directory named pathname. The new
|
|
|
|
directory gets default permissions. On Unix the permissions are
|
|
|
|
(0770 & ~umask). If the directory exists already, nothing is done and
|
|
|
|
the call succeeds, unless the fail_if_exists arguments is true.
|
|
|
|
If another error occurs, such as a permission error, this does not crash,
|
|
|
|
but reports the error and returns false.
|
|
|
|
@param[in] pathname directory name as null-terminated string
|
|
|
|
@param[in] fail_if_exists if true, pre-existing directory is treated as
|
|
|
|
an error.
|
|
|
|
@return true if call succeeds, false on error */
|
|
|
|
bool
|
|
|
|
os_file_create_directory(
|
|
|
|
const char* pathname,
|
|
|
|
bool fail_if_exists)
|
|
|
|
{
|
2017-01-31 11:25:25 +01:00
|
|
|
int rcode;
|
|
|
|
|
|
|
|
WAIT_ALLOW_WRITES();
|
|
|
|
rcode = mkdir(pathname, 0770);
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
if (!(rcode == 0 || (errno == EEXIST && !fail_if_exists))) {
|
|
|
|
/* failure */
|
|
|
|
os_file_handle_error_no_exit(pathname, "mkdir", false);
|
|
|
|
|
|
|
|
return(false);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
The os_file_opendir() function opens a directory stream corresponding to the
|
|
|
|
directory named by the dirname argument. The directory stream is positioned
|
|
|
|
at the first entry. In both Unix and Windows we automatically skip the '.'
|
|
|
|
and '..' items at the start of the directory listing.
|
|
|
|
@param[in] dirname directory name; it must not contain a trailing
|
|
|
|
'\' or '/'
|
|
|
|
@param[in] is_fatal true if we should treat an error as a fatal
|
|
|
|
error; if we try to open symlinks then we do
|
|
|
|
not wish a fatal error if it happens not to be
|
|
|
|
a directory
|
|
|
|
@return directory stream, NULL if error */
|
|
|
|
os_file_dir_t
|
|
|
|
os_file_opendir(
|
|
|
|
const char* dirname,
|
|
|
|
bool error_is_fatal)
|
|
|
|
{
|
|
|
|
os_file_dir_t dir;
|
|
|
|
dir = opendir(dirname);
|
|
|
|
|
|
|
|
if (dir == NULL && error_is_fatal) {
|
|
|
|
os_file_handle_error(dirname, "opendir");
|
|
|
|
}
|
|
|
|
|
|
|
|
return(dir);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Closes a directory stream.
|
|
|
|
@param[in] dir directory stream
|
|
|
|
@return 0 if success, -1 if failure */
|
|
|
|
int
|
|
|
|
os_file_closedir(
|
|
|
|
os_file_dir_t dir)
|
|
|
|
{
|
|
|
|
int ret = closedir(dir);
|
|
|
|
|
|
|
|
if (ret != 0) {
|
|
|
|
os_file_handle_error_no_exit(NULL, "closedir", false);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** This function returns information of the next file in the directory. We jump
|
|
|
|
over the '.' and '..' entries in the directory.
|
|
|
|
@param[in] dirname directory name or path
|
|
|
|
@param[in] dir directory stream
|
|
|
|
@param[out] info buffer where the info is returned
|
|
|
|
@return 0 if ok, -1 if error, 1 if at the end of the directory */
|
|
|
|
int
|
|
|
|
os_file_readdir_next_file(
|
|
|
|
const char* dirname,
|
|
|
|
os_file_dir_t dir,
|
|
|
|
os_file_stat_t* info)
|
|
|
|
{
|
|
|
|
struct dirent* ent;
|
|
|
|
char* full_path;
|
|
|
|
int ret;
|
|
|
|
struct stat statinfo;
|
|
|
|
|
|
|
|
next_file:
|
|
|
|
|
|
|
|
ent = readdir(dir);
|
|
|
|
|
|
|
|
if (ent == NULL) {
|
|
|
|
|
|
|
|
return(1);
|
|
|
|
}
|
2017-01-25 09:11:37 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_a(strlen(ent->d_name) < OS_FILE_MAX_PATH);
|
|
|
|
|
|
|
|
if (strcmp(ent->d_name, ".") == 0 || strcmp(ent->d_name, "..") == 0) {
|
|
|
|
|
|
|
|
goto next_file;
|
|
|
|
}
|
|
|
|
|
|
|
|
strcpy(info->name, ent->d_name);
|
|
|
|
|
|
|
|
full_path = static_cast<char*>(
|
|
|
|
ut_malloc_nokey(strlen(dirname) + strlen(ent->d_name) + 10));
|
|
|
|
|
|
|
|
sprintf(full_path, "%s/%s", dirname, ent->d_name);
|
|
|
|
|
|
|
|
ret = stat(full_path, &statinfo);
|
|
|
|
|
|
|
|
if (ret) {
|
|
|
|
|
|
|
|
if (errno == ENOENT) {
|
|
|
|
/* readdir() returned a file that does not exist,
|
|
|
|
it must have been deleted in the meantime. Do what
|
|
|
|
would have happened if the file was deleted before
|
|
|
|
readdir() - ignore and go to the next entry.
|
|
|
|
If this is the last entry then info->name will still
|
|
|
|
contain the name of the deleted file when this
|
|
|
|
function returns, but this is not an issue since the
|
|
|
|
caller shouldn't be looking at info when end of
|
|
|
|
directory is returned. */
|
|
|
|
|
|
|
|
ut_free(full_path);
|
|
|
|
|
|
|
|
goto next_file;
|
|
|
|
}
|
|
|
|
|
|
|
|
os_file_handle_error_no_exit(full_path, "stat", false);
|
|
|
|
|
|
|
|
ut_free(full_path);
|
|
|
|
|
|
|
|
return(-1);
|
|
|
|
}
|
|
|
|
|
|
|
|
info->size = statinfo.st_size;
|
|
|
|
|
|
|
|
if (S_ISDIR(statinfo.st_mode)) {
|
|
|
|
info->type = OS_FILE_TYPE_DIR;
|
|
|
|
} else if (S_ISLNK(statinfo.st_mode)) {
|
|
|
|
info->type = OS_FILE_TYPE_LINK;
|
|
|
|
} else if (S_ISREG(statinfo.st_mode)) {
|
|
|
|
info->type = OS_FILE_TYPE_FILE;
|
|
|
|
} else {
|
|
|
|
info->type = OS_FILE_TYPE_UNKNOWN;
|
|
|
|
}
|
|
|
|
|
|
|
|
ut_free(full_path);
|
|
|
|
|
|
|
|
return(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** NOTE! Use the corresponding macro os_file_create(), not directly
|
|
|
|
this function!
|
|
|
|
Opens an existing file or creates a new.
|
|
|
|
@param[in] name name of the file or path as a null-terminated
|
|
|
|
string
|
|
|
|
@param[in] create_mode create mode
|
|
|
|
@param[in] purpose OS_FILE_AIO, if asynchronous, non-buffered I/O
|
|
|
|
is desired, OS_FILE_NORMAL, if any normal file;
|
|
|
|
NOTE that it also depends on type, os_aio_..
|
|
|
|
and srv_.. variables whether we really use async
|
|
|
|
I/O or unbuffered I/O: look in the function
|
|
|
|
source code for the exact rules
|
|
|
|
@param[in] type OS_DATA_FILE or OS_LOG_FILE
|
|
|
|
@param[in] read_only true, if read only checks should be enforcedm
|
|
|
|
@param[in] success true if succeeded
|
|
|
|
@return handle to the file, not defined if error, error number
|
|
|
|
can be retrieved with os_file_get_last_error */
|
|
|
|
os_file_t
|
|
|
|
os_file_create_func(
|
|
|
|
const char* name,
|
|
|
|
ulint create_mode,
|
|
|
|
ulint purpose,
|
|
|
|
ulint type,
|
|
|
|
bool read_only,
|
|
|
|
bool* success)
|
|
|
|
{
|
|
|
|
bool on_error_no_exit;
|
|
|
|
bool on_error_silent;
|
|
|
|
|
|
|
|
*success = false;
|
|
|
|
|
|
|
|
DBUG_EXECUTE_IF(
|
|
|
|
"ib_create_table_fail_disk_full",
|
|
|
|
*success = false;
|
|
|
|
errno = ENOSPC;
|
|
|
|
return(OS_FILE_CLOSED);
|
|
|
|
);
|
|
|
|
|
|
|
|
int create_flag;
|
|
|
|
const char* mode_str = NULL;
|
|
|
|
|
|
|
|
on_error_no_exit = create_mode & OS_FILE_ON_ERROR_NO_EXIT
|
|
|
|
? true : false;
|
|
|
|
on_error_silent = create_mode & OS_FILE_ON_ERROR_SILENT
|
|
|
|
? true : false;
|
|
|
|
|
|
|
|
create_mode &= ~OS_FILE_ON_ERROR_NO_EXIT;
|
|
|
|
create_mode &= ~OS_FILE_ON_ERROR_SILENT;
|
|
|
|
|
|
|
|
if (create_mode == OS_FILE_OPEN
|
|
|
|
|| create_mode == OS_FILE_OPEN_RAW
|
|
|
|
|| create_mode == OS_FILE_OPEN_RETRY) {
|
|
|
|
|
|
|
|
mode_str = "OPEN";
|
|
|
|
|
|
|
|
create_flag = read_only ? O_RDONLY : O_RDWR;
|
|
|
|
|
|
|
|
} else if (read_only) {
|
|
|
|
|
|
|
|
mode_str = "OPEN";
|
|
|
|
|
|
|
|
create_flag = O_RDONLY;
|
|
|
|
|
|
|
|
} else if (create_mode == OS_FILE_CREATE) {
|
|
|
|
|
|
|
|
mode_str = "CREATE";
|
|
|
|
create_flag = O_RDWR | O_CREAT | O_EXCL;
|
|
|
|
|
|
|
|
} else if (create_mode == OS_FILE_OVERWRITE) {
|
|
|
|
|
|
|
|
mode_str = "OVERWRITE";
|
|
|
|
create_flag = O_RDWR | O_CREAT | O_TRUNC;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
ib::error()
|
|
|
|
<< "Unknown file create mode (" << create_mode << ")"
|
|
|
|
<< " for file '" << name << "'";
|
|
|
|
|
|
|
|
return(OS_FILE_CLOSED);
|
|
|
|
}
|
|
|
|
|
|
|
|
ut_a(type == OS_LOG_FILE
|
|
|
|
|| type == OS_DATA_FILE
|
|
|
|
|| type == OS_DATA_TEMP_FILE);
|
|
|
|
|
|
|
|
ut_a(purpose == OS_FILE_AIO || purpose == OS_FILE_NORMAL);
|
|
|
|
|
|
|
|
#ifdef O_SYNC
|
|
|
|
/* We let O_SYNC only affect log files; note that we map O_DSYNC to
|
|
|
|
O_SYNC because the datasync options seemed to corrupt files in 2001
|
|
|
|
in both Linux and Solaris */
|
|
|
|
|
|
|
|
if (!read_only
|
|
|
|
&& type == OS_LOG_FILE
|
|
|
|
&& srv_unix_file_flush_method == SRV_UNIX_O_DSYNC) {
|
|
|
|
|
|
|
|
create_flag |= O_SYNC;
|
|
|
|
}
|
|
|
|
#endif /* O_SYNC */
|
|
|
|
|
|
|
|
os_file_t file;
|
|
|
|
bool retry;
|
|
|
|
|
|
|
|
do {
|
|
|
|
file = ::open(name, create_flag, os_innodb_umask);
|
|
|
|
|
|
|
|
if (file == -1) {
|
|
|
|
const char* operation;
|
|
|
|
|
|
|
|
operation = (create_mode == OS_FILE_CREATE
|
|
|
|
&& !read_only) ? "create" : "open";
|
|
|
|
|
|
|
|
*success = false;
|
|
|
|
|
|
|
|
if (on_error_no_exit) {
|
|
|
|
retry = os_file_handle_error_no_exit(
|
|
|
|
name, operation, on_error_silent);
|
|
|
|
} else {
|
|
|
|
retry = os_file_handle_error(name, operation);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
*success = true;
|
|
|
|
retry = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
} while (retry);
|
|
|
|
|
|
|
|
/* We disable OS caching (O_DIRECT) only on data files */
|
2016-09-06 08:43:16 +02:00
|
|
|
if (!read_only
|
|
|
|
&& *success
|
|
|
|
&& (type != OS_LOG_FILE && type != OS_DATA_TEMP_FILE)
|
|
|
|
&& (srv_unix_file_flush_method == SRV_UNIX_O_DIRECT
|
|
|
|
|| srv_unix_file_flush_method == SRV_UNIX_O_DIRECT_NO_FSYNC)) {
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
os_file_set_nocache(file, name, mode_str);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef USE_FILE_LOCK
|
|
|
|
if (!read_only
|
|
|
|
&& *success
|
|
|
|
&& create_mode != OS_FILE_OPEN_RAW
|
|
|
|
&& os_file_lock(file, name)) {
|
|
|
|
|
|
|
|
if (create_mode == OS_FILE_OPEN_RETRY) {
|
|
|
|
|
|
|
|
ib::info()
|
|
|
|
<< "Retrying to lock the first data file";
|
|
|
|
|
|
|
|
for (int i = 0; i < 100; i++) {
|
|
|
|
os_thread_sleep(1000000);
|
|
|
|
|
|
|
|
if (!os_file_lock(file, name)) {
|
|
|
|
*success = true;
|
|
|
|
return(file);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ib::info()
|
|
|
|
<< "Unable to open the first data file";
|
|
|
|
}
|
|
|
|
|
|
|
|
*success = false;
|
|
|
|
close(file);
|
|
|
|
file = -1;
|
|
|
|
}
|
|
|
|
#endif /* USE_FILE_LOCK */
|
|
|
|
|
|
|
|
return(file);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** NOTE! Use the corresponding macro
|
|
|
|
os_file_create_simple_no_error_handling(), not directly this function!
|
|
|
|
A simple function to open or create a file.
|
|
|
|
@param[in] name name of the file or path as a null-terminated
|
|
|
|
string
|
|
|
|
@param[in] create_mode create mode
|
|
|
|
@param[in] access_type OS_FILE_READ_ONLY, OS_FILE_READ_WRITE, or
|
|
|
|
OS_FILE_READ_ALLOW_DELETE; the last option
|
|
|
|
is used by a backup program reading the file
|
|
|
|
@param[in] read_only if true read only mode checks are enforced
|
|
|
|
@param[out] success true if succeeded
|
|
|
|
@return own: handle to the file, not defined if error, error number
|
|
|
|
can be retrieved with os_file_get_last_error */
|
|
|
|
os_file_t
|
|
|
|
os_file_create_simple_no_error_handling_func(
|
|
|
|
const char* name,
|
|
|
|
ulint create_mode,
|
|
|
|
ulint access_type,
|
|
|
|
bool read_only,
|
|
|
|
bool* success)
|
|
|
|
{
|
|
|
|
os_file_t file;
|
|
|
|
int create_flag;
|
|
|
|
|
2017-01-31 11:25:25 +01:00
|
|
|
if (create_mode != OS_FILE_OPEN && create_mode != OS_FILE_OPEN_RAW) {
|
|
|
|
WAIT_ALLOW_WRITES();
|
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_a(!(create_mode & OS_FILE_ON_ERROR_SILENT));
|
|
|
|
ut_a(!(create_mode & OS_FILE_ON_ERROR_NO_EXIT));
|
|
|
|
|
|
|
|
*success = false;
|
|
|
|
|
|
|
|
if (create_mode == OS_FILE_OPEN) {
|
|
|
|
|
|
|
|
if (access_type == OS_FILE_READ_ONLY) {
|
|
|
|
|
|
|
|
create_flag = O_RDONLY;
|
|
|
|
|
|
|
|
} else if (read_only) {
|
|
|
|
|
|
|
|
create_flag = O_RDONLY;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
ut_a(access_type == OS_FILE_READ_WRITE
|
|
|
|
|| access_type == OS_FILE_READ_ALLOW_DELETE);
|
|
|
|
|
|
|
|
create_flag = O_RDWR;
|
|
|
|
}
|
|
|
|
|
|
|
|
} else if (read_only) {
|
|
|
|
|
|
|
|
create_flag = O_RDONLY;
|
|
|
|
|
|
|
|
} else if (create_mode == OS_FILE_CREATE) {
|
|
|
|
|
|
|
|
create_flag = O_RDWR | O_CREAT | O_EXCL;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
ib::error()
|
|
|
|
<< "Unknown file create mode "
|
|
|
|
<< create_mode << " for file '" << name << "'";
|
|
|
|
|
|
|
|
return(OS_FILE_CLOSED);
|
|
|
|
}
|
|
|
|
|
|
|
|
file = ::open(name, create_flag, os_innodb_umask);
|
|
|
|
|
|
|
|
*success = (file != -1);
|
|
|
|
|
|
|
|
#ifdef USE_FILE_LOCK
|
|
|
|
if (!read_only
|
|
|
|
&& *success
|
|
|
|
&& access_type == OS_FILE_READ_WRITE
|
|
|
|
&& os_file_lock(file, name)) {
|
|
|
|
|
|
|
|
*success = false;
|
|
|
|
close(file);
|
|
|
|
file = -1;
|
|
|
|
|
|
|
|
}
|
|
|
|
#endif /* USE_FILE_LOCK */
|
|
|
|
|
|
|
|
return(file);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Deletes a file if it exists. The file has to be closed before calling this.
|
|
|
|
@param[in] name file path as a null-terminated string
|
|
|
|
@param[out] exist indicate if file pre-exist
|
|
|
|
@return true if success */
|
|
|
|
bool
|
|
|
|
os_file_delete_if_exists_func(
|
|
|
|
const char* name,
|
|
|
|
bool* exist)
|
|
|
|
{
|
|
|
|
if (exist != NULL) {
|
|
|
|
*exist = true;
|
|
|
|
}
|
|
|
|
|
2017-01-31 11:25:25 +01:00
|
|
|
int ret;
|
|
|
|
WAIT_ALLOW_WRITES();
|
|
|
|
|
|
|
|
ret = unlink(name);
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
if (ret != 0 && errno == ENOENT) {
|
|
|
|
if (exist != NULL) {
|
|
|
|
*exist = false;
|
|
|
|
}
|
|
|
|
} else if (ret != 0 && errno != ENOENT) {
|
|
|
|
os_file_handle_error_no_exit(name, "delete", false);
|
|
|
|
|
|
|
|
return(false);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Deletes a file. The file has to be closed before calling this.
|
|
|
|
@param[in] name file path as a null-terminated string
|
|
|
|
@return true if success */
|
|
|
|
bool
|
|
|
|
os_file_delete_func(
|
|
|
|
const char* name)
|
|
|
|
{
|
2017-01-31 11:25:25 +01:00
|
|
|
int ret;
|
|
|
|
WAIT_ALLOW_WRITES();
|
|
|
|
|
|
|
|
ret = unlink(name);
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
if (ret != 0) {
|
|
|
|
os_file_handle_error_no_exit(name, "delete", FALSE);
|
|
|
|
|
|
|
|
return(false);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** NOTE! Use the corresponding macro os_file_rename(), not directly this
|
|
|
|
function!
|
|
|
|
Renames a file (can also move it to another directory). It is safest that the
|
|
|
|
file is closed before calling this function.
|
|
|
|
@param[in] oldpath old file path as a null-terminated string
|
|
|
|
@param[in] newpath new file path
|
|
|
|
@return true if success */
|
|
|
|
bool
|
|
|
|
os_file_rename_func(
|
|
|
|
const char* oldpath,
|
|
|
|
const char* newpath)
|
|
|
|
{
|
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
os_file_type_t type;
|
|
|
|
bool exists;
|
|
|
|
|
|
|
|
/* New path must not exist. */
|
|
|
|
ut_ad(os_file_status(newpath, &exists, &type));
|
|
|
|
ut_ad(!exists);
|
|
|
|
|
|
|
|
/* Old path must exist. */
|
|
|
|
ut_ad(os_file_status(oldpath, &exists, &type));
|
|
|
|
ut_ad(exists);
|
|
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
|
2017-01-31 11:25:25 +01:00
|
|
|
int ret;
|
|
|
|
WAIT_ALLOW_WRITES();
|
|
|
|
|
|
|
|
ret = rename(oldpath, newpath);
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
if (ret != 0) {
|
|
|
|
os_file_handle_error_no_exit(oldpath, "rename", FALSE);
|
|
|
|
|
|
|
|
return(false);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** NOTE! Use the corresponding macro os_file_close(), not directly this
|
|
|
|
function!
|
|
|
|
Closes a file handle. In case of error, error number can be retrieved with
|
|
|
|
os_file_get_last_error.
|
|
|
|
@param[in] file Handle to close
|
|
|
|
@return true if success */
|
|
|
|
bool
|
|
|
|
os_file_close_func(
|
|
|
|
os_file_t file)
|
|
|
|
{
|
|
|
|
int ret = close(file);
|
|
|
|
|
|
|
|
if (ret == -1) {
|
|
|
|
os_file_handle_error(NULL, "close");
|
|
|
|
|
|
|
|
return(false);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Gets a file size.
|
|
|
|
@param[in] file handle to an open file
|
|
|
|
@return file size, or (os_offset_t) -1 on failure */
|
|
|
|
os_offset_t
|
|
|
|
os_file_get_size(
|
|
|
|
os_file_t file)
|
|
|
|
{
|
|
|
|
/* Store current position */
|
|
|
|
os_offset_t pos = lseek(file, 0, SEEK_CUR);
|
|
|
|
os_offset_t file_size = lseek(file, 0, SEEK_END);
|
|
|
|
|
|
|
|
/* Restore current position as the function should not change it */
|
|
|
|
lseek(file, pos, SEEK_SET);
|
|
|
|
|
|
|
|
return(file_size);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Gets a file size.
|
|
|
|
@param[in] filename Full path to the filename to check
|
|
|
|
@return file size if OK, else set m_total_size to ~0 and m_alloc_size to
|
|
|
|
errno */
|
|
|
|
os_file_size_t
|
|
|
|
os_file_get_size(
|
|
|
|
const char* filename)
|
|
|
|
{
|
|
|
|
struct stat s;
|
|
|
|
os_file_size_t file_size;
|
|
|
|
|
|
|
|
int ret = stat(filename, &s);
|
|
|
|
|
|
|
|
if (ret == 0) {
|
|
|
|
file_size.m_total_size = s.st_size;
|
|
|
|
/* st_blocks is in 512 byte sized blocks */
|
|
|
|
file_size.m_alloc_size = s.st_blocks * 512;
|
|
|
|
} else {
|
|
|
|
file_size.m_total_size = ~0;
|
|
|
|
file_size.m_alloc_size = (os_offset_t) errno;
|
|
|
|
}
|
|
|
|
|
|
|
|
return(file_size);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** This function returns information about the specified file
|
|
|
|
@param[in] path pathname of the file
|
|
|
|
@param[out] stat_info information of a file in a directory
|
|
|
|
@param[in,out] statinfo information of a file in a directory
|
|
|
|
@param[in] check_rw_perm for testing whether the file can be opened
|
|
|
|
in RW mode
|
|
|
|
@param[in] read_only if true read only mode checks are enforced
|
|
|
|
@return DB_SUCCESS if all OK */
|
|
|
|
static
|
|
|
|
dberr_t
|
|
|
|
os_file_get_status_posix(
|
|
|
|
const char* path,
|
|
|
|
os_file_stat_t* stat_info,
|
|
|
|
struct stat* statinfo,
|
|
|
|
bool check_rw_perm,
|
|
|
|
bool read_only)
|
|
|
|
{
|
|
|
|
int ret = stat(path, statinfo);
|
|
|
|
|
|
|
|
if (ret && (errno == ENOENT || errno == ENOTDIR)) {
|
|
|
|
/* file does not exist */
|
|
|
|
|
|
|
|
return(DB_NOT_FOUND);
|
|
|
|
|
|
|
|
} else if (ret) {
|
|
|
|
/* file exists, but stat call failed */
|
|
|
|
|
|
|
|
os_file_handle_error_no_exit(path, "stat", false);
|
|
|
|
|
|
|
|
return(DB_FAIL);
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (statinfo->st_mode & S_IFMT) {
|
|
|
|
case S_IFDIR:
|
|
|
|
stat_info->type = OS_FILE_TYPE_DIR;
|
|
|
|
break;
|
|
|
|
case S_IFLNK:
|
|
|
|
stat_info->type = OS_FILE_TYPE_LINK;
|
|
|
|
break;
|
|
|
|
case S_IFBLK:
|
|
|
|
/* Handle block device as regular file. */
|
|
|
|
case S_IFCHR:
|
|
|
|
/* Handle character device as regular file. */
|
|
|
|
case S_IFREG:
|
|
|
|
stat_info->type = OS_FILE_TYPE_FILE;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
stat_info->type = OS_FILE_TYPE_UNKNOWN;
|
|
|
|
}
|
|
|
|
|
|
|
|
stat_info->size = statinfo->st_size;
|
|
|
|
stat_info->block_size = statinfo->st_blksize;
|
|
|
|
stat_info->alloc_size = statinfo->st_blocks * 512;
|
|
|
|
|
|
|
|
if (check_rw_perm
|
|
|
|
&& (stat_info->type == OS_FILE_TYPE_FILE
|
|
|
|
|| stat_info->type == OS_FILE_TYPE_BLOCK)) {
|
|
|
|
|
|
|
|
int access = !read_only ? O_RDWR : O_RDONLY;
|
|
|
|
int fh = ::open(path, access, os_innodb_umask);
|
|
|
|
|
|
|
|
if (fh == -1) {
|
|
|
|
stat_info->rw_perm = false;
|
|
|
|
} else {
|
|
|
|
stat_info->rw_perm = true;
|
|
|
|
close(fh);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return(DB_SUCCESS);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Truncates a file to a specified size in bytes.
|
|
|
|
Do nothing if the size to preserve is greater or equal to the current
|
|
|
|
size of the file.
|
|
|
|
@param[in] pathname file path
|
|
|
|
@param[in] file file to be truncated
|
|
|
|
@param[in] size size to preserve in bytes
|
|
|
|
@return true if success */
|
|
|
|
static
|
|
|
|
bool
|
|
|
|
os_file_truncate_posix(
|
|
|
|
const char* pathname,
|
|
|
|
os_file_t file,
|
|
|
|
os_offset_t size)
|
|
|
|
{
|
|
|
|
int res = ftruncate(file, size);
|
|
|
|
|
|
|
|
if (res == -1) {
|
|
|
|
|
|
|
|
bool retry;
|
|
|
|
|
|
|
|
retry = os_file_handle_error_no_exit(
|
|
|
|
pathname, "truncate", false);
|
|
|
|
|
|
|
|
if (retry) {
|
|
|
|
ib::warn()
|
|
|
|
<< "Truncate failed for '"
|
|
|
|
<< pathname << "'";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return(res == 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Truncates a file at its current position.
|
|
|
|
@return true if success */
|
|
|
|
bool
|
|
|
|
os_file_set_eof(
|
|
|
|
FILE* file) /*!< in: file to be truncated */
|
|
|
|
{
|
2017-01-31 11:25:25 +01:00
|
|
|
WAIT_ALLOW_WRITES();
|
2016-08-12 10:17:45 +02:00
|
|
|
return(!ftruncate(fileno(file), ftell(file)));
|
|
|
|
}
|
|
|
|
|
|
|
|
#else /* !_WIN32 */
|
|
|
|
|
|
|
|
#include <WinIoCtl.h>
|
|
|
|
|
2016-09-19 14:31:20 +02:00
|
|
|
/*
|
|
|
|
Windows : Handling synchronous IO on files opened asynchronously.
|
|
|
|
|
|
|
|
If file is opened for asynchronous IO (FILE_FLAG_OVERLAPPED) and also bound to
|
|
|
|
a completion port, then every IO on this file would normally be enqueued to the
|
|
|
|
completion port. Sometimes however we would like to do a synchronous IO. This is
|
|
|
|
possible if we initialitze have overlapped.hEvent with a valid event and set its
|
|
|
|
lowest order bit to 1 (see MSDN ReadFile and WriteFile description for more info)
|
|
|
|
|
|
|
|
We'll create this special event once for each thread and store in thread local
|
|
|
|
storage.
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
static void __stdcall win_free_syncio_event(void *data) {
|
|
|
|
if (data) {
|
|
|
|
CloseHandle((HANDLE)data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Initialize tls index.for event handle used for synchronized IO on files that
|
|
|
|
might be opened with FILE_FLAG_OVERLAPPED.
|
|
|
|
*/
|
|
|
|
static void win_init_syncio_event() {
|
|
|
|
fls_sync_io = FlsAlloc(win_free_syncio_event);
|
|
|
|
ut_a(fls_sync_io != FLS_OUT_OF_INDEXES);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Retrieve per-thread event for doing synchronous io on asyncronously opened files
|
|
|
|
*/
|
|
|
|
static HANDLE win_get_syncio_event()
|
|
|
|
{
|
|
|
|
HANDLE h;
|
|
|
|
|
|
|
|
h = (HANDLE)FlsGetValue(fls_sync_io);
|
|
|
|
if (h) {
|
|
|
|
return h;
|
|
|
|
}
|
|
|
|
h = CreateEventA(NULL, FALSE, FALSE, NULL);
|
|
|
|
ut_a(h);
|
|
|
|
/* Set low-order bit to keeps I/O completion from being queued */
|
|
|
|
h = (HANDLE)((uintptr_t)h | 1);
|
|
|
|
FlsSetValue(fls_sync_io, h);
|
|
|
|
return h;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Do the read/write
|
|
|
|
@param[in] request The IO context and type
|
|
|
|
@return the number of bytes read/written or negative value on error */
|
|
|
|
ssize_t
|
|
|
|
SyncFileIO::execute(const IORequest& request)
|
|
|
|
{
|
|
|
|
OVERLAPPED seek;
|
|
|
|
|
|
|
|
memset(&seek, 0x0, sizeof(seek));
|
|
|
|
|
2016-09-19 14:31:20 +02:00
|
|
|
seek.hEvent = win_get_syncio_event();
|
2016-08-12 10:17:45 +02:00
|
|
|
seek.Offset = (DWORD) m_offset & 0xFFFFFFFF;
|
|
|
|
seek.OffsetHigh = (DWORD) (m_offset >> 32);
|
|
|
|
|
|
|
|
BOOL ret;
|
|
|
|
DWORD n_bytes;
|
|
|
|
|
|
|
|
if (request.is_read()) {
|
|
|
|
ret = ReadFile(m_fh, m_buf,
|
|
|
|
static_cast<DWORD>(m_n), &n_bytes, &seek);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
ut_ad(request.is_write());
|
|
|
|
ret = WriteFile(m_fh, m_buf,
|
|
|
|
static_cast<DWORD>(m_n), &n_bytes, &seek);
|
|
|
|
}
|
2016-09-19 14:31:20 +02:00
|
|
|
if (!ret && (GetLastError() == ERROR_IO_PENDING)) {
|
|
|
|
/* Wait for async io to complete */
|
|
|
|
ret = GetOverlappedResult(m_fh, &seek, &n_bytes, TRUE);
|
|
|
|
}
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
return(ret ? static_cast<ssize_t>(n_bytes) : -1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Do the read/write
|
|
|
|
@param[in,out] slot The IO slot, it has the IO context
|
|
|
|
@return the number of bytes read/written or negative value on error */
|
|
|
|
ssize_t
|
|
|
|
SyncFileIO::execute(Slot* slot)
|
|
|
|
{
|
|
|
|
BOOL ret;
|
2016-09-19 14:31:20 +02:00
|
|
|
slot->control.hEvent = win_get_syncio_event();
|
2016-08-12 10:17:45 +02:00
|
|
|
if (slot->type.is_read()) {
|
|
|
|
|
|
|
|
ret = ReadFile(
|
|
|
|
slot->file, slot->ptr, slot->len,
|
|
|
|
&slot->n_bytes, &slot->control);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
ut_ad(slot->type.is_write());
|
|
|
|
|
|
|
|
ret = WriteFile(
|
|
|
|
slot->file, slot->ptr, slot->len,
|
|
|
|
&slot->n_bytes, &slot->control);
|
|
|
|
|
|
|
|
}
|
2016-09-19 14:31:20 +02:00
|
|
|
if (!ret && (GetLastError() == ERROR_IO_PENDING)) {
|
|
|
|
/* Wait for async io to complete */
|
|
|
|
ret = GetOverlappedResult(slot->file, &slot->control, &slot->n_bytes, TRUE);
|
|
|
|
}
|
2016-08-12 10:17:45 +02:00
|
|
|
return(ret ? slot->n_bytes : -1);
|
|
|
|
}
|
|
|
|
|
2016-09-19 14:31:20 +02:00
|
|
|
/* Startup/shutdown */
|
|
|
|
|
|
|
|
struct WinIoInit
|
|
|
|
{
|
|
|
|
WinIoInit() {
|
|
|
|
completion_port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0);
|
|
|
|
read_completion_port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); ut_a(completion_port && read_completion_port);
|
2017-01-16 13:03:36 +01:00
|
|
|
fls_sync_io = FlsAlloc(win_free_syncio_event);
|
|
|
|
ut_a(fls_sync_io != FLS_OUT_OF_INDEXES);
|
|
|
|
}
|
2016-08-12 10:17:45 +02:00
|
|
|
|
2017-01-16 13:03:36 +01:00
|
|
|
~WinIoInit() {
|
|
|
|
CloseHandle(completion_port);
|
|
|
|
CloseHandle(read_completion_port);
|
|
|
|
FlsFree(fls_sync_io);
|
|
|
|
}
|
|
|
|
};
|
2016-08-12 10:17:45 +02:00
|
|
|
|
2017-01-16 13:03:36 +01:00
|
|
|
/* Ensures proper initialization and shutdown */
|
|
|
|
static WinIoInit win_io_init;
|
2016-08-12 10:17:45 +02:00
|
|
|
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
/** Check if the file system supports sparse files.
|
|
|
|
@param[in] name File name
|
|
|
|
@return true if the file system supports sparse files */
|
|
|
|
static
|
|
|
|
bool
|
|
|
|
os_is_sparse_file_supported_win32(const char* filename)
|
|
|
|
{
|
|
|
|
char volname[MAX_PATH];
|
|
|
|
BOOL result = GetVolumePathName(filename, volname, MAX_PATH);
|
|
|
|
|
|
|
|
if (!result) {
|
|
|
|
|
|
|
|
ib::error()
|
|
|
|
<< "os_is_sparse_file_supported: "
|
|
|
|
<< "Failed to get the volume path name for: "
|
|
|
|
<< filename
|
|
|
|
<< "- OS error number " << GetLastError();
|
|
|
|
|
|
|
|
return(false);
|
|
|
|
}
|
|
|
|
|
|
|
|
DWORD flags;
|
|
|
|
|
|
|
|
result = GetVolumeInformation(
|
|
|
|
volname, NULL, MAX_PATH, NULL, NULL,
|
|
|
|
&flags, NULL, MAX_PATH);
|
|
|
|
|
|
|
|
|
|
|
|
if (!result) {
|
|
|
|
ib::error()
|
|
|
|
<< "os_is_sparse_file_supported: "
|
|
|
|
<< "Failed to get the volume info for: "
|
|
|
|
<< volname
|
|
|
|
<< "- OS error number " << GetLastError();
|
|
|
|
|
|
|
|
return(false);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(flags & FILE_SUPPORTS_SPARSE_FILES) ? true : false;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Free storage space associated with a section of the file.
|
|
|
|
@param[in] fh Open file handle
|
|
|
|
@param[in] page_size Tablespace page size
|
|
|
|
@param[in] block_size File system block size
|
|
|
|
@param[in] off Starting offset (SEEK_SET)
|
|
|
|
@param[in] len Size of the hole
|
|
|
|
@return 0 on success or errno */
|
|
|
|
static
|
|
|
|
dberr_t
|
|
|
|
os_file_punch_hole_win32(
|
|
|
|
os_file_t fh,
|
|
|
|
os_offset_t off,
|
|
|
|
os_offset_t len)
|
|
|
|
{
|
|
|
|
FILE_ZERO_DATA_INFORMATION punch;
|
|
|
|
|
|
|
|
punch.FileOffset.QuadPart = off;
|
|
|
|
punch.BeyondFinalZero.QuadPart = off + len;
|
|
|
|
|
|
|
|
/* If lpOverlapped is NULL, lpBytesReturned cannot be NULL,
|
|
|
|
therefore we pass a dummy parameter. */
|
|
|
|
DWORD temp;
|
|
|
|
BOOL success = os_win32_device_io_control(
|
|
|
|
fh, FSCTL_SET_ZERO_DATA, &punch, sizeof(punch),
|
|
|
|
NULL, 0, &temp);
|
|
|
|
|
|
|
|
return(success ? DB_SUCCESS: DB_IO_NO_PUNCH_HOLE);
|
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Check the existence and type of the given file.
|
|
|
|
@param[in] path path name of file
|
|
|
|
@param[out] exists true if the file exists
|
|
|
|
@param[out] type Type of the file, if it exists
|
|
|
|
@return true if call succeeded */
|
|
|
|
bool
|
|
|
|
os_file_status_win32(
|
|
|
|
const char* path,
|
|
|
|
bool* exists,
|
|
|
|
os_file_type_t* type)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
struct _stat64 statinfo;
|
|
|
|
|
|
|
|
ret = _stat64(path, &statinfo);
|
|
|
|
|
|
|
|
*exists = !ret;
|
|
|
|
|
|
|
|
if (!ret) {
|
|
|
|
/* file exists, everything OK */
|
|
|
|
|
|
|
|
} else if (errno == ENOENT || errno == ENOTDIR || errno == ENAMETOOLONG) {
|
|
|
|
/* file does not exist */
|
|
|
|
return(true);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
/* file exists, but stat call failed */
|
|
|
|
os_file_handle_error_no_exit(path, "stat", false);
|
|
|
|
return(false);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (_S_IFDIR & statinfo.st_mode) {
|
|
|
|
*type = OS_FILE_TYPE_DIR;
|
|
|
|
|
|
|
|
} else if (_S_IFREG & statinfo.st_mode) {
|
|
|
|
*type = OS_FILE_TYPE_FILE;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
*type = OS_FILE_TYPE_UNKNOWN;
|
|
|
|
}
|
|
|
|
|
|
|
|
return(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** NOTE! Use the corresponding macro os_file_flush(), not directly this
|
|
|
|
function!
|
|
|
|
Flushes the write buffers of a given file to the disk.
|
|
|
|
@param[in] file handle to a file
|
|
|
|
@return true if success */
|
|
|
|
bool
|
|
|
|
os_file_flush_func(
|
|
|
|
os_file_t file)
|
|
|
|
{
|
|
|
|
++os_n_fsyncs;
|
|
|
|
|
|
|
|
BOOL ret = FlushFileBuffers(file);
|
|
|
|
|
|
|
|
if (ret) {
|
|
|
|
return(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Since Windows returns ERROR_INVALID_FUNCTION if the 'file' is
|
|
|
|
actually a raw device, we choose to ignore that error if we are using
|
|
|
|
raw disks */
|
|
|
|
|
|
|
|
if (srv_start_raw_disk_in_use && GetLastError()
|
|
|
|
== ERROR_INVALID_FUNCTION) {
|
|
|
|
return(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
os_file_handle_error(NULL, "flush");
|
|
|
|
|
|
|
|
/* It is a fatal error if a file flush does not succeed, because then
|
|
|
|
the database can get corrupt on disk */
|
|
|
|
ut_error;
|
|
|
|
|
|
|
|
return(false);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Retrieves the last error number if an error occurs in a file io function.
|
|
|
|
The number should be retrieved before any other OS calls (because they may
|
|
|
|
overwrite the error number). If the number is not known to this program,
|
|
|
|
the OS error number + 100 is returned.
|
|
|
|
@param[in] report_all_errors true if we want an error message printed
|
|
|
|
of all errors
|
|
|
|
@param[in] on_error_silent true then don't print any diagnostic
|
|
|
|
to the log
|
|
|
|
@return error number, or OS error number + 100 */
|
|
|
|
static
|
|
|
|
ulint
|
|
|
|
os_file_get_last_error_low(
|
|
|
|
bool report_all_errors,
|
|
|
|
bool on_error_silent)
|
|
|
|
{
|
|
|
|
ulint err = (ulint) GetLastError();
|
|
|
|
|
|
|
|
if (err == ERROR_SUCCESS) {
|
|
|
|
return(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (report_all_errors
|
|
|
|
|| (!on_error_silent
|
|
|
|
&& err != ERROR_DISK_FULL
|
|
|
|
&& err != ERROR_FILE_EXISTS)) {
|
|
|
|
|
|
|
|
ib::error()
|
|
|
|
<< "Operating system error number " << err
|
|
|
|
<< " in a file operation.";
|
|
|
|
|
|
|
|
if (err == ERROR_PATH_NOT_FOUND) {
|
|
|
|
ib::error()
|
|
|
|
<< "The error means the system"
|
|
|
|
" cannot find the path specified.";
|
|
|
|
|
|
|
|
if (srv_is_being_started) {
|
|
|
|
ib::error()
|
|
|
|
<< "If you are installing InnoDB,"
|
|
|
|
" remember that you must create"
|
|
|
|
" directories yourself, InnoDB"
|
|
|
|
" does not create them.";
|
|
|
|
}
|
|
|
|
|
|
|
|
} else if (err == ERROR_ACCESS_DENIED) {
|
|
|
|
|
|
|
|
ib::error()
|
|
|
|
<< "The error means mysqld does not have"
|
|
|
|
" the access rights to"
|
|
|
|
" the directory. It may also be"
|
|
|
|
" you have created a subdirectory"
|
|
|
|
" of the same name as a data file.";
|
|
|
|
|
|
|
|
} else if (err == ERROR_SHARING_VIOLATION
|
|
|
|
|| err == ERROR_LOCK_VIOLATION) {
|
|
|
|
|
|
|
|
ib::error()
|
|
|
|
<< "The error means that another program"
|
|
|
|
" is using InnoDB's files."
|
|
|
|
" This might be a backup or antivirus"
|
|
|
|
" software or another instance"
|
|
|
|
" of MySQL."
|
|
|
|
" Please close it to get rid of this error.";
|
|
|
|
|
|
|
|
} else if (err == ERROR_WORKING_SET_QUOTA
|
|
|
|
|| err == ERROR_NO_SYSTEM_RESOURCES) {
|
|
|
|
|
|
|
|
ib::error()
|
|
|
|
<< "The error means that there are no"
|
|
|
|
" sufficient system resources or quota to"
|
|
|
|
" complete the operation.";
|
|
|
|
|
|
|
|
} else if (err == ERROR_OPERATION_ABORTED) {
|
|
|
|
|
|
|
|
ib::error()
|
|
|
|
<< "The error means that the I/O"
|
|
|
|
" operation has been aborted"
|
|
|
|
" because of either a thread exit"
|
|
|
|
" or an application request."
|
|
|
|
" Retry attempt is made.";
|
|
|
|
} else {
|
|
|
|
|
|
|
|
ib::info() << OPERATING_SYSTEM_ERROR_MSG;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (err == ERROR_FILE_NOT_FOUND) {
|
|
|
|
return(OS_FILE_NOT_FOUND);
|
|
|
|
} else if (err == ERROR_DISK_FULL) {
|
|
|
|
return(OS_FILE_DISK_FULL);
|
|
|
|
} else if (err == ERROR_FILE_EXISTS) {
|
|
|
|
return(OS_FILE_ALREADY_EXISTS);
|
|
|
|
} else if (err == ERROR_SHARING_VIOLATION
|
|
|
|
|| err == ERROR_LOCK_VIOLATION) {
|
|
|
|
return(OS_FILE_SHARING_VIOLATION);
|
|
|
|
} else if (err == ERROR_WORKING_SET_QUOTA
|
|
|
|
|| err == ERROR_NO_SYSTEM_RESOURCES) {
|
|
|
|
return(OS_FILE_INSUFFICIENT_RESOURCE);
|
|
|
|
} else if (err == ERROR_OPERATION_ABORTED) {
|
|
|
|
return(OS_FILE_OPERATION_ABORTED);
|
|
|
|
} else if (err == ERROR_ACCESS_DENIED) {
|
|
|
|
return(OS_FILE_ACCESS_VIOLATION);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(OS_FILE_ERROR_MAX + err);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** NOTE! Use the corresponding macro os_file_create_simple(), not directly
|
|
|
|
this function!
|
|
|
|
A simple function to open or create a file.
|
|
|
|
@param[in] name name of the file or path as a null-terminated
|
|
|
|
string
|
|
|
|
@param[in] create_mode create mode
|
|
|
|
@param[in] access_type OS_FILE_READ_ONLY or OS_FILE_READ_WRITE
|
|
|
|
@param[in] read_only if true read only mode checks are enforced
|
|
|
|
@param[out] success true if succeed, false if error
|
|
|
|
@return handle to the file, not defined if error, error number
|
|
|
|
can be retrieved with os_file_get_last_error */
|
|
|
|
os_file_t
|
|
|
|
os_file_create_simple_func(
|
|
|
|
const char* name,
|
|
|
|
ulint create_mode,
|
|
|
|
ulint access_type,
|
|
|
|
bool read_only,
|
|
|
|
bool* success)
|
|
|
|
{
|
|
|
|
os_file_t file;
|
|
|
|
|
|
|
|
*success = false;
|
|
|
|
|
|
|
|
DWORD access;
|
|
|
|
DWORD create_flag;
|
|
|
|
DWORD attributes = 0;
|
|
|
|
|
|
|
|
ut_a(!(create_mode & OS_FILE_ON_ERROR_SILENT));
|
|
|
|
ut_a(!(create_mode & OS_FILE_ON_ERROR_NO_EXIT));
|
|
|
|
|
|
|
|
if (create_mode == OS_FILE_OPEN) {
|
|
|
|
|
|
|
|
create_flag = OPEN_EXISTING;
|
|
|
|
|
|
|
|
} else if (read_only) {
|
|
|
|
|
|
|
|
create_flag = OPEN_EXISTING;
|
|
|
|
|
|
|
|
} else if (create_mode == OS_FILE_CREATE) {
|
|
|
|
|
|
|
|
create_flag = CREATE_NEW;
|
|
|
|
|
|
|
|
} else if (create_mode == OS_FILE_CREATE_PATH) {
|
|
|
|
|
|
|
|
/* Create subdirs along the path if needed. */
|
|
|
|
*success = os_file_create_subdirs_if_needed(name);
|
|
|
|
|
|
|
|
if (!*success) {
|
|
|
|
|
|
|
|
ib::error()
|
|
|
|
<< "Unable to create subdirectories '"
|
|
|
|
<< name << "'";
|
|
|
|
|
|
|
|
return(OS_FILE_CLOSED);
|
|
|
|
}
|
|
|
|
|
|
|
|
create_flag = CREATE_NEW;
|
|
|
|
create_mode = OS_FILE_CREATE;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
ib::error()
|
|
|
|
<< "Unknown file create mode ("
|
|
|
|
<< create_mode << ") for file '"
|
|
|
|
<< name << "'";
|
|
|
|
|
|
|
|
return(OS_FILE_CLOSED);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (access_type == OS_FILE_READ_ONLY) {
|
|
|
|
|
|
|
|
access = GENERIC_READ;
|
|
|
|
|
|
|
|
} else if (read_only) {
|
|
|
|
|
|
|
|
ib::info()
|
|
|
|
<< "Read only mode set. Unable to"
|
|
|
|
" open file '" << name << "' in RW mode, "
|
|
|
|
<< "trying RO mode", name;
|
|
|
|
|
|
|
|
access = GENERIC_READ;
|
|
|
|
|
|
|
|
} else if (access_type == OS_FILE_READ_WRITE) {
|
|
|
|
|
|
|
|
access = GENERIC_READ | GENERIC_WRITE;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
ib::error()
|
|
|
|
<< "Unknown file access type (" << access_type << ") "
|
|
|
|
"for file '" << name << "'";
|
|
|
|
|
|
|
|
return(OS_FILE_CLOSED);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool retry;
|
|
|
|
|
|
|
|
do {
|
|
|
|
/* Use default security attributes and no template file. */
|
|
|
|
|
|
|
|
file = CreateFile(
|
|
|
|
(LPCTSTR) name, access, FILE_SHARE_READ, NULL,
|
|
|
|
create_flag, attributes, NULL);
|
|
|
|
|
|
|
|
if (file == INVALID_HANDLE_VALUE) {
|
|
|
|
|
|
|
|
*success = false;
|
|
|
|
|
|
|
|
retry = os_file_handle_error(
|
|
|
|
name, create_mode == OS_FILE_OPEN ?
|
|
|
|
"open" : "create");
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
retry = false;
|
|
|
|
|
|
|
|
*success = true;
|
|
|
|
|
|
|
|
DWORD temp;
|
|
|
|
|
|
|
|
/* This is a best effort use case, if it fails then
|
|
|
|
we will find out when we try and punch the hole. */
|
|
|
|
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
os_win32_device_io_control(
|
2016-08-12 10:17:45 +02:00
|
|
|
file, FSCTL_SET_SPARSE, NULL, 0, NULL, 0,
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
&temp);
|
2016-08-12 10:17:45 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
} while (retry);
|
|
|
|
|
|
|
|
return(file);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** This function attempts to create a directory named pathname. The new
|
|
|
|
directory gets default permissions. On Unix the permissions are
|
|
|
|
(0770 & ~umask). If the directory exists already, nothing is done and
|
|
|
|
the call succeeds, unless the fail_if_exists arguments is true.
|
|
|
|
If another error occurs, such as a permission error, this does not crash,
|
|
|
|
but reports the error and returns false.
|
|
|
|
@param[in] pathname directory name as null-terminated string
|
|
|
|
@param[in] fail_if_exists if true, pre-existing directory is treated
|
|
|
|
as an error.
|
|
|
|
@return true if call succeeds, false on error */
|
|
|
|
bool
|
|
|
|
os_file_create_directory(
|
|
|
|
const char* pathname,
|
|
|
|
bool fail_if_exists)
|
|
|
|
{
|
|
|
|
BOOL rcode;
|
|
|
|
|
|
|
|
rcode = CreateDirectory((LPCTSTR) pathname, NULL);
|
|
|
|
if (!(rcode != 0
|
|
|
|
|| (GetLastError() == ERROR_ALREADY_EXISTS
|
|
|
|
&& !fail_if_exists))) {
|
|
|
|
|
|
|
|
os_file_handle_error_no_exit(
|
|
|
|
pathname, "CreateDirectory", false);
|
|
|
|
|
|
|
|
return(false);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** The os_file_opendir() function opens a directory stream corresponding to the
|
|
|
|
directory named by the dirname argument. The directory stream is positioned
|
|
|
|
at the first entry. In both Unix and Windows we automatically skip the '.'
|
|
|
|
and '..' items at the start of the directory listing.
|
|
|
|
@param[in] dirname directory name; it must not contain a trailing
|
|
|
|
'\' or '/'
|
|
|
|
@param[in] is_fatal true if we should treat an error as a fatal
|
|
|
|
error; if we try to open symlinks then we do
|
|
|
|
not wish a fatal error if it happens not to
|
|
|
|
be a directory
|
|
|
|
@return directory stream, NULL if error */
|
|
|
|
os_file_dir_t
|
|
|
|
os_file_opendir(
|
|
|
|
const char* dirname,
|
|
|
|
bool error_is_fatal)
|
|
|
|
{
|
|
|
|
os_file_dir_t dir;
|
|
|
|
LPWIN32_FIND_DATA lpFindFileData;
|
|
|
|
char path[OS_FILE_MAX_PATH + 3];
|
|
|
|
|
|
|
|
ut_a(strlen(dirname) < OS_FILE_MAX_PATH);
|
|
|
|
|
|
|
|
strcpy(path, dirname);
|
|
|
|
strcpy(path + strlen(path), "\\*");
|
|
|
|
|
|
|
|
/* Note that in Windows opening the 'directory stream' also retrieves
|
|
|
|
the first entry in the directory. Since it is '.', that is no problem,
|
|
|
|
as we will skip over the '.' and '..' entries anyway. */
|
|
|
|
|
|
|
|
lpFindFileData = static_cast<LPWIN32_FIND_DATA>(
|
|
|
|
ut_malloc_nokey(sizeof(WIN32_FIND_DATA)));
|
|
|
|
|
|
|
|
dir = FindFirstFile((LPCTSTR) path, lpFindFileData);
|
|
|
|
|
|
|
|
ut_free(lpFindFileData);
|
|
|
|
|
|
|
|
if (dir == INVALID_HANDLE_VALUE) {
|
|
|
|
|
|
|
|
if (error_is_fatal) {
|
|
|
|
os_file_handle_error(dirname, "opendir");
|
|
|
|
}
|
|
|
|
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(dir);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Closes a directory stream.
|
|
|
|
@param[in] dir directory stream
|
|
|
|
@return 0 if success, -1 if failure */
|
|
|
|
int
|
|
|
|
os_file_closedir(
|
|
|
|
os_file_dir_t dir)
|
|
|
|
{
|
|
|
|
BOOL ret;
|
|
|
|
|
|
|
|
ret = FindClose(dir);
|
|
|
|
|
|
|
|
if (!ret) {
|
|
|
|
os_file_handle_error_no_exit(NULL, "closedir", false);
|
|
|
|
|
|
|
|
return(-1);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** This function returns information of the next file in the directory. We
|
|
|
|
jump over the '.' and '..' entries in the directory.
|
|
|
|
@param[in] dirname directory name or path
|
|
|
|
@param[in] dir directory stream
|
|
|
|
@param[out] info buffer where the info is returned
|
|
|
|
@return 0 if ok, -1 if error, 1 if at the end of the directory */
|
|
|
|
int
|
|
|
|
os_file_readdir_next_file(
|
|
|
|
const char* dirname,
|
|
|
|
os_file_dir_t dir,
|
|
|
|
os_file_stat_t* info)
|
|
|
|
{
|
|
|
|
BOOL ret;
|
|
|
|
int status;
|
|
|
|
WIN32_FIND_DATA find_data;
|
|
|
|
|
|
|
|
next_file:
|
|
|
|
|
|
|
|
ret = FindNextFile(dir, &find_data);
|
|
|
|
|
|
|
|
if (ret > 0) {
|
|
|
|
|
|
|
|
const char* name;
|
|
|
|
|
|
|
|
name = static_cast<const char*>(find_data.cFileName);
|
|
|
|
|
|
|
|
ut_a(strlen(name) < OS_FILE_MAX_PATH);
|
|
|
|
|
|
|
|
if (strcmp(name, ".") == 0 || strcmp(name, "..") == 0) {
|
|
|
|
|
|
|
|
goto next_file;
|
|
|
|
}
|
|
|
|
|
|
|
|
strcpy(info->name, name);
|
|
|
|
|
|
|
|
info->size = find_data.nFileSizeHigh;
|
|
|
|
info->size <<= 32;
|
|
|
|
info->size |= find_data.nFileSizeLow;
|
|
|
|
|
|
|
|
if (find_data.dwFileAttributes
|
|
|
|
& FILE_ATTRIBUTE_REPARSE_POINT) {
|
|
|
|
|
|
|
|
/* TODO: test Windows symlinks */
|
|
|
|
/* TODO: MySQL has apparently its own symlink
|
|
|
|
implementation in Windows, dbname.sym can
|
|
|
|
redirect a database directory:
|
|
|
|
REFMAN "windows-symbolic-links.html" */
|
|
|
|
|
|
|
|
info->type = OS_FILE_TYPE_LINK;
|
|
|
|
|
|
|
|
} else if (find_data.dwFileAttributes
|
|
|
|
& FILE_ATTRIBUTE_DIRECTORY) {
|
|
|
|
|
|
|
|
info->type = OS_FILE_TYPE_DIR;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
/* It is probably safest to assume that all other
|
|
|
|
file types are normal. Better to check them rather
|
|
|
|
than blindly skip them. */
|
|
|
|
|
|
|
|
info->type = OS_FILE_TYPE_FILE;
|
|
|
|
}
|
|
|
|
|
|
|
|
status = 0;
|
|
|
|
|
|
|
|
} else if (GetLastError() == ERROR_NO_MORE_FILES) {
|
|
|
|
|
|
|
|
status = 1;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
os_file_handle_error_no_exit(NULL, "readdir_next_file", false);
|
|
|
|
|
|
|
|
status = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return(status);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** NOTE! Use the corresponding macro os_file_create(), not directly
|
|
|
|
this function!
|
|
|
|
Opens an existing file or creates a new.
|
|
|
|
@param[in] name name of the file or path as a null-terminated
|
|
|
|
string
|
|
|
|
@param[in] create_mode create mode
|
|
|
|
@param[in] purpose OS_FILE_AIO, if asynchronous, non-buffered I/O
|
|
|
|
is desired, OS_FILE_NORMAL, if any normal file;
|
|
|
|
NOTE that it also depends on type, os_aio_..
|
|
|
|
and srv_.. variables whether we really use async
|
|
|
|
I/O or unbuffered I/O: look in the function
|
|
|
|
source code for the exact rules
|
|
|
|
@param[in] type OS_DATA_FILE or OS_LOG_FILE
|
|
|
|
@param[in] success true if succeeded
|
|
|
|
@return handle to the file, not defined if error, error number
|
|
|
|
can be retrieved with os_file_get_last_error */
|
|
|
|
os_file_t
|
|
|
|
os_file_create_func(
|
|
|
|
const char* name,
|
|
|
|
ulint create_mode,
|
|
|
|
ulint purpose,
|
|
|
|
ulint type,
|
|
|
|
bool read_only,
|
|
|
|
bool* success)
|
|
|
|
{
|
|
|
|
os_file_t file;
|
|
|
|
bool retry;
|
|
|
|
bool on_error_no_exit;
|
|
|
|
bool on_error_silent;
|
|
|
|
|
|
|
|
*success = false;
|
|
|
|
|
|
|
|
DBUG_EXECUTE_IF(
|
|
|
|
"ib_create_table_fail_disk_full",
|
|
|
|
*success = false;
|
|
|
|
SetLastError(ERROR_DISK_FULL);
|
|
|
|
return(OS_FILE_CLOSED);
|
|
|
|
);
|
|
|
|
|
|
|
|
DWORD create_flag;
|
|
|
|
DWORD share_mode = FILE_SHARE_READ;
|
|
|
|
|
2017-01-31 11:25:25 +01:00
|
|
|
if (create_mode != OS_FILE_OPEN && create_mode != OS_FILE_OPEN_RAW) {
|
|
|
|
WAIT_ALLOW_WRITES();
|
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
on_error_no_exit = create_mode & OS_FILE_ON_ERROR_NO_EXIT
|
|
|
|
? true : false;
|
|
|
|
|
|
|
|
on_error_silent = create_mode & OS_FILE_ON_ERROR_SILENT
|
|
|
|
? true : false;
|
|
|
|
|
|
|
|
create_mode &= ~OS_FILE_ON_ERROR_NO_EXIT;
|
|
|
|
create_mode &= ~OS_FILE_ON_ERROR_SILENT;
|
|
|
|
|
|
|
|
if (create_mode == OS_FILE_OPEN_RAW) {
|
|
|
|
|
|
|
|
ut_a(!read_only);
|
|
|
|
|
|
|
|
create_flag = OPEN_EXISTING;
|
|
|
|
|
|
|
|
/* On Windows Physical devices require admin privileges and
|
|
|
|
have to have the write-share mode set. See the remarks
|
|
|
|
section for the CreateFile() function documentation in MSDN. */
|
|
|
|
|
|
|
|
share_mode |= FILE_SHARE_WRITE;
|
|
|
|
|
|
|
|
} else if (create_mode == OS_FILE_OPEN
|
|
|
|
|| create_mode == OS_FILE_OPEN_RETRY) {
|
|
|
|
|
|
|
|
create_flag = OPEN_EXISTING;
|
|
|
|
|
|
|
|
} else if (read_only) {
|
|
|
|
|
|
|
|
create_flag = OPEN_EXISTING;
|
|
|
|
|
|
|
|
} else if (create_mode == OS_FILE_CREATE) {
|
|
|
|
|
|
|
|
create_flag = CREATE_NEW;
|
|
|
|
|
|
|
|
} else if (create_mode == OS_FILE_OVERWRITE) {
|
|
|
|
|
|
|
|
create_flag = CREATE_ALWAYS;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
ib::error()
|
|
|
|
<< "Unknown file create mode (" << create_mode << ") "
|
|
|
|
<< " for file '" << name << "'";
|
|
|
|
|
|
|
|
return(OS_FILE_CLOSED);
|
|
|
|
}
|
|
|
|
|
|
|
|
DWORD attributes = 0;
|
|
|
|
|
|
|
|
if (purpose == OS_FILE_AIO) {
|
|
|
|
|
|
|
|
#ifdef WIN_ASYNC_IO
|
|
|
|
/* If specified, use asynchronous (overlapped) io and no
|
|
|
|
buffering of writes in the OS */
|
|
|
|
|
|
|
|
if (srv_use_native_aio) {
|
|
|
|
attributes |= FILE_FLAG_OVERLAPPED;
|
|
|
|
}
|
|
|
|
#endif /* WIN_ASYNC_IO */
|
|
|
|
|
|
|
|
} else if (purpose == OS_FILE_NORMAL) {
|
|
|
|
|
|
|
|
/* Use default setting. */
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
ib::error()
|
|
|
|
<< "Unknown purpose flag (" << purpose << ") "
|
|
|
|
<< "while opening file '" << name << "'";
|
|
|
|
|
|
|
|
return(OS_FILE_CLOSED);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef UNIV_NON_BUFFERED_IO
|
|
|
|
// TODO: Create a bug, this looks wrong. The flush log
|
|
|
|
// parameter is dynamic.
|
|
|
|
if (type == OS_LOG_FILE && srv_flush_log_at_trx_commit == 2) {
|
|
|
|
|
|
|
|
/* Do not use unbuffered i/o for the log files because
|
|
|
|
value 2 denotes that we do not flush the log at every
|
|
|
|
commit, but only once per second */
|
|
|
|
|
|
|
|
} else if (srv_win_file_flush_method == SRV_WIN_IO_UNBUFFERED) {
|
|
|
|
|
|
|
|
attributes |= FILE_FLAG_NO_BUFFERING;
|
|
|
|
}
|
|
|
|
#endif /* UNIV_NON_BUFFERED_IO */
|
|
|
|
|
|
|
|
DWORD access = GENERIC_READ;
|
|
|
|
|
|
|
|
if (!read_only) {
|
|
|
|
access |= GENERIC_WRITE;
|
|
|
|
}
|
|
|
|
|
|
|
|
do {
|
|
|
|
/* Use default security attributes and no template file. */
|
|
|
|
file = CreateFile(
|
|
|
|
(LPCTSTR) name, access, share_mode, NULL,
|
|
|
|
create_flag, attributes, NULL);
|
|
|
|
|
|
|
|
if (file == INVALID_HANDLE_VALUE) {
|
|
|
|
const char* operation;
|
|
|
|
|
|
|
|
operation = (create_mode == OS_FILE_CREATE
|
|
|
|
&& !read_only)
|
|
|
|
? "create" : "open";
|
|
|
|
|
|
|
|
*success = false;
|
|
|
|
|
|
|
|
if (on_error_no_exit) {
|
|
|
|
retry = os_file_handle_error_no_exit(
|
|
|
|
name, operation, on_error_silent);
|
|
|
|
} else {
|
|
|
|
retry = os_file_handle_error(name, operation);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
|
|
|
|
retry = false;
|
|
|
|
|
|
|
|
*success = true;
|
|
|
|
|
2016-09-19 14:31:20 +02:00
|
|
|
if (srv_use_native_aio && ((attributes & FILE_FLAG_OVERLAPPED) != 0)) {
|
|
|
|
/* Bind the file handle to completion port */
|
|
|
|
ut_a(CreateIoCompletionPort(file, completion_port, 0, 0));
|
|
|
|
}
|
2016-08-12 10:17:45 +02:00
|
|
|
DWORD temp;
|
|
|
|
|
|
|
|
/* This is a best effort use case, if it fails then
|
|
|
|
we will find out when we try and punch the hole. */
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
os_win32_device_io_control(
|
2016-08-12 10:17:45 +02:00
|
|
|
file, FSCTL_SET_SPARSE, NULL, 0, NULL, 0,
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
&temp);
|
2016-08-12 10:17:45 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
} while (retry);
|
|
|
|
|
|
|
|
return(file);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** NOTE! Use the corresponding macro os_file_create_simple_no_error_handling(),
|
|
|
|
not directly this function!
|
|
|
|
A simple function to open or create a file.
|
|
|
|
@param[in] name name of the file or path as a null-terminated
|
|
|
|
string
|
|
|
|
@param[in] create_mode create mode
|
|
|
|
@param[in] access_type OS_FILE_READ_ONLY, OS_FILE_READ_WRITE, or
|
|
|
|
OS_FILE_READ_ALLOW_DELETE; the last option is
|
|
|
|
used by a backup program reading the file
|
|
|
|
@param[out] success true if succeeded
|
|
|
|
@return own: handle to the file, not defined if error, error number
|
|
|
|
can be retrieved with os_file_get_last_error */
|
|
|
|
os_file_t
|
|
|
|
os_file_create_simple_no_error_handling_func(
|
|
|
|
const char* name,
|
|
|
|
ulint create_mode,
|
|
|
|
ulint access_type,
|
|
|
|
bool read_only,
|
|
|
|
bool* success)
|
|
|
|
{
|
|
|
|
os_file_t file;
|
|
|
|
|
|
|
|
*success = false;
|
|
|
|
|
|
|
|
DWORD access;
|
|
|
|
DWORD create_flag;
|
|
|
|
DWORD attributes = 0;
|
|
|
|
DWORD share_mode = FILE_SHARE_READ;
|
|
|
|
|
|
|
|
ut_a(name);
|
|
|
|
|
|
|
|
ut_a(!(create_mode & OS_FILE_ON_ERROR_SILENT));
|
|
|
|
ut_a(!(create_mode & OS_FILE_ON_ERROR_NO_EXIT));
|
|
|
|
|
|
|
|
if (create_mode == OS_FILE_OPEN) {
|
|
|
|
|
|
|
|
create_flag = OPEN_EXISTING;
|
|
|
|
|
|
|
|
} else if (read_only) {
|
|
|
|
|
|
|
|
create_flag = OPEN_EXISTING;
|
|
|
|
|
|
|
|
} else if (create_mode == OS_FILE_CREATE) {
|
|
|
|
|
|
|
|
create_flag = CREATE_NEW;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
ib::error()
|
|
|
|
<< "Unknown file create mode (" << create_mode << ") "
|
|
|
|
<< " for file '" << name << "'";
|
|
|
|
|
|
|
|
return(OS_FILE_CLOSED);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (access_type == OS_FILE_READ_ONLY) {
|
|
|
|
|
|
|
|
access = GENERIC_READ;
|
|
|
|
|
|
|
|
} else if (read_only) {
|
|
|
|
|
|
|
|
access = GENERIC_READ;
|
|
|
|
|
|
|
|
} else if (access_type == OS_FILE_READ_WRITE) {
|
|
|
|
|
|
|
|
access = GENERIC_READ | GENERIC_WRITE;
|
|
|
|
|
|
|
|
} else if (access_type == OS_FILE_READ_ALLOW_DELETE) {
|
|
|
|
|
|
|
|
ut_a(!read_only);
|
|
|
|
|
|
|
|
access = GENERIC_READ;
|
|
|
|
|
|
|
|
/*!< A backup program has to give mysqld the maximum
|
|
|
|
freedom to do what it likes with the file */
|
|
|
|
|
|
|
|
share_mode |= FILE_SHARE_DELETE | FILE_SHARE_WRITE;
|
|
|
|
} else {
|
|
|
|
|
|
|
|
ib::error()
|
|
|
|
<< "Unknown file access type (" << access_type << ") "
|
|
|
|
<< "for file '" << name << "'";
|
|
|
|
|
|
|
|
return(OS_FILE_CLOSED);
|
|
|
|
}
|
|
|
|
|
|
|
|
file = CreateFile((LPCTSTR) name,
|
|
|
|
access,
|
|
|
|
share_mode,
|
|
|
|
NULL, // Security attributes
|
|
|
|
create_flag,
|
|
|
|
attributes,
|
|
|
|
NULL); // No template file
|
|
|
|
|
|
|
|
*success = (file != INVALID_HANDLE_VALUE);
|
|
|
|
|
|
|
|
return(file);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Deletes a file if it exists. The file has to be closed before calling this.
|
|
|
|
@param[in] name file path as a null-terminated string
|
|
|
|
@param[out] exist indicate if file pre-exist
|
|
|
|
@return true if success */
|
|
|
|
bool
|
|
|
|
os_file_delete_if_exists_func(
|
|
|
|
const char* name,
|
|
|
|
bool* exist)
|
|
|
|
{
|
|
|
|
ulint count = 0;
|
|
|
|
|
|
|
|
if (exist != NULL) {
|
|
|
|
*exist = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (;;) {
|
2016-12-30 14:04:10 +01:00
|
|
|
/* In Windows, deleting an .ibd file may fail if
|
|
|
|
the file is being accessed by an external program,
|
|
|
|
such as a backup tool. */
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
bool ret = DeleteFile((LPCTSTR) name);
|
|
|
|
|
|
|
|
if (ret) {
|
|
|
|
return(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
DWORD lasterr = GetLastError();
|
|
|
|
|
|
|
|
if (lasterr == ERROR_FILE_NOT_FOUND
|
|
|
|
|| lasterr == ERROR_PATH_NOT_FOUND) {
|
|
|
|
|
|
|
|
/* the file does not exist, this not an error */
|
|
|
|
if (exist != NULL) {
|
|
|
|
*exist = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
++count;
|
|
|
|
|
|
|
|
if (count > 100 && 0 == (count % 10)) {
|
|
|
|
|
|
|
|
/* Print error information */
|
|
|
|
os_file_get_last_error(true);
|
|
|
|
|
|
|
|
ib::warn() << "Delete of file '" << name << "' failed.";
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Sleep for a second */
|
|
|
|
os_thread_sleep(1000000);
|
|
|
|
|
|
|
|
if (count > 2000) {
|
|
|
|
|
|
|
|
return(false);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Deletes a file. The file has to be closed before calling this.
|
|
|
|
@param[in] name File path as NUL terminated string
|
|
|
|
@return true if success */
|
|
|
|
bool
|
|
|
|
os_file_delete_func(
|
|
|
|
const char* name)
|
|
|
|
{
|
|
|
|
ulint count = 0;
|
|
|
|
|
|
|
|
for (;;) {
|
2016-12-30 14:04:10 +01:00
|
|
|
/* In Windows, deleting an .ibd file may fail if
|
|
|
|
the file is being accessed by an external program,
|
|
|
|
such as a backup tool. */
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
BOOL ret = DeleteFile((LPCTSTR) name);
|
|
|
|
|
|
|
|
if (ret) {
|
|
|
|
return(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (GetLastError() == ERROR_FILE_NOT_FOUND) {
|
|
|
|
/* If the file does not exist, we classify this as
|
|
|
|
a 'mild' error and return */
|
|
|
|
|
|
|
|
return(false);
|
|
|
|
}
|
|
|
|
|
|
|
|
++count;
|
|
|
|
|
|
|
|
if (count > 100 && 0 == (count % 10)) {
|
|
|
|
|
|
|
|
/* print error information */
|
|
|
|
os_file_get_last_error(true);
|
|
|
|
|
|
|
|
ib::warn()
|
2016-12-30 14:04:10 +01:00
|
|
|
<< "Cannot delete file '" << name << "'. Is "
|
|
|
|
<< "another program accessing it?";
|
2016-08-12 10:17:45 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* sleep for a second */
|
|
|
|
os_thread_sleep(1000000);
|
|
|
|
|
|
|
|
if (count > 2000) {
|
|
|
|
|
|
|
|
return(false);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ut_error;
|
|
|
|
return(false);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** NOTE! Use the corresponding macro os_file_rename(), not directly this
|
|
|
|
function!
|
|
|
|
Renames a file (can also move it to another directory). It is safest that the
|
|
|
|
file is closed before calling this function.
|
|
|
|
@param[in] oldpath old file path as a null-terminated string
|
|
|
|
@param[in] newpath new file path
|
|
|
|
@return true if success */
|
|
|
|
bool
|
|
|
|
os_file_rename_func(
|
|
|
|
const char* oldpath,
|
|
|
|
const char* newpath)
|
|
|
|
{
|
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
os_file_type_t type;
|
|
|
|
bool exists;
|
|
|
|
|
|
|
|
/* New path must not exist. */
|
|
|
|
ut_ad(os_file_status(newpath, &exists, &type));
|
|
|
|
ut_ad(!exists);
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Old path must exist. */
|
|
|
|
ut_ad(os_file_status(oldpath, &exists, &type));
|
|
|
|
ut_ad(exists);
|
|
|
|
#endif /* UNIV_DEBUG */
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (MoveFile((LPCTSTR) oldpath, (LPCTSTR) newpath)) {
|
|
|
|
return(true);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
os_file_handle_error_no_exit(oldpath, "rename", false);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(false);
|
|
|
|
}
|
2015-02-18 16:20:46 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** NOTE! Use the corresponding macro os_file_close(), not directly
|
|
|
|
this function!
|
|
|
|
Closes a file handle. In case of error, error number can be retrieved with
|
|
|
|
os_file_get_last_error.
|
|
|
|
@param[in,own] file Handle to a file
|
|
|
|
@return true if success */
|
|
|
|
bool
|
|
|
|
os_file_close_func(
|
|
|
|
os_file_t file)
|
|
|
|
{
|
|
|
|
ut_a(file > 0);
|
|
|
|
|
|
|
|
if (CloseHandle(file)) {
|
|
|
|
return(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
os_file_handle_error(NULL, "close");
|
|
|
|
|
|
|
|
return(false);
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Gets a file size.
|
|
|
|
@param[in] file Handle to a file
|
|
|
|
@return file size, or (os_offset_t) -1 on failure */
|
|
|
|
os_offset_t
|
|
|
|
os_file_get_size(
|
|
|
|
os_file_t file)
|
|
|
|
{
|
|
|
|
DWORD high;
|
|
|
|
DWORD low = GetFileSize(file, &high);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (low == 0xFFFFFFFF && GetLastError() != NO_ERROR) {
|
|
|
|
return((os_offset_t) -1);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(os_offset_t(low | (os_offset_t(high) << 32)));
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Gets a file size.
|
|
|
|
@param[in] filename Full path to the filename to check
|
|
|
|
@return file size if OK, else set m_total_size to ~0 and m_alloc_size to
|
|
|
|
errno */
|
|
|
|
os_file_size_t
|
|
|
|
os_file_get_size(
|
|
|
|
const char* filename)
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
2016-08-12 10:17:45 +02:00
|
|
|
struct __stat64 s;
|
|
|
|
os_file_size_t file_size;
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
int ret = _stat64(filename, &s);
|
|
|
|
|
|
|
|
if (ret == 0) {
|
|
|
|
|
|
|
|
file_size.m_total_size = s.st_size;
|
|
|
|
|
|
|
|
DWORD low_size;
|
|
|
|
DWORD high_size;
|
|
|
|
|
|
|
|
low_size = GetCompressedFileSize(filename, &high_size);
|
|
|
|
|
|
|
|
if (low_size != INVALID_FILE_SIZE) {
|
|
|
|
|
|
|
|
file_size.m_alloc_size = high_size;
|
|
|
|
file_size.m_alloc_size <<= 32;
|
|
|
|
file_size.m_alloc_size |= low_size;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
ib::error()
|
|
|
|
<< "GetCompressedFileSize("
|
|
|
|
<< filename << ", ..) failed.";
|
|
|
|
|
|
|
|
file_size.m_alloc_size = (os_offset_t) -1;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
file_size.m_total_size = ~0;
|
|
|
|
file_size.m_alloc_size = (os_offset_t) ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
return(file_size);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** This function returns information about the specified file
|
|
|
|
@param[in] path pathname of the file
|
|
|
|
@param[out] stat_info information of a file in a directory
|
|
|
|
@param[in,out] statinfo information of a file in a directory
|
|
|
|
@param[in] check_rw_perm for testing whether the file can be opened
|
|
|
|
in RW mode
|
|
|
|
@param[in] read_only true if the file is opened in read-only mode
|
|
|
|
@return DB_SUCCESS if all OK */
|
|
|
|
static
|
|
|
|
dberr_t
|
|
|
|
os_file_get_status_win32(
|
|
|
|
const char* path,
|
|
|
|
os_file_stat_t* stat_info,
|
|
|
|
struct _stat64* statinfo,
|
|
|
|
bool check_rw_perm,
|
|
|
|
bool read_only)
|
|
|
|
{
|
|
|
|
int ret = _stat64(path, statinfo);
|
|
|
|
|
|
|
|
if (ret && (errno == ENOENT || errno == ENOTDIR)) {
|
2005-10-27 09:29:40 +02:00
|
|
|
/* file does not exist */
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
return(DB_NOT_FOUND);
|
|
|
|
|
2005-10-27 09:29:40 +02:00
|
|
|
} else if (ret) {
|
|
|
|
/* file exists, but stat call failed */
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
os_file_handle_error_no_exit(path, "STAT", false);
|
|
|
|
|
|
|
|
return(DB_FAIL);
|
|
|
|
|
|
|
|
} else if (_S_IFDIR & statinfo->st_mode) {
|
|
|
|
|
|
|
|
stat_info->type = OS_FILE_TYPE_DIR;
|
|
|
|
|
|
|
|
} else if (_S_IFREG & statinfo->st_mode) {
|
|
|
|
|
|
|
|
DWORD access = GENERIC_READ;
|
|
|
|
|
|
|
|
if (!read_only) {
|
|
|
|
access |= GENERIC_WRITE;
|
|
|
|
}
|
|
|
|
|
|
|
|
stat_info->type = OS_FILE_TYPE_FILE;
|
|
|
|
|
|
|
|
/* Check if we can open it in read-only mode. */
|
|
|
|
|
|
|
|
if (check_rw_perm) {
|
|
|
|
HANDLE fh;
|
|
|
|
|
|
|
|
fh = CreateFile(
|
|
|
|
(LPCTSTR) path, // File to open
|
|
|
|
access,
|
|
|
|
0, // No sharing
|
|
|
|
NULL, // Default security
|
|
|
|
OPEN_EXISTING, // Existing file only
|
|
|
|
FILE_ATTRIBUTE_NORMAL, // Normal file
|
|
|
|
NULL); // No attr. template
|
|
|
|
|
|
|
|
if (fh == INVALID_HANDLE_VALUE) {
|
|
|
|
stat_info->rw_perm = false;
|
|
|
|
} else {
|
|
|
|
stat_info->rw_perm = true;
|
|
|
|
CloseHandle(fh);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
char volname[MAX_PATH];
|
|
|
|
BOOL result = GetVolumePathName(path, volname, MAX_PATH);
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (!result) {
|
|
|
|
|
|
|
|
ib::error()
|
|
|
|
<< "os_file_get_status_win32: "
|
|
|
|
<< "Failed to get the volume path name for: "
|
|
|
|
<< path
|
|
|
|
<< "- OS error number " << GetLastError();
|
|
|
|
|
|
|
|
return(DB_FAIL);
|
|
|
|
}
|
|
|
|
|
|
|
|
DWORD sectorsPerCluster;
|
|
|
|
DWORD bytesPerSector;
|
|
|
|
DWORD numberOfFreeClusters;
|
|
|
|
DWORD totalNumberOfClusters;
|
|
|
|
|
|
|
|
result = GetDiskFreeSpace(
|
|
|
|
(LPCSTR) volname,
|
|
|
|
§orsPerCluster,
|
|
|
|
&bytesPerSector,
|
|
|
|
&numberOfFreeClusters,
|
|
|
|
&totalNumberOfClusters);
|
|
|
|
|
|
|
|
if (!result) {
|
|
|
|
|
|
|
|
ib::error()
|
|
|
|
<< "GetDiskFreeSpace(" << volname << ",...) "
|
|
|
|
<< "failed "
|
|
|
|
<< "- OS error number " << GetLastError();
|
|
|
|
|
|
|
|
return(DB_FAIL);
|
|
|
|
}
|
|
|
|
|
|
|
|
stat_info->block_size = bytesPerSector * sectorsPerCluster;
|
|
|
|
} else {
|
|
|
|
stat_info->type = OS_FILE_TYPE_UNKNOWN;
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(DB_SUCCESS);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Truncates a file to a specified size in bytes.
|
|
|
|
Do nothing if the size to preserve is greater or equal to the current
|
|
|
|
size of the file.
|
|
|
|
@param[in] pathname file path
|
|
|
|
@param[in] file file to be truncated
|
|
|
|
@param[in] size size to preserve in bytes
|
|
|
|
@return true if success */
|
|
|
|
static
|
|
|
|
bool
|
|
|
|
os_file_truncate_win32(
|
|
|
|
const char* pathname,
|
|
|
|
os_file_t file,
|
|
|
|
os_offset_t size)
|
|
|
|
{
|
|
|
|
LARGE_INTEGER length;
|
|
|
|
|
|
|
|
length.QuadPart = size;
|
|
|
|
|
|
|
|
BOOL success = SetFilePointerEx(file, length, NULL, FILE_BEGIN);
|
|
|
|
|
|
|
|
if (!success) {
|
|
|
|
os_file_handle_error_no_exit(
|
|
|
|
pathname, "SetFilePointerEx", false);
|
2005-10-27 09:29:40 +02:00
|
|
|
} else {
|
2016-08-12 10:17:45 +02:00
|
|
|
success = SetEndOfFile(file);
|
|
|
|
if (!success) {
|
|
|
|
os_file_handle_error_no_exit(
|
|
|
|
pathname, "SetEndOfFile", false);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return(success);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Truncates a file at its current position.
|
|
|
|
@param[in] file Handle to be truncated
|
|
|
|
@return true if success */
|
|
|
|
bool
|
|
|
|
os_file_set_eof(
|
|
|
|
FILE* file)
|
|
|
|
{
|
|
|
|
HANDLE h = (HANDLE) _get_osfhandle(fileno(file));
|
|
|
|
|
|
|
|
return(SetEndOfFile(h));
|
|
|
|
}
|
|
|
|
|
|
|
|
/** This function can be called if one wants to post a batch of reads and
|
|
|
|
prefers an i/o-handler thread to handle them all at once later. You must
|
|
|
|
call os_aio_simulated_wake_handler_threads later to ensure the threads
|
|
|
|
are not left sleeping! */
|
|
|
|
void
|
|
|
|
os_aio_simulated_put_read_threads_to_sleep()
|
|
|
|
{
|
|
|
|
AIO::simulated_put_read_threads_to_sleep();
|
|
|
|
}
|
|
|
|
|
|
|
|
/** This function can be called if one wants to post a batch of reads and
|
|
|
|
prefers an i/o-handler thread to handle them all at once later. You must
|
|
|
|
call os_aio_simulated_wake_handler_threads later to ensure the threads
|
|
|
|
are not left sleeping! */
|
|
|
|
void
|
|
|
|
AIO::simulated_put_read_threads_to_sleep()
|
|
|
|
{
|
|
|
|
/* The idea of putting background IO threads to sleep is only for
|
|
|
|
Windows when using simulated AIO. Windows XP seems to schedule
|
|
|
|
background threads too eagerly to allow for coalescing during
|
|
|
|
readahead requests. */
|
|
|
|
|
|
|
|
if (srv_use_native_aio) {
|
|
|
|
/* We do not use simulated AIO: do nothing */
|
|
|
|
|
|
|
|
return;
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
os_aio_recommend_sleep_for_read_threads = true;
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
for (ulint i = 0; i < os_aio_n_segments; i++) {
|
|
|
|
AIO* array;
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
get_array_and_local_segment(&array, i);
|
|
|
|
|
|
|
|
if (array == s_reads) {
|
|
|
|
|
|
|
|
os_event_reset(os_aio_segment_wait_events[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* !_WIN32*/
|
|
|
|
|
|
|
|
/** Does a syncronous read or write depending upon the type specified
|
|
|
|
In case of partial reads/writes the function tries
|
|
|
|
NUM_RETRIES_ON_PARTIAL_IO times to read/write the complete data.
|
|
|
|
@param[in] type, IO flags
|
|
|
|
@param[in] file handle to an open file
|
|
|
|
@param[out] buf buffer where to read
|
|
|
|
@param[in] offset file offset from the start where to read
|
|
|
|
@param[in] n number of bytes to read, starting from offset
|
|
|
|
@param[out] err DB_SUCCESS or error code
|
|
|
|
@return number of bytes read/written, -1 if error */
|
2016-09-06 08:43:16 +02:00
|
|
|
static MY_ATTRIBUTE((warn_unused_result))
|
2016-08-12 10:17:45 +02:00
|
|
|
ssize_t
|
|
|
|
os_file_io(
|
|
|
|
const IORequest&in_type,
|
|
|
|
os_file_t file,
|
|
|
|
void* buf,
|
|
|
|
ulint n,
|
|
|
|
os_offset_t offset,
|
|
|
|
dberr_t* err)
|
|
|
|
{
|
|
|
|
ulint original_n = n;
|
|
|
|
IORequest type = in_type;
|
|
|
|
ssize_t bytes_returned = 0;
|
|
|
|
|
|
|
|
SyncFileIO sync_file_io(file, buf, n, offset);
|
|
|
|
|
|
|
|
for (ulint i = 0; i < NUM_RETRIES_ON_PARTIAL_IO; ++i) {
|
|
|
|
|
|
|
|
ssize_t n_bytes = sync_file_io.execute(type);
|
|
|
|
|
|
|
|
/* Check for a hard error. Not much we can do now. */
|
|
|
|
if (n_bytes < 0) {
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
} else if ((ulint) n_bytes + bytes_returned == n) {
|
|
|
|
|
|
|
|
bytes_returned += n_bytes;
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
|
|
|
|
if (offset > 0
|
|
|
|
&& !type.is_log()
|
|
|
|
&& type.is_write()
|
|
|
|
&& type.punch_hole()) {
|
|
|
|
*err = type.punch_hole(file,
|
2017-01-25 09:04:14 +01:00
|
|
|
offset,
|
|
|
|
static_cast<os_offset_t>(n));
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
|
|
|
|
} else {
|
|
|
|
*err = DB_SUCCESS;
|
|
|
|
}
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
return(original_n);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Handle partial read/write. */
|
|
|
|
|
|
|
|
ut_ad((ulint) n_bytes + bytes_returned < n);
|
|
|
|
|
|
|
|
bytes_returned += (ulint) n_bytes;
|
|
|
|
|
|
|
|
if (!type.is_partial_io_warning_disabled()) {
|
|
|
|
|
|
|
|
const char* op = type.is_read()
|
|
|
|
? "read" : "written";
|
|
|
|
|
|
|
|
ib::warn()
|
|
|
|
<< n
|
|
|
|
<< " bytes should have been " << op << ". Only "
|
|
|
|
<< bytes_returned
|
|
|
|
<< " bytes " << op << ". Retrying"
|
|
|
|
<< " for the remaining bytes.";
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Advance the offset and buffer by n_bytes */
|
|
|
|
sync_file_io.advance(n_bytes);
|
|
|
|
}
|
|
|
|
|
|
|
|
*err = DB_IO_ERROR;
|
|
|
|
|
|
|
|
if (!type.is_partial_io_warning_disabled()) {
|
|
|
|
ib::warn()
|
|
|
|
<< "Retry attempts for "
|
|
|
|
<< (type.is_read() ? "reading" : "writing")
|
|
|
|
<< " partial data failed.";
|
|
|
|
}
|
|
|
|
|
|
|
|
return(bytes_returned);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Does a synchronous write operation in Posix.
|
|
|
|
@param[in] type IO context
|
|
|
|
@param[in] file handle to an open file
|
|
|
|
@param[out] buf buffer from which to write
|
|
|
|
@param[in] n number of bytes to read, starting from offset
|
|
|
|
@param[in] offset file offset from the start where to read
|
|
|
|
@param[out] err DB_SUCCESS or error code
|
|
|
|
@return number of bytes written, -1 if error */
|
2016-09-06 08:43:16 +02:00
|
|
|
static MY_ATTRIBUTE((warn_unused_result))
|
2016-08-12 10:17:45 +02:00
|
|
|
ssize_t
|
|
|
|
os_file_pwrite(
|
|
|
|
IORequest& type,
|
|
|
|
os_file_t file,
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
const byte* buf,
|
2016-08-12 10:17:45 +02:00
|
|
|
ulint n,
|
|
|
|
os_offset_t offset,
|
|
|
|
dberr_t* err)
|
|
|
|
{
|
|
|
|
ut_ad(type.validate());
|
|
|
|
|
|
|
|
++os_n_file_writes;
|
|
|
|
|
2016-09-09 13:05:59 +02:00
|
|
|
(void) my_atomic_addlint(&os_n_pending_writes, 1);
|
2016-08-12 10:17:45 +02:00
|
|
|
MONITOR_ATOMIC_INC(MONITOR_OS_PENDING_WRITES);
|
|
|
|
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
ssize_t n_bytes = os_file_io(type, file, const_cast<byte*>(buf),
|
2017-01-16 13:03:36 +01:00
|
|
|
n, offset, err);
|
2016-08-12 10:17:45 +02:00
|
|
|
|
2016-09-09 13:05:59 +02:00
|
|
|
(void) my_atomic_addlint(&os_n_pending_writes, -1);
|
2016-08-12 10:17:45 +02:00
|
|
|
MONITOR_ATOMIC_DEC(MONITOR_OS_PENDING_WRITES);
|
|
|
|
|
|
|
|
return(n_bytes);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Requests a synchronous write operation.
|
|
|
|
@param[in] type IO flags
|
|
|
|
@param[in] file handle to an open file
|
|
|
|
@param[out] buf buffer from which to write
|
|
|
|
@param[in] offset file offset from the start where to read
|
|
|
|
@param[in] n number of bytes to read, starting from offset
|
|
|
|
@return DB_SUCCESS if request was successful, false if fail */
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
static MY_ATTRIBUTE((warn_unused_result))
|
2016-08-12 10:17:45 +02:00
|
|
|
dberr_t
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
os_file_write_page(
|
2016-08-12 10:17:45 +02:00
|
|
|
IORequest& type,
|
|
|
|
const char* name,
|
|
|
|
os_file_t file,
|
2017-01-16 13:03:36 +01:00
|
|
|
const void* buf,
|
2016-08-12 10:17:45 +02:00
|
|
|
os_offset_t offset,
|
|
|
|
ulint n)
|
|
|
|
{
|
|
|
|
dberr_t err;
|
|
|
|
|
2017-01-16 13:03:36 +01:00
|
|
|
ut_ad(type.is_write());
|
2016-09-06 08:43:16 +02:00
|
|
|
ut_ad(type.validate());
|
|
|
|
ut_ad(n > 0);
|
2017-01-16 13:03:36 +01:00
|
|
|
|
2017-01-31 11:25:25 +01:00
|
|
|
WAIT_ALLOW_WRITES();
|
|
|
|
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
ssize_t n_bytes = os_file_pwrite(type, file, (byte*)buf, n, offset, &err);
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
if ((ulint) n_bytes != n && !os_has_said_disk_full) {
|
|
|
|
|
|
|
|
ib::error()
|
|
|
|
<< "Write to file " << name << "failed at offset "
|
|
|
|
<< offset << ", " << n
|
|
|
|
<< " bytes should have been written,"
|
|
|
|
" only " << n_bytes << " were written."
|
|
|
|
" Operating system error number " << errno << "."
|
|
|
|
" Check that your OS and file system"
|
|
|
|
" support files of this size."
|
|
|
|
" Check also that the disk is not full"
|
|
|
|
" or a disk quota exceeded.";
|
|
|
|
|
|
|
|
if (strerror(errno) != NULL) {
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ib::error()
|
|
|
|
<< "Error number " << errno
|
|
|
|
<< " means '" << strerror(errno) << "'";
|
|
|
|
}
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ib::info() << OPERATING_SYSTEM_ERROR_MSG;
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
os_has_said_disk_full = true;
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(err);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Does a synchronous read operation in Posix.
|
|
|
|
@param[in] type IO flags
|
|
|
|
@param[in] file handle to an open file
|
|
|
|
@param[out] buf buffer where to read
|
|
|
|
@param[in] offset file offset from the start where to read
|
|
|
|
@param[in] n number of bytes to read, starting from offset
|
|
|
|
@param[out] err DB_SUCCESS or error code
|
|
|
|
@return number of bytes read, -1 if error */
|
2016-09-06 08:43:16 +02:00
|
|
|
static MY_ATTRIBUTE((warn_unused_result))
|
2016-08-12 10:17:45 +02:00
|
|
|
ssize_t
|
|
|
|
os_file_pread(
|
|
|
|
IORequest& type,
|
|
|
|
os_file_t file,
|
|
|
|
void* buf,
|
|
|
|
ulint n,
|
|
|
|
os_offset_t offset,
|
|
|
|
dberr_t* err)
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
2016-08-12 10:17:45 +02:00
|
|
|
++os_n_file_reads;
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-09-09 13:05:59 +02:00
|
|
|
(void) my_atomic_addlint(&os_n_pending_reads, 1);
|
2016-08-12 10:17:45 +02:00
|
|
|
MONITOR_ATOMIC_INC(MONITOR_OS_PENDING_READS);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ssize_t n_bytes = os_file_io(type, file, buf, n, offset, err);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-09-09 13:05:59 +02:00
|
|
|
(void) my_atomic_addlint(&os_n_pending_reads, -1);
|
2016-08-12 10:17:45 +02:00
|
|
|
MONITOR_ATOMIC_DEC(MONITOR_OS_PENDING_READS);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(n_bytes);
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Requests a synchronous positioned read operation.
|
|
|
|
@return DB_SUCCESS if request was successful, false if fail
|
|
|
|
@param[in] type IO flags
|
|
|
|
@param[in] file handle to an open file
|
|
|
|
@param[out] buf buffer where to read
|
|
|
|
@param[in] offset file offset from the start where to read
|
|
|
|
@param[in] n number of bytes to read, starting from offset
|
|
|
|
@param[out] o number of bytes actually read
|
|
|
|
@param[in] exit_on_err if true then exit on error
|
|
|
|
@return DB_SUCCESS or error code */
|
2016-09-06 08:43:16 +02:00
|
|
|
static MY_ATTRIBUTE((warn_unused_result))
|
2016-08-12 10:17:45 +02:00
|
|
|
dberr_t
|
|
|
|
os_file_read_page(
|
|
|
|
IORequest& type,
|
|
|
|
os_file_t file,
|
|
|
|
void* buf,
|
|
|
|
os_offset_t offset,
|
|
|
|
ulint n,
|
|
|
|
ulint* o,
|
|
|
|
bool exit_on_err)
|
|
|
|
{
|
|
|
|
dberr_t err;
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
os_bytes_read_since_printout += n;
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-09-06 08:43:16 +02:00
|
|
|
ut_ad(type.validate());
|
|
|
|
ut_ad(n > 0);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
for (;;) {
|
|
|
|
ssize_t n_bytes;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
n_bytes = os_file_pread(type, file, buf, n, offset, &err);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (o != NULL) {
|
|
|
|
*o = n_bytes;
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (err != DB_SUCCESS && !exit_on_err) {
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(err);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
} else if ((ulint) n_bytes == n) {
|
2016-09-06 08:43:16 +02:00
|
|
|
return(DB_SUCCESS);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-09-06 08:43:16 +02:00
|
|
|
ib::error() << "Tried to read " << n
|
|
|
|
<< " bytes at offset " << offset
|
|
|
|
<< ", but was only able to read " << n_bytes;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (exit_on_err) {
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (!os_file_handle_error(NULL, "read")) {
|
|
|
|
/* Hard error */
|
|
|
|
break;
|
|
|
|
}
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
} else if (!os_file_handle_error_no_exit(NULL, "read", false)) {
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Hard error */
|
|
|
|
break;
|
|
|
|
}
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (n_bytes > 0 && (ulint) n_bytes < n) {
|
|
|
|
n -= (ulint) n_bytes;
|
|
|
|
offset += (ulint) n_bytes;
|
|
|
|
buf = reinterpret_cast<uchar*>(buf) + (ulint) n_bytes;
|
|
|
|
}
|
2014-05-05 18:20:28 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ib::fatal()
|
|
|
|
<< "Cannot read from file. OS error number "
|
|
|
|
<< errno << ".";
|
|
|
|
|
|
|
|
return(err);
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Retrieves the last error number if an error occurs in a file io function.
|
|
|
|
The number should be retrieved before any other OS calls (because they may
|
|
|
|
overwrite the error number). If the number is not known to this program,
|
|
|
|
the OS error number + 100 is returned.
|
|
|
|
@param[in] report_all_errors true if we want an error printed
|
|
|
|
for all errors
|
|
|
|
@return error number, or OS error number + 100 */
|
|
|
|
ulint
|
|
|
|
os_file_get_last_error(
|
|
|
|
bool report_all_errors)
|
|
|
|
{
|
|
|
|
return(os_file_get_last_error_low(report_all_errors, false));
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-12-30 07:56:13 +01:00
|
|
|
/** Handle errors for file operations.
|
2016-08-12 10:17:45 +02:00
|
|
|
@param[in] name name of a file or NULL
|
|
|
|
@param[in] operation operation
|
2016-12-30 07:56:13 +01:00
|
|
|
@param[in] should_abort whether to abort on an unknown error
|
|
|
|
@param[in] on_error_silent whether to suppress reports of non-fatal errors
|
2016-08-12 10:17:45 +02:00
|
|
|
@return true if we should retry the operation */
|
2016-09-06 08:43:16 +02:00
|
|
|
static MY_ATTRIBUTE((warn_unused_result))
|
2016-08-12 10:17:45 +02:00
|
|
|
bool
|
|
|
|
os_file_handle_error_cond_exit(
|
|
|
|
const char* name,
|
|
|
|
const char* operation,
|
2016-12-30 07:56:13 +01:00
|
|
|
bool should_abort,
|
2016-08-12 10:17:45 +02:00
|
|
|
bool on_error_silent)
|
|
|
|
{
|
|
|
|
ulint err;
|
2015-06-16 10:57:05 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
err = os_file_get_last_error_low(false, on_error_silent);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
switch (err) {
|
|
|
|
case OS_FILE_DISK_FULL:
|
|
|
|
/* We only print a warning about disk full once */
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (os_has_said_disk_full) {
|
2014-05-05 18:20:28 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(false);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Disk full error is reported irrespective of the
|
|
|
|
on_error_silent setting. */
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (name) {
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ib::error()
|
|
|
|
<< "Encountered a problem with file '"
|
|
|
|
<< name << "'";
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ib::error()
|
|
|
|
<< "Disk is full. Try to clean the disk to free space.";
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
os_has_said_disk_full = true;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(false);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
case OS_FILE_AIO_RESOURCES_RESERVED:
|
|
|
|
case OS_FILE_AIO_INTERRUPTED:
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(true);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
case OS_FILE_PATH_ERROR:
|
|
|
|
case OS_FILE_ALREADY_EXISTS:
|
|
|
|
case OS_FILE_ACCESS_VIOLATION:
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(false);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
case OS_FILE_SHARING_VIOLATION:
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
os_thread_sleep(10000000); /* 10 sec */
|
|
|
|
return(true);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
case OS_FILE_OPERATION_ABORTED:
|
|
|
|
case OS_FILE_INSUFFICIENT_RESOURCE:
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
os_thread_sleep(100000); /* 100 ms */
|
|
|
|
return(true);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
default:
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* If it is an operation that can crash on error then it
|
|
|
|
is better to ignore on_error_silent and print an error message
|
|
|
|
to the log. */
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-12-30 07:56:13 +01:00
|
|
|
if (should_abort || !on_error_silent) {
|
2016-08-12 10:17:45 +02:00
|
|
|
ib::error() << "File "
|
|
|
|
<< (name != NULL ? name : "(unknown)")
|
|
|
|
<< ": '" << operation << "'"
|
|
|
|
" returned OS error " << err << "."
|
2016-12-30 07:56:13 +01:00
|
|
|
<< (should_abort
|
2016-08-12 10:17:45 +02:00
|
|
|
? " Cannot continue operation" : "");
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-12-30 07:56:13 +01:00
|
|
|
if (should_abort) {
|
|
|
|
abort();
|
2016-08-12 10:17:45 +02:00
|
|
|
}
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(false);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Does error handling when a file operation fails.
|
|
|
|
@param[in] name name of a file or NULL
|
|
|
|
@param[in] operation operation name that failed
|
|
|
|
@return true if we should retry the operation */
|
|
|
|
static
|
|
|
|
bool
|
|
|
|
os_file_handle_error(
|
|
|
|
const char* name,
|
|
|
|
const char* operation)
|
|
|
|
{
|
|
|
|
/* Exit in case of unknown error */
|
|
|
|
return(os_file_handle_error_cond_exit(name, operation, true, false));
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Does error handling when a file operation fails.
|
|
|
|
@param[in] name name of a file or NULL
|
|
|
|
@param[in] operation operation name that failed
|
|
|
|
@param[in] on_error_silent if true then don't print any message to the log.
|
|
|
|
@return true if we should retry the operation */
|
|
|
|
static
|
|
|
|
bool
|
|
|
|
os_file_handle_error_no_exit(
|
|
|
|
const char* name,
|
|
|
|
const char* operation,
|
|
|
|
bool on_error_silent)
|
|
|
|
{
|
|
|
|
/* Don't exit in case of unknown error */
|
|
|
|
return(os_file_handle_error_cond_exit(
|
|
|
|
name, operation, false, on_error_silent));
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Tries to disable OS caching on an opened file descriptor.
|
|
|
|
@param[in] fd file descriptor to alter
|
|
|
|
@param[in] file_name file name, used in the diagnostic message
|
|
|
|
@param[in] name "open" or "create"; used in the diagnostic
|
|
|
|
message */
|
2013-03-25 23:03:13 +01:00
|
|
|
void
|
2016-08-12 10:17:45 +02:00
|
|
|
os_file_set_nocache(
|
2016-09-06 08:43:16 +02:00
|
|
|
os_file_t fd MY_ATTRIBUTE((unused)),
|
|
|
|
const char* file_name MY_ATTRIBUTE((unused)),
|
|
|
|
const char* operation_name MY_ATTRIBUTE((unused)))
|
2013-03-25 23:03:13 +01:00
|
|
|
{
|
2016-08-12 10:17:45 +02:00
|
|
|
/* some versions of Solaris may not have DIRECTIO_ON */
|
|
|
|
#if defined(UNIV_SOLARIS) && defined(DIRECTIO_ON)
|
|
|
|
if (directio(fd, DIRECTIO_ON) == -1) {
|
|
|
|
int errno_save = errno;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ib::error()
|
|
|
|
<< "Failed to set DIRECTIO_ON on file "
|
|
|
|
<< file_name << ": " << operation_name
|
|
|
|
<< strerror(errno_save) << ","
|
|
|
|
" continuing anyway.";
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2016-08-12 10:17:45 +02:00
|
|
|
#elif defined(O_DIRECT)
|
|
|
|
if (fcntl(fd, F_SETFL, O_DIRECT) == -1) {
|
|
|
|
int errno_save = errno;
|
|
|
|
static bool warning_message_printed = false;
|
|
|
|
if (errno_save == EINVAL) {
|
|
|
|
if (!warning_message_printed) {
|
|
|
|
warning_message_printed = true;
|
|
|
|
# ifdef UNIV_LINUX
|
|
|
|
ib::warn()
|
|
|
|
<< "Failed to set O_DIRECT on file"
|
|
|
|
<< file_name << ";" << operation_name
|
|
|
|
<< ": " << strerror(errno_save) << ", "
|
|
|
|
<< "ccontinuing anyway. O_DIRECT is "
|
|
|
|
"known to result in 'Invalid argument' "
|
|
|
|
"on Linux on tmpfs, "
|
|
|
|
"see MySQL Bug#26662.";
|
|
|
|
# else /* UNIV_LINUX */
|
|
|
|
goto short_warning;
|
|
|
|
# endif /* UNIV_LINUX */
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
# ifndef UNIV_LINUX
|
|
|
|
short_warning:
|
|
|
|
# endif
|
|
|
|
ib::warn()
|
|
|
|
<< "Failed to set O_DIRECT on file "
|
|
|
|
<< file_name << "; " << operation_name
|
|
|
|
<< " : " << strerror(errno_save)
|
|
|
|
<< " continuing anyway.";
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2016-08-12 10:17:45 +02:00
|
|
|
#endif /* defined(UNIV_SOLARIS) && defined(DIRECTIO_ON) */
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Write the specified number of zeros to a newly created file.
|
|
|
|
@param[in] name name of the file or path as a null-terminated
|
|
|
|
string
|
|
|
|
@param[in] file handle to a file
|
|
|
|
@param[in] size file size
|
|
|
|
@param[in] read_only Enable read-only checks if true
|
|
|
|
@return true if success */
|
|
|
|
bool
|
|
|
|
os_file_set_size(
|
|
|
|
const char* name,
|
|
|
|
os_file_t file,
|
|
|
|
os_offset_t size,
|
|
|
|
bool read_only)
|
|
|
|
{
|
|
|
|
/* Write up to 1 megabyte at a time. */
|
|
|
|
ulint buf_size = ut_min(
|
|
|
|
static_cast<ulint>(64),
|
|
|
|
static_cast<ulint>(size / UNIV_PAGE_SIZE));
|
|
|
|
|
|
|
|
buf_size *= UNIV_PAGE_SIZE;
|
|
|
|
|
|
|
|
/* Align the buffer for possible raw i/o */
|
|
|
|
byte* buf2;
|
|
|
|
|
|
|
|
buf2 = static_cast<byte*>(ut_malloc_nokey(buf_size + UNIV_PAGE_SIZE));
|
|
|
|
|
|
|
|
byte* buf = static_cast<byte*>(ut_align(buf2, UNIV_PAGE_SIZE));
|
|
|
|
|
|
|
|
/* Write buffer full of zeros */
|
|
|
|
memset(buf, 0, buf_size);
|
|
|
|
|
|
|
|
if (size >= (os_offset_t) 100 << 20) {
|
|
|
|
|
|
|
|
ib::info() << "Progress in MB:";
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
os_offset_t current_size = 0;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
while (current_size < size) {
|
|
|
|
ulint n_bytes;
|
|
|
|
|
|
|
|
if (size - current_size < (os_offset_t) buf_size) {
|
|
|
|
n_bytes = (ulint) (size - current_size);
|
|
|
|
} else {
|
|
|
|
n_bytes = buf_size;
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
dberr_t err;
|
|
|
|
IORequest request(IORequest::WRITE);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
err = os_file_write(
|
|
|
|
request, name, file, buf, current_size, n_bytes);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (err != DB_SUCCESS) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_free(buf2);
|
|
|
|
return(false);
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Print about progress for each 100 MB written */
|
|
|
|
if ((current_size + n_bytes) / (100 << 20)
|
|
|
|
!= current_size / (100 << 20)) {
|
2009-05-25 08:46:10 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
fprintf(stderr, " %lu00",
|
|
|
|
(ulong) ((current_size + n_bytes)
|
|
|
|
/ (100 << 20)));
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
current_size += n_bytes;
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (size >= (os_offset_t) 100 << 20) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
fprintf(stderr, "\n");
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_free(buf2);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(os_file_flush(file));
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Truncates a file to a specified size in bytes.
|
|
|
|
Do nothing if the size to preserve is greater or equal to the current
|
|
|
|
size of the file.
|
|
|
|
@param[in] pathname file path
|
|
|
|
@param[in] file file to be truncated
|
|
|
|
@param[in] size size to preserve in bytes
|
|
|
|
@return true if success */
|
|
|
|
bool
|
|
|
|
os_file_truncate(
|
|
|
|
const char* pathname,
|
|
|
|
os_file_t file,
|
|
|
|
os_offset_t size)
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Do nothing if the size preserved is larger than or equal to the
|
|
|
|
current size of file */
|
|
|
|
os_offset_t size_bytes = os_file_get_size(file);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (size >= size_bytes) {
|
|
|
|
return(true);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#ifdef _WIN32
|
|
|
|
return(os_file_truncate_win32(pathname, file, size));
|
|
|
|
#else /* _WIN32 */
|
|
|
|
return(os_file_truncate_posix(pathname, file, size));
|
|
|
|
#endif /* _WIN32 */
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** NOTE! Use the corresponding macro os_file_read(), not directly this
|
|
|
|
function!
|
|
|
|
Requests a synchronous positioned read operation.
|
|
|
|
@return DB_SUCCESS if request was successful, DB_IO_ERROR on failure
|
|
|
|
@param[in] type IO flags
|
|
|
|
@param[in] file handle to an open file
|
|
|
|
@param[out] buf buffer where to read
|
|
|
|
@param[in] offset file offset from the start where to read
|
|
|
|
@param[in] n number of bytes to read, starting from offset
|
|
|
|
@return DB_SUCCESS or error code */
|
|
|
|
dberr_t
|
|
|
|
os_file_read_func(
|
|
|
|
IORequest& type,
|
|
|
|
os_file_t file,
|
|
|
|
void* buf,
|
|
|
|
os_offset_t offset,
|
|
|
|
ulint n)
|
|
|
|
{
|
|
|
|
ut_ad(type.is_read());
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(os_file_read_page(type, file, buf, offset, n, NULL, true));
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** NOTE! Use the corresponding macro os_file_read_no_error_handling(),
|
|
|
|
not directly this function!
|
|
|
|
Requests a synchronous positioned read operation.
|
|
|
|
@return DB_SUCCESS if request was successful, DB_IO_ERROR on failure
|
|
|
|
@param[in] type IO flags
|
|
|
|
@param[in] file handle to an open file
|
|
|
|
@param[out] buf buffer where to read
|
|
|
|
@param[in] offset file offset from the start where to read
|
|
|
|
@param[in] n number of bytes to read, starting from offset
|
|
|
|
@param[out] o number of bytes actually read
|
|
|
|
@return DB_SUCCESS or error code */
|
|
|
|
dberr_t
|
|
|
|
os_file_read_no_error_handling_func(
|
|
|
|
IORequest& type,
|
|
|
|
os_file_t file,
|
|
|
|
void* buf,
|
|
|
|
os_offset_t offset,
|
|
|
|
ulint n,
|
|
|
|
ulint* o)
|
|
|
|
{
|
|
|
|
ut_ad(type.is_read());
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(os_file_read_page(type, file, buf, offset, n, o, false));
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
/** NOTE! Use the corresponding macro os_file_write(), not directly
|
|
|
|
Requests a synchronous write operation.
|
|
|
|
@param[in] type IO flags
|
|
|
|
@param[in] file handle to an open file
|
|
|
|
@param[out] buf buffer from which to write
|
|
|
|
@param[in] offset file offset from the start where to read
|
|
|
|
@param[in] n number of bytes to read, starting from offset
|
|
|
|
@return DB_SUCCESS if request was successful, false if fail */
|
|
|
|
dberr_t
|
|
|
|
os_file_write_func(
|
|
|
|
IORequest& type,
|
|
|
|
const char* name,
|
|
|
|
os_file_t file,
|
|
|
|
const void* buf,
|
|
|
|
os_offset_t offset,
|
|
|
|
ulint n)
|
|
|
|
{
|
|
|
|
ut_ad(type.validate());
|
|
|
|
ut_ad(type.is_write());
|
|
|
|
|
|
|
|
const byte* ptr = reinterpret_cast<const byte*>(buf);
|
|
|
|
|
|
|
|
return(os_file_write_page(type, name, file, ptr, offset, n));
|
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Check the existence and type of the given file.
|
|
|
|
@param[in] path path name of file
|
|
|
|
@param[out] exists true if the file exists
|
|
|
|
@param[out] type Type of the file, if it exists
|
|
|
|
@return true if call succeeded */
|
|
|
|
bool
|
|
|
|
os_file_status(
|
|
|
|
const char* path,
|
|
|
|
bool* exists,
|
|
|
|
os_file_type_t* type)
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
2016-08-12 10:17:45 +02:00
|
|
|
#ifdef _WIN32
|
|
|
|
return(os_file_status_win32(path, exists, type));
|
|
|
|
#else
|
|
|
|
return(os_file_status_posix(path, exists, type));
|
|
|
|
#endif /* _WIN32 */
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
/** Free storage space associated with a section of the file.
|
|
|
|
@param[in] fh Open file handle
|
|
|
|
@param[in] off Starting offset (SEEK_SET)
|
|
|
|
@param[in] len Size of the hole
|
|
|
|
@return DB_SUCCESS or error code */
|
|
|
|
dberr_t
|
|
|
|
os_file_punch_hole(
|
|
|
|
os_file_t fh,
|
|
|
|
os_offset_t off,
|
|
|
|
os_offset_t len)
|
|
|
|
{
|
|
|
|
dberr_t err;
|
|
|
|
|
|
|
|
#ifdef _WIN32
|
|
|
|
err = os_file_punch_hole_win32(fh, off, len);
|
|
|
|
#else
|
|
|
|
err = os_file_punch_hole_posix(fh, off, len);
|
|
|
|
#endif /* _WIN32 */
|
|
|
|
|
|
|
|
return (err);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Free storage space associated with a section of the file.
|
|
|
|
@param[in] fh Open file handle
|
|
|
|
@param[in] off Starting offset (SEEK_SET)
|
|
|
|
@param[in] len Size of the hole
|
|
|
|
@return DB_SUCCESS or error code */
|
|
|
|
dberr_t
|
|
|
|
IORequest::punch_hole(
|
|
|
|
os_file_t fh,
|
|
|
|
os_offset_t off,
|
|
|
|
os_offset_t len)
|
|
|
|
{
|
|
|
|
/* In this debugging mode, we act as if punch hole is supported,
|
|
|
|
and then skip any calls to actually punch a hole here.
|
|
|
|
In this way, Transparent Page Compression is still being tested. */
|
|
|
|
DBUG_EXECUTE_IF("ignore_punch_hole",
|
|
|
|
return(DB_SUCCESS);
|
|
|
|
);
|
|
|
|
|
2017-01-25 09:04:14 +01:00
|
|
|
os_offset_t trim_len = static_cast<os_offset_t>(get_trim_length(len));
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
|
|
|
|
if (trim_len == 0) {
|
|
|
|
return(DB_SUCCESS);
|
|
|
|
}
|
|
|
|
|
|
|
|
off += len;
|
|
|
|
|
|
|
|
/* Check does file system support punching holes for this
|
|
|
|
tablespace. */
|
|
|
|
if (!should_punch_hole() || !srv_use_trim) {
|
|
|
|
return DB_IO_NO_PUNCH_HOLE;
|
|
|
|
}
|
|
|
|
|
2017-01-25 09:04:14 +01:00
|
|
|
dberr_t err = os_file_punch_hole(fh, off, trim_len);
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
|
|
|
|
if (err == DB_SUCCESS) {
|
|
|
|
srv_stats.page_compressed_trim_op.inc();
|
|
|
|
} else {
|
|
|
|
/* If punch hole is not supported,
|
|
|
|
set space so that it is not used. */
|
|
|
|
if (err == DB_IO_NO_PUNCH_HOLE) {
|
|
|
|
space_no_punch_hole();
|
|
|
|
err = DB_SUCCESS;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return (err);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Check if the file system supports sparse files.
|
|
|
|
|
|
|
|
Warning: On POSIX systems we try and punch a hole from offset 0 to
|
|
|
|
the system configured page size. This should only be called on an empty
|
|
|
|
file.
|
|
|
|
|
|
|
|
Note: On Windows we use the name and on Unices we use the file handle.
|
|
|
|
|
|
|
|
@param[in] name File name
|
|
|
|
@param[in] fh File handle for the file - if opened
|
|
|
|
@return true if the file system supports sparse files */
|
|
|
|
bool
|
|
|
|
os_is_sparse_file_supported(const char* path, os_file_t fh)
|
|
|
|
{
|
|
|
|
/* In this debugging mode, we act as if punch hole is supported,
|
|
|
|
then we skip any calls to actually punch a hole. In this way,
|
|
|
|
Transparent Page Compression is still being tested. */
|
|
|
|
DBUG_EXECUTE_IF("ignore_punch_hole",
|
|
|
|
return(true);
|
|
|
|
);
|
|
|
|
|
|
|
|
#ifdef _WIN32
|
|
|
|
return(os_is_sparse_file_supported_win32(path));
|
|
|
|
#else
|
|
|
|
dberr_t err;
|
|
|
|
|
|
|
|
/* We don't know the FS block size, use the sector size. The FS
|
|
|
|
will do the magic. */
|
|
|
|
err = os_file_punch_hole_posix(fh, 0, UNIV_PAGE_SIZE);
|
|
|
|
|
|
|
|
return(err == DB_SUCCESS);
|
|
|
|
#endif /* _WIN32 */
|
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** This function returns information about the specified file
|
|
|
|
@param[in] path pathname of the file
|
|
|
|
@param[out] stat_info information of a file in a directory
|
|
|
|
@param[in] check_rw_perm for testing whether the file can be opened
|
|
|
|
in RW mode
|
|
|
|
@param[in] read_only true if file is opened in read-only mode
|
|
|
|
@return DB_SUCCESS if all OK */
|
|
|
|
dberr_t
|
|
|
|
os_file_get_status(
|
|
|
|
const char* path,
|
|
|
|
os_file_stat_t* stat_info,
|
|
|
|
bool check_rw_perm,
|
|
|
|
bool read_only)
|
|
|
|
{
|
|
|
|
dberr_t ret;
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#ifdef _WIN32
|
|
|
|
struct _stat64 info;
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ret = os_file_get_status_win32(
|
|
|
|
path, stat_info, &info, check_rw_perm, read_only);
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#else
|
|
|
|
struct stat info;
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ret = os_file_get_status_posix(
|
|
|
|
path, stat_info, &info, check_rw_perm, read_only);
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#endif /* _WIN32 */
|
|
|
|
|
|
|
|
if (ret == DB_SUCCESS) {
|
|
|
|
stat_info->ctime = info.st_ctime;
|
|
|
|
stat_info->atime = info.st_atime;
|
|
|
|
stat_info->mtime = info.st_mtime;
|
|
|
|
stat_info->size = info.st_size;
|
2009-01-13 19:20:49 +01:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(ret);
|
2009-01-13 19:20:49 +01:00
|
|
|
}
|
2012-01-19 15:10:30 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/**
|
|
|
|
Waits for an AIO operation to complete. This function is used to wait the
|
|
|
|
for completed requests. The aio array of pending requests is divided
|
|
|
|
into segments. The thread specifies which segment or slot it wants to wait
|
|
|
|
for. NOTE: this function will also take care of freeing the aio slot,
|
|
|
|
therefore no other thread is allowed to do the freeing!
|
|
|
|
@param[in] segment The number of the segment in the aio arrays to
|
|
|
|
wait for; segment 0 is the ibuf I/O thread,
|
|
|
|
segment 1 the log I/O thread, then follow the
|
|
|
|
non-ibuf read threads, and as the last are the
|
|
|
|
non-ibuf write threads; if this is
|
|
|
|
ULINT_UNDEFINED, then it means that sync AIO
|
|
|
|
is used, and this parameter is ignored
|
|
|
|
@param[out] m1 the messages passed with the AIO request; note
|
|
|
|
that also in the case where the AIO operation
|
|
|
|
failed, these output parameters are valid and
|
|
|
|
can be used to restart the operation,
|
|
|
|
for example
|
|
|
|
@param[out] m2 callback message
|
|
|
|
@param[out] type OS_FILE_WRITE or ..._READ
|
|
|
|
@return DB_SUCCESS or error code */
|
|
|
|
dberr_t
|
|
|
|
os_aio_handler(
|
|
|
|
ulint segment,
|
|
|
|
fil_node_t** m1,
|
|
|
|
void** m2,
|
|
|
|
IORequest* request)
|
2012-01-19 15:10:30 +01:00
|
|
|
{
|
2016-08-12 10:17:45 +02:00
|
|
|
dberr_t err;
|
2012-01-19 15:10:30 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (srv_use_native_aio) {
|
|
|
|
srv_set_io_thread_op_info(segment, "native aio handle");
|
2012-01-19 15:10:30 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#ifdef WIN_ASYNC_IO
|
2012-01-19 15:10:30 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
err = os_aio_windows_handler(segment, 0, m1, m2, request);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#elif defined(LINUX_NATIVE_AIO)
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
err = os_aio_linux_handler(segment, m1, m2, request);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#else
|
|
|
|
ut_error;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
err = DB_ERROR; /* Eliminate compiler warning */
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#endif /* WIN_ASYNC_IO */
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
} else {
|
|
|
|
srv_set_io_thread_op_info(segment, "simulated aio handle");
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
err = os_aio_simulated_handler(segment, m1, m2, request);
|
2012-01-19 15:10:30 +01:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(err);
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Constructor
|
|
|
|
@param[in] id The latch ID
|
|
|
|
@param[in] n Number of AIO slots
|
|
|
|
@param[in] segments Number of segments */
|
|
|
|
AIO::AIO(
|
|
|
|
latch_id_t id,
|
|
|
|
ulint n,
|
|
|
|
ulint segments)
|
|
|
|
:
|
|
|
|
m_slots(n),
|
|
|
|
m_n_segments(segments),
|
|
|
|
m_n_reserved()
|
|
|
|
# ifdef LINUX_NATIVE_AIO
|
|
|
|
,m_aio_ctx(),
|
|
|
|
m_events(m_slots.size())
|
|
|
|
# endif /* LINUX_NATIVE_AIO */
|
|
|
|
{
|
|
|
|
ut_a(n > 0);
|
|
|
|
ut_a(m_n_segments > 0);
|
2012-01-19 15:10:30 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
mutex_create(id, &m_mutex);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
m_not_full = os_event_create("aio_not_full");
|
|
|
|
m_is_empty = os_event_create("aio_is_empty");
|
2012-01-19 15:10:30 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
memset(&m_slots[0], 0x0, sizeof(m_slots[0]) * m_slots.size());
|
|
|
|
#ifdef LINUX_NATIVE_AIO
|
|
|
|
memset(&m_events[0], 0x0, sizeof(m_events[0]) * m_events.size());
|
|
|
|
#endif /* LINUX_NATIVE_AIO */
|
2012-01-19 15:10:30 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
os_event_set(m_is_empty);
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Initialise the slots */
|
|
|
|
dberr_t
|
|
|
|
AIO::init_slots()
|
|
|
|
{
|
|
|
|
for (ulint i = 0; i < m_slots.size(); ++i) {
|
|
|
|
Slot& slot = m_slots[i];
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
slot.pos = static_cast<uint16_t>(i);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
slot.is_reserved = false;
|
2012-01-19 15:10:30 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#ifdef WIN_ASYNC_IO
|
2012-01-19 15:10:30 +01:00
|
|
|
|
2016-09-19 14:31:20 +02:00
|
|
|
slot.array = this;
|
2009-01-13 19:20:49 +01:00
|
|
|
|
|
|
|
#elif defined(LINUX_NATIVE_AIO)
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
slot.ret = 0;
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
slot.n_bytes = 0;
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
memset(&slot.control, 0x0, sizeof(slot.control));
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#endif /* WIN_ASYNC_IO */
|
2009-01-13 19:20:49 +01:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(DB_SUCCESS);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef LINUX_NATIVE_AIO
|
|
|
|
/** Initialise the Linux Native AIO interface */
|
|
|
|
dberr_t
|
|
|
|
AIO::init_linux_native_aio()
|
|
|
|
{
|
2009-01-13 19:20:49 +01:00
|
|
|
/* Initialize the io_context array. One io_context
|
|
|
|
per segment in the array. */
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_a(m_aio_ctx == NULL);
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
m_aio_ctx = static_cast<io_context**>(
|
|
|
|
ut_zalloc_nokey(m_n_segments * sizeof(*m_aio_ctx)));
|
|
|
|
|
|
|
|
if (m_aio_ctx == NULL) {
|
|
|
|
return(DB_OUT_OF_MEMORY);
|
|
|
|
}
|
|
|
|
|
|
|
|
io_context** ctx = m_aio_ctx;
|
|
|
|
ulint max_events = slots_per_segment();
|
|
|
|
|
|
|
|
for (ulint i = 0; i < m_n_segments; ++i, ++ctx) {
|
|
|
|
|
|
|
|
if (!linux_create_io_ctx(max_events, ctx)) {
|
2009-01-13 19:20:49 +01:00
|
|
|
/* If something bad happened during aio setup
|
2016-09-29 15:25:45 +02:00
|
|
|
we disable linux native aio.
|
|
|
|
The disadvantage will be a small memory leak
|
|
|
|
at shutdown but that's ok compared to a crash
|
|
|
|
or a not working server.
|
|
|
|
This frequently happens when running the test suite
|
|
|
|
with many threads on a system with low fs.aio-max-nr!
|
|
|
|
*/
|
|
|
|
|
|
|
|
ib::warn()
|
|
|
|
<< "Warning: Linux Native AIO disabled "
|
|
|
|
<< "because _linux_create_io_ctx() "
|
|
|
|
<< "failed. To get rid of this warning you can "
|
|
|
|
<< "try increasing system "
|
|
|
|
<< "fs.aio-max-nr to 1048576 or larger or "
|
|
|
|
<< "setting innodb_use_native_aio = 0 in my.cnf";
|
|
|
|
ut_free(m_aio_ctx);
|
|
|
|
m_aio_ctx = 0;
|
|
|
|
srv_use_native_aio = FALSE;
|
|
|
|
return(DB_SUCCESS);
|
2009-01-13 19:20:49 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(DB_SUCCESS);
|
|
|
|
}
|
|
|
|
#endif /* LINUX_NATIVE_AIO */
|
|
|
|
|
|
|
|
/** Initialise the array */
|
|
|
|
dberr_t
|
|
|
|
AIO::init()
|
|
|
|
{
|
|
|
|
ut_a(!m_slots.empty());
|
|
|
|
|
|
|
|
|
|
|
|
if (srv_use_native_aio) {
|
|
|
|
#ifdef LINUX_NATIVE_AIO
|
|
|
|
dberr_t err = init_linux_native_aio();
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (err != DB_SUCCESS) {
|
|
|
|
return(err);
|
|
|
|
}
|
2009-01-13 19:20:49 +01:00
|
|
|
|
|
|
|
#endif /* LINUX_NATIVE_AIO */
|
2016-08-12 10:17:45 +02:00
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(init_slots());
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Creates an aio wait array. Note that we return NULL in case of failure.
|
|
|
|
We don't care about freeing memory here because we assume that a
|
|
|
|
failure will result in server refusing to start up.
|
|
|
|
@param[in] id Latch ID
|
|
|
|
@param[in] n maximum number of pending AIO operations
|
|
|
|
allowed; n must be divisible by m_n_segments
|
|
|
|
@param[in] n_segments number of segments in the AIO array
|
|
|
|
@return own: AIO array, NULL on failure */
|
|
|
|
AIO*
|
|
|
|
AIO::create(
|
|
|
|
latch_id_t id,
|
|
|
|
ulint n,
|
|
|
|
ulint n_segments)
|
|
|
|
{
|
|
|
|
if ((n % n_segments)) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ib::error()
|
|
|
|
<< "Maximum number of AIO operations must be "
|
|
|
|
<< "divisible by number of segments";
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(NULL);
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
AIO* array = UT_NEW_NOKEY(AIO(id, n, n_segments));
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (array != NULL && array->init() != DB_SUCCESS) {
|
|
|
|
|
|
|
|
UT_DELETE(array);
|
|
|
|
|
|
|
|
array = NULL;
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2005-10-27 09:29:40 +02:00
|
|
|
return(array);
|
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** AIO destructor */
|
|
|
|
AIO::~AIO()
|
branches/innodb+: Merge revisions r5971:6130 from branches/zip.
------------------------------------------------------------------------
r5971 | marko | 2009-09-23 23:03:51 +1000 (Wed, 23 Sep 2009) | 2 lines
branches/zip: os_file_pwrite(): Make the code compile in InnoDB Hot Backup
when the pwrite system call is not available.
------------------------------------------------------------------------
r5972 | marko | 2009-09-24 05:44:52 +1000 (Thu, 24 Sep 2009) | 5 lines
branches/zip: fil_node_open_file(): In InnoDB Hot Backup,
determine the page size of single-file tablespaces before computing
the file node size. Otherwise, the space->size of compressed tablespaces
would be computed with UNIV_PAGE_SIZE instead of key_block_size.
This should fix Issue #313.
------------------------------------------------------------------------
r5973 | marko | 2009-09-24 05:53:21 +1000 (Thu, 24 Sep 2009) | 2 lines
branches/zip: recv_add_to_hash_table():
Simplify obfuscated pointer arithmetics.
------------------------------------------------------------------------
r5978 | marko | 2009-09-24 17:47:56 +1000 (Thu, 24 Sep 2009) | 1 line
branches/zip: Fix warnings and errors when UNIV_HOTBACKUP is defined.
------------------------------------------------------------------------
r5979 | marko | 2009-09-24 20:16:10 +1000 (Thu, 24 Sep 2009) | 4 lines
branches/zip: ha_innodb.cc: Define MYSQL_PLUGIN_IMPORT when necessary.
This preprocessor symbol has been recently introduced in MySQL 5.1.
The InnoDB Plugin should remain source compatible with MySQL 5.1.24
and later.
------------------------------------------------------------------------
r5988 | calvin | 2009-09-26 05:14:43 +1000 (Sat, 26 Sep 2009) | 8 lines
branches/zip: fix bug#47055 unconditional exit(1) on ERROR_WORKING_SET_QUOTA
1453 (0x5AD) for InnoDB backend
When error ERROR_WORKING_SET_QUOTA or ERROR_NO_SYSTEM_RESOURCES
occurs, yields for 100ms and retries the operation.
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r5992 | vasil | 2009-09-28 17:10:29 +1000 (Mon, 28 Sep 2009) | 4 lines
branches/zip:
Add ChangeLog entry for c5988.
------------------------------------------------------------------------
r5994 | marko | 2009-09-28 18:33:59 +1000 (Mon, 28 Sep 2009) | 17 lines
branches/zip: Try to prevent the reuse of tablespace identifiers after
InnoDB has crashed during table creation. Also, refuse to start if
files with duplicate tablespace identifiers are encountered.
fil_node_create(): Update fil_system->max_assigned_id. This should
prevent the reuse of a space->id when InnoDB does a full crash
recovery and invokes fil_load_single_table_tablespaces(). Normally,
fil_system->max_assigned_id is initialized from
SELECT MAX(ID) FROM SYS_TABLES.
fil_open_single_table_tablespace(): Return FALSE when
fil_space_create() fails.
fil_load_single_table_tablespace(): Exit if fil_space_create() fails
and innodb_force_recovery=0.
rb://173 approved by Heikki Tuuri. This addresses Issue #335.
------------------------------------------------------------------------
r5995 | marko | 2009-09-28 18:52:25 +1000 (Mon, 28 Sep 2009) | 17 lines
branches/zip: Do not write to PAGE_INDEX_ID after page creation,
not even when restoring an uncompressed page after a compression failure.
btr_page_reorganize_low(): On compression failure, do not restore
those page header fields that should not be affected by the
reorganization. Instead, compare the fields.
page_zip_decompress(): Add the parameter ibool all, for copying all
page header fields. Pass the parameter all=TRUE on block read
completion, redo log application, and page_zip_validate(); pass
all=FALSE in all other cases.
page_zip_reorganize(): Do not restore the uncompressed page on
failure. It will be restored (to pre-modification state) by the
caller anyway.
rb://167, Issue #346
------------------------------------------------------------------------
r5996 | marko | 2009-09-28 22:46:02 +1000 (Mon, 28 Sep 2009) | 4 lines
branches/zip: Address Issue #350 in comments.
lock_rec_queue_validate(), lock_rec_queue_validate(): Note that
this debug code may violate the latching order and cause deadlocks.
------------------------------------------------------------------------
r5997 | marko | 2009-09-28 23:03:58 +1000 (Mon, 28 Sep 2009) | 12 lines
branches/zip: Remove an assertion failure when the InnoDB data dictionary
is inconsistent with the MySQL .frm file.
ha_innobase::index_read(): When the index cannot be found,
return an error.
ha_innobase::change_active_index(): When prebuilt->index == NULL,
set also prebuilt->index_usable = FALSE. This is not needed for
correctness, because prebuilt->index_usable is only checked by
row_search_for_mysql(), which requires prebuilt->index != NULL.
This addresses Issue #349. Approved by Heikki Tuuri over IM.
------------------------------------------------------------------------
r6005 | vasil | 2009-09-29 18:09:52 +1000 (Tue, 29 Sep 2009) | 4 lines
branches/zip:
ChangeLog: wrap around 78th column, not earlier.
------------------------------------------------------------------------
r6006 | vasil | 2009-09-29 20:15:25 +1000 (Tue, 29 Sep 2009) | 4 lines
branches/zip:
Add ChangeLog entry for the release of 1.0.4.
------------------------------------------------------------------------
r6007 | vasil | 2009-09-29 23:19:59 +1000 (Tue, 29 Sep 2009) | 6 lines
branches/zip:
Fix the year, should be 2009.
Pointed by: Calvin
------------------------------------------------------------------------
r6026 | marko | 2009-09-30 17:18:24 +1000 (Wed, 30 Sep 2009) | 1 line
branches/zip: Add some debug assertions for checking FSEG_MAGIC_N.
------------------------------------------------------------------------
r6028 | marko | 2009-09-30 23:55:23 +1000 (Wed, 30 Sep 2009) | 3 lines
branches/zip: recv_no_log_write: New debug flag for tracking down
Mantis Issue #347. No modifications should be made to the database
while recv_apply_hashed_log_recs() is about to complete.
------------------------------------------------------------------------
r6029 | calvin | 2009-10-01 06:32:02 +1000 (Thu, 01 Oct 2009) | 4 lines
branches/zip: non-functional changes
Fix typo.
------------------------------------------------------------------------
r6031 | marko | 2009-10-01 21:24:33 +1000 (Thu, 01 Oct 2009) | 49 lines
branches/zip: Clean up after a crash during DROP INDEX.
When InnoDB crashes while dropping an index, ensure that
the index will be completely dropped during crash recovery.
row_merge_drop_index(): Before dropping an index, rename the index to
start with TEMP_INDEX_PREFIX_STR and commit the change, so that
row_merge_drop_temp_indexes() will drop the index after crash
recovery if the server crashes while dropping the index.
fseg_inode_try_get(): New function, forked from fseg_inode_get().
Return NULL if the file segment index node is free.
fseg_inode_get(): Assert that the file segment index node is not free.
fseg_free_step(): If the file segment index node is already free,
print a diagnostic message and return TRUE.
fsp_free_seg_inode(): Write a nonzero number to FSEG_MAGIC_N, so that
allocated-and-freed file segment index nodes can be better
distinguished from uninitialized ones.
This is rb://174, addressing Issue #348.
Tested by restarting mysqld upon the completion of the added
log_write_up_to() invocation below, during DROP INDEX. The index was
dropped after crash recovery, and re-issuing the DROP INDEX did not
crash the server.
Index: btr/btr0btr.c
===================================================================
--- btr/btr0btr.c (revision 6026)
+++ btr/btr0btr.c (working copy)
@@ -42,6 +42,7 @@ Created 6/2/1994 Heikki Tuuri
#include "ibuf0ibuf.h"
#include "trx0trx.h"
+#include "log0log.h"
/*
Latching strategy of the InnoDB B-tree
--------------------------------------
@@ -873,6 +874,8 @@ leaf_loop:
goto leaf_loop;
}
+
+ log_write_up_to(mtr.end_lsn, LOG_WAIT_ALL_GROUPS, TRUE);
top_loop:
mtr_start(&mtr);
------------------------------------------------------------------------
r6033 | calvin | 2009-10-02 06:19:46 +1000 (Fri, 02 Oct 2009) | 4 lines
branches/zip: fix a typo in error message
Reported as bug#47763.
------------------------------------------------------------------------
r6043 | inaam | 2009-10-06 01:45:35 +1100 (Tue, 06 Oct 2009) | 12 lines
branches/zip rb://176
Do not invalidate buffer pool while an LRU batch is active. Added
code to buf_pool_invalidate() to wait for the running batches to finish.
This patch also resets the state of buf_pool struct at invalidation. This
addresses the concern where buf_pool->freed_page_clock becomes non-zero
because we read in a system tablespace page for file format info at
startup.
Approved by: Marko
------------------------------------------------------------------------
r6044 | pekka | 2009-10-07 01:44:54 +1100 (Wed, 07 Oct 2009) | 5 lines
branches/zip:
Add os_file_is_same() function for Hot Backup (inside ifdef UNIV_HOTBACKUP).
This is part of the fix for Issue #186.
Note! The Windows implementation is incomplete.
------------------------------------------------------------------------
r6046 | pekka | 2009-10-08 20:24:56 +1100 (Thu, 08 Oct 2009) | 3 lines
branches/zip: Revert r6044 which added os_file_is_same() function
(issue#186). This functionality is moved to Hot Backup source tree.
------------------------------------------------------------------------
r6048 | vasil | 2009-10-09 16:42:55 +1100 (Fri, 09 Oct 2009) | 16 lines
branches/zip:
When scanning a directory readdir() is called and stat() after it,
if a file is deleted between the two calls stat will fail and the
whole precedure will fail. Change this behavior to continue with the
next entry if stat() fails because of nonexistent file. This is
transparent change as it will make it look as if the file was deleted
before the readdir() call.
This change is needed in order to fix
https://svn.innodb.com/mantis/view.php?id=174
in which we need to abort if os_file_readdir_next_file()
encounters "real" errors.
Approved by: Marko, Pekka (rb://177)
------------------------------------------------------------------------
r6049 | vasil | 2009-10-10 03:05:26 +1100 (Sat, 10 Oct 2009) | 7 lines
branches/zip:
Fix compilation warning in Hot Backup:
innodb/fil/fil0fil.c: In function 'fil_load_single_table_tablespace':
innodb/fil/fil0fil.c:3253: warning: format '%lld' expects type 'long long int', but argument 6 has type 'ib_int64_t'
------------------------------------------------------------------------
r6064 | calvin | 2009-10-14 02:23:35 +1100 (Wed, 14 Oct 2009) | 4 lines
branches/zip: non-functional changes
Changes from MySQL to fix build issue.
------------------------------------------------------------------------
r6065 | inaam | 2009-10-14 04:43:13 +1100 (Wed, 14 Oct 2009) | 7 lines
branches/zip rb://182
Call fsync() on datafiles after a batch of pages is written to disk
even when skip_innodb_doublewrite is set.
Approved by: Heikki
------------------------------------------------------------------------
r6080 | sunny | 2009-10-15 09:29:01 +1100 (Thu, 15 Oct 2009) | 3 lines
branches/zip: Change page_mem_alloc_free() to inline.
Fix Bug #47058 - Failure to compile innodb_plugin on solaris 10u7 + spro cc/CC 5.10
------------------------------------------------------------------------
r6084 | vasil | 2009-10-15 16:21:17 +1100 (Thu, 15 Oct 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r6080.
------------------------------------------------------------------------
r6095 | vasil | 2009-10-20 00:04:59 +1100 (Tue, 20 Oct 2009) | 7 lines
branches/zip:
Fix Bug#47808 innodb_information_schema.test fails when run under valgrind
by using the wait_until_rows_count macro that loops until the number of
rows becomes 14 instead of sleep 0.1, which is obviously very fragile.
------------------------------------------------------------------------
r6096 | vasil | 2009-10-20 00:06:09 +1100 (Tue, 20 Oct 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r6095.
------------------------------------------------------------------------
r6099 | jyang | 2009-10-22 13:58:39 +1100 (Thu, 22 Oct 2009) | 7 lines
branches/zip: Port bug #46000 related changes from 5.1 to zip
branch. Due to different code path for creating index in zip
branch comparing to 5.1), the index reserved name check function
is extended to be used in ha_innobase::add_index().
rb://190 Approved by: Marko
------------------------------------------------------------------------
r6100 | jyang | 2009-10-22 14:51:07 +1100 (Thu, 22 Oct 2009) | 6 lines
branches/zip: As a request from mysql, WARN_LEVEL_ERROR cannot
be used for push_warning_* call any more. Switch to
WARN_LEVEL_WARN. Bug #47233.
rb://172 approved by Sunny Bains and Marko.
------------------------------------------------------------------------
r6101 | jyang | 2009-10-23 19:45:50 +1100 (Fri, 23 Oct 2009) | 7 lines
branches/zip: Update test result with the WARN_LEVEL_ERROR
to WARN_LEVEL_WARN change. This is the same result as
submitted in rb://172 review, which approved by Sunny Bains
and Marko.
------------------------------------------------------------------------
r6102 | marko | 2009-10-26 18:32:23 +1100 (Mon, 26 Oct 2009) | 1 line
branches/zip: row_prebuilt_struct::prebuilts: Unused field, remove.
------------------------------------------------------------------------
r6103 | marko | 2009-10-27 00:46:18 +1100 (Tue, 27 Oct 2009) | 4 lines
branches/zip: row_ins_alloc_sys_fields(): Zero out the system columns
DB_TRX_ID, DB_ROLL_PTR and DB_ROW_ID, in order to avoid harmless
Valgrind warnings about uninitialized data. (The warnings were
harmless, because the fields would be initialized at a later stage.)
------------------------------------------------------------------------
r6105 | calvin | 2009-10-28 09:05:52 +1100 (Wed, 28 Oct 2009) | 6 lines
branches/zip: backport r3848 from 6.0 branch
----
branches/6.0: innobase_start_or_create_for_mysql(): Make the 10 MB
minimum tablespace limit independent of UNIV_PAGE_SIZE. (Bug #41490)
------------------------------------------------------------------------
r6107 | marko | 2009-10-29 01:10:34 +1100 (Thu, 29 Oct 2009) | 5 lines
branches/zip: buf_page_set_old(): Improve UNIV_LRU_DEBUG diagnostics
in order to catch the buf_pool->LRU_old corruption reported in Issue #381.
buf_LRU_old_init(): Set the property from the tail towards the front
of the buf_pool->LRU list, in order not to trip the debug check.
------------------------------------------------------------------------
r6108 | calvin | 2009-10-29 16:58:04 +1100 (Thu, 29 Oct 2009) | 5 lines
branches/zip: close file handle when building with UNIV_HOTBACKUP
The change does not affect regular InnoDB engine. Confirmed by
Marko.
------------------------------------------------------------------------
r6109 | jyang | 2009-10-29 19:37:32 +1100 (Thu, 29 Oct 2009) | 7 lines
branches/zip: In os_mem_alloc_large(), if we fail to attach
the shared memory, reset memory pointer ptr to NULL, and
allocate memory from conventional pool.
Bug #48237 Error handling in os_mem_alloc_large appears to be incorrect
rb://198 Approved by: Marko
------------------------------------------------------------------------
r6110 | marko | 2009-10-29 21:44:57 +1100 (Thu, 29 Oct 2009) | 2 lines
branches/zip: Makefile.am (INCLUDES): Merge a change from MySQL:
Use $(srcdir)/include instead of $(top_srcdir)/storage/innobase/include.
------------------------------------------------------------------------
r6111 | marko | 2009-10-29 22:04:11 +1100 (Thu, 29 Oct 2009) | 33 lines
branches/zip: Fix corruption of buf_pool->LRU_old and improve debug assertions.
This was reported as Issue #381.
buf_page_set_old(): Assert that blocks may only be set old if
buf_pool->LRU_old is initialized and buf_pool->LRU_old_len is nonzero.
Assert that buf_pool->LRU_old points to the block at the old/new boundary.
buf_LRU_old_adjust_len(): Invoke buf_page_set_old() after adjusting
buf_pool->LRU_old and buf_pool->LRU_old_len, in order not to violate
the added assertions.
buf_LRU_old_init(): Replace buf_page_set_old() with a direct
assignment to bpage->old, because these loops that initialize all the
blocks would temporarily violate the assertions about
buf_pool->LRU_old.
buf_LRU_remove_block(): When setting buf_pool->LRU_old = NULL, also
clear all bpage->old flags and set buf_pool->LRU_old_len = 0.
buf_LRU_add_block_to_end_low(), buf_LRU_add_block_low(): Move the
buf_page_set_old() call later in order not to violate the debug
assertions. If buf_pool->LRU_old is NULL, set old=FALSE.
buf_LRU_free_block(): Replace the UNIV_LRU_DEBUG assertion with a
dummy buf_page_set_old() call that performs more thorough checks.
buf_LRU_validate(): Do not tolerate garbage in buf_pool->LRU_old_len
even if buf_pool->LRU_old is NULL. Check that bpage->old is monotonic.
buf_relocate(): Make the UNIV_LRU_DEBUG checks stricter.
buf0buf.h: Revise the documentation of buf_page_t::old and
buf_pool_t::LRU_old_len.
------------------------------------------------------------------------
r6112 | calvin | 2009-10-30 01:21:15 +1100 (Fri, 30 Oct 2009) | 4 lines
branches/zip: consideration for icc compilers
Proposed by MySQL, and approved by Marko.
------------------------------------------------------------------------
r6113 | vasil | 2009-10-30 03:15:50 +1100 (Fri, 30 Oct 2009) | 93 lines
branches/zip: Merge r5912:6112 from branches/5.1:
(after this merge the innodb-autoinc test starts to fail, but
I commit anyway because it would be easier to investigate the
failure this way)
------------------------------------------------------------------------
r5952 | calvin | 2009-09-22 19:45:07 +0300 (Tue, 22 Sep 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: fix bug#42383: Can't create table 'test.bug39438'
For embedded server, MySQL may pass in full path, which is
currently disallowed. It is needed to relax the condition by
accepting full paths in the embedded case.
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r6032 | vasil | 2009-10-01 15:55:49 +0300 (Thu, 01 Oct 2009) | 8 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Fix Bug#38996 Race condition in ANALYZE TABLE
by serializing ANALYZE TABLE inside InnoDB.
Approved by: Heikki (rb://175)
------------------------------------------------------------------------
r6045 | jyang | 2009-10-08 02:27:08 +0300 (Thu, 08 Oct 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug47777.result
A /branches/5.1/mysql-test/innodb_bug47777.test
branches/5.1: Fix bug #47777. Treat the Geometry data same as
Binary BLOB in ha_innobase::store_key_val_for_row(), since the
Geometry data is stored as Binary BLOB in Innodb.
Review: rb://180 approved by Marko Makela.
------------------------------------------------------------------------
r6051 | sunny | 2009-10-12 07:05:00 +0300 (Mon, 12 Oct 2009) | 6 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Ignore negative values supplied by the user when calculating the
next value to store in dict_table_t. Setting autoincrement columns top negative
values is undefined behavior and this change should bring the behavior of
InnoDB closer to what users expect. Added several tests to check.
rb://162
------------------------------------------------------------------------
r6052 | sunny | 2009-10-12 07:09:56 +0300 (Mon, 12 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Reset the statement level autoinc counter on ROLLBACK. Fix
the test results too.
rb://164
------------------------------------------------------------------------
r6053 | sunny | 2009-10-12 07:37:49 +0300 (Mon, 12 Oct 2009) | 6 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Copy the maximum AUTOINC value from the old table to the new
table when MySQL does a CREATE INDEX ON T. This is required because MySQL
does a table copy, rename and drops the old table.
Fix Bug#47125: auto_increment start value is ignored if an index is created and engine=innodb
rb://168
------------------------------------------------------------------------
r6076 | vasil | 2009-10-14 19:30:12 +0300 (Wed, 14 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/row/row0mysql.c
branches/5.1:
Fix typo.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6114 | vasil | 2009-10-30 03:43:51 +1100 (Fri, 30 Oct 2009) | 6 lines
branches/zip:
* Add ChangeLog entries for latest changes
* Obey alphabetical order in the list of the files
* White-space fixup
------------------------------------------------------------------------
r6121 | sunny | 2009-10-30 10:42:11 +1100 (Fri, 30 Oct 2009) | 7 lines
branches/zip: This test has been problematic for sometime now. The underlying
bug is that the data dictionaries get out of sync. In the AUTOINC code we
try and apply salve to the symptoms. In the past MySQL made some unrelated
change and the dictionaries stopped getting out of sync and this test started
to fail. Now, it seems they have reverted that changed and the test is
passing again. I suspect this is not he last time that this test will change.
------------------------------------------------------------------------
r6124 | jyang | 2009-10-30 19:02:31 +1100 (Fri, 30 Oct 2009) | 5 lines
branches/zip: Correct the bug number for -r6109 change
from # 48273 to #48237
------------------------------------------------------------------------
r6126 | vasil | 2009-10-30 19:36:07 +1100 (Fri, 30 Oct 2009) | 45 lines
branches/zip: Merge r6112:6125 from branches/5.1:
(skipping r6122 and r6123, Jimmy says these are already present and need
not be merged):
------------------------------------------------------------------------
r6122 | jyang | 2009-10-30 05:18:38 +0200 (Fri, 30 Oct 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb_bug44369.result
M /branches/5.1/mysql-test/innodb_bug44369.test
M /branches/5.1/mysql-test/innodb_bug46000.result
M /branches/5.1/mysql-test/innodb_bug46000.test
branches/5.1: Chnage WARN_LEVEL_ERROR to WARN_LEVEL_WARN
for push_warning_printf() call in innodb.
Fix Bug#47233: Innodb calls push_warning(MYSQL_ERROR::WARN_LEVEL_ERROR)
rb://170 approved by Marko.
------------------------------------------------------------------------
r6123 | jyang | 2009-10-30 05:43:06 +0200 (Fri, 30 Oct 2009) | 8 lines
Changed paths:
M /branches/5.1/os/os0proc.c
branches/5.1: In os_mem_alloc_large(), if we fail to attach
the shared memory, reset memory pointer ptr to NULL, and
allocate memory from conventional pool. This is a port
from branches/zip.
Bug #48237 Error handling in os_mem_alloc_large appears to be incorrect
rb://198 Approved by: Marko
------------------------------------------------------------------------
r6125 | vasil | 2009-10-30 10:31:23 +0200 (Fri, 30 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
White-space fixup.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6130 | marko | 2009-11-02 20:42:56 +1100 (Mon, 02 Nov 2009) | 9 lines
branches/zip: Free all resources at shutdown. Set pointers to NULL, so
that Valgrind will not complain about freed data structures that are
reachable via pointers. This addresses Bug #45992 and Bug #46656.
This patch is mostly based on changes copied from branches/embedded-1.0,
mainly c5432, c3439, c3134, c2994, c2978, but also some other code was
copied. Some added cleanup code is specific to MySQL/InnoDB.
rb://199 approved by Sunny Bains
------------------------------------------------------------------------
2009-11-04 07:02:00 +01:00
|
|
|
{
|
2016-08-12 10:17:45 +02:00
|
|
|
mutex_destroy(&m_mutex);
|
|
|
|
|
|
|
|
os_event_destroy(m_not_full);
|
|
|
|
os_event_destroy(m_is_empty);
|
branches/innodb+: Merge revisions r5971:6130 from branches/zip.
------------------------------------------------------------------------
r5971 | marko | 2009-09-23 23:03:51 +1000 (Wed, 23 Sep 2009) | 2 lines
branches/zip: os_file_pwrite(): Make the code compile in InnoDB Hot Backup
when the pwrite system call is not available.
------------------------------------------------------------------------
r5972 | marko | 2009-09-24 05:44:52 +1000 (Thu, 24 Sep 2009) | 5 lines
branches/zip: fil_node_open_file(): In InnoDB Hot Backup,
determine the page size of single-file tablespaces before computing
the file node size. Otherwise, the space->size of compressed tablespaces
would be computed with UNIV_PAGE_SIZE instead of key_block_size.
This should fix Issue #313.
------------------------------------------------------------------------
r5973 | marko | 2009-09-24 05:53:21 +1000 (Thu, 24 Sep 2009) | 2 lines
branches/zip: recv_add_to_hash_table():
Simplify obfuscated pointer arithmetics.
------------------------------------------------------------------------
r5978 | marko | 2009-09-24 17:47:56 +1000 (Thu, 24 Sep 2009) | 1 line
branches/zip: Fix warnings and errors when UNIV_HOTBACKUP is defined.
------------------------------------------------------------------------
r5979 | marko | 2009-09-24 20:16:10 +1000 (Thu, 24 Sep 2009) | 4 lines
branches/zip: ha_innodb.cc: Define MYSQL_PLUGIN_IMPORT when necessary.
This preprocessor symbol has been recently introduced in MySQL 5.1.
The InnoDB Plugin should remain source compatible with MySQL 5.1.24
and later.
------------------------------------------------------------------------
r5988 | calvin | 2009-09-26 05:14:43 +1000 (Sat, 26 Sep 2009) | 8 lines
branches/zip: fix bug#47055 unconditional exit(1) on ERROR_WORKING_SET_QUOTA
1453 (0x5AD) for InnoDB backend
When error ERROR_WORKING_SET_QUOTA or ERROR_NO_SYSTEM_RESOURCES
occurs, yields for 100ms and retries the operation.
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r5992 | vasil | 2009-09-28 17:10:29 +1000 (Mon, 28 Sep 2009) | 4 lines
branches/zip:
Add ChangeLog entry for c5988.
------------------------------------------------------------------------
r5994 | marko | 2009-09-28 18:33:59 +1000 (Mon, 28 Sep 2009) | 17 lines
branches/zip: Try to prevent the reuse of tablespace identifiers after
InnoDB has crashed during table creation. Also, refuse to start if
files with duplicate tablespace identifiers are encountered.
fil_node_create(): Update fil_system->max_assigned_id. This should
prevent the reuse of a space->id when InnoDB does a full crash
recovery and invokes fil_load_single_table_tablespaces(). Normally,
fil_system->max_assigned_id is initialized from
SELECT MAX(ID) FROM SYS_TABLES.
fil_open_single_table_tablespace(): Return FALSE when
fil_space_create() fails.
fil_load_single_table_tablespace(): Exit if fil_space_create() fails
and innodb_force_recovery=0.
rb://173 approved by Heikki Tuuri. This addresses Issue #335.
------------------------------------------------------------------------
r5995 | marko | 2009-09-28 18:52:25 +1000 (Mon, 28 Sep 2009) | 17 lines
branches/zip: Do not write to PAGE_INDEX_ID after page creation,
not even when restoring an uncompressed page after a compression failure.
btr_page_reorganize_low(): On compression failure, do not restore
those page header fields that should not be affected by the
reorganization. Instead, compare the fields.
page_zip_decompress(): Add the parameter ibool all, for copying all
page header fields. Pass the parameter all=TRUE on block read
completion, redo log application, and page_zip_validate(); pass
all=FALSE in all other cases.
page_zip_reorganize(): Do not restore the uncompressed page on
failure. It will be restored (to pre-modification state) by the
caller anyway.
rb://167, Issue #346
------------------------------------------------------------------------
r5996 | marko | 2009-09-28 22:46:02 +1000 (Mon, 28 Sep 2009) | 4 lines
branches/zip: Address Issue #350 in comments.
lock_rec_queue_validate(), lock_rec_queue_validate(): Note that
this debug code may violate the latching order and cause deadlocks.
------------------------------------------------------------------------
r5997 | marko | 2009-09-28 23:03:58 +1000 (Mon, 28 Sep 2009) | 12 lines
branches/zip: Remove an assertion failure when the InnoDB data dictionary
is inconsistent with the MySQL .frm file.
ha_innobase::index_read(): When the index cannot be found,
return an error.
ha_innobase::change_active_index(): When prebuilt->index == NULL,
set also prebuilt->index_usable = FALSE. This is not needed for
correctness, because prebuilt->index_usable is only checked by
row_search_for_mysql(), which requires prebuilt->index != NULL.
This addresses Issue #349. Approved by Heikki Tuuri over IM.
------------------------------------------------------------------------
r6005 | vasil | 2009-09-29 18:09:52 +1000 (Tue, 29 Sep 2009) | 4 lines
branches/zip:
ChangeLog: wrap around 78th column, not earlier.
------------------------------------------------------------------------
r6006 | vasil | 2009-09-29 20:15:25 +1000 (Tue, 29 Sep 2009) | 4 lines
branches/zip:
Add ChangeLog entry for the release of 1.0.4.
------------------------------------------------------------------------
r6007 | vasil | 2009-09-29 23:19:59 +1000 (Tue, 29 Sep 2009) | 6 lines
branches/zip:
Fix the year, should be 2009.
Pointed by: Calvin
------------------------------------------------------------------------
r6026 | marko | 2009-09-30 17:18:24 +1000 (Wed, 30 Sep 2009) | 1 line
branches/zip: Add some debug assertions for checking FSEG_MAGIC_N.
------------------------------------------------------------------------
r6028 | marko | 2009-09-30 23:55:23 +1000 (Wed, 30 Sep 2009) | 3 lines
branches/zip: recv_no_log_write: New debug flag for tracking down
Mantis Issue #347. No modifications should be made to the database
while recv_apply_hashed_log_recs() is about to complete.
------------------------------------------------------------------------
r6029 | calvin | 2009-10-01 06:32:02 +1000 (Thu, 01 Oct 2009) | 4 lines
branches/zip: non-functional changes
Fix typo.
------------------------------------------------------------------------
r6031 | marko | 2009-10-01 21:24:33 +1000 (Thu, 01 Oct 2009) | 49 lines
branches/zip: Clean up after a crash during DROP INDEX.
When InnoDB crashes while dropping an index, ensure that
the index will be completely dropped during crash recovery.
row_merge_drop_index(): Before dropping an index, rename the index to
start with TEMP_INDEX_PREFIX_STR and commit the change, so that
row_merge_drop_temp_indexes() will drop the index after crash
recovery if the server crashes while dropping the index.
fseg_inode_try_get(): New function, forked from fseg_inode_get().
Return NULL if the file segment index node is free.
fseg_inode_get(): Assert that the file segment index node is not free.
fseg_free_step(): If the file segment index node is already free,
print a diagnostic message and return TRUE.
fsp_free_seg_inode(): Write a nonzero number to FSEG_MAGIC_N, so that
allocated-and-freed file segment index nodes can be better
distinguished from uninitialized ones.
This is rb://174, addressing Issue #348.
Tested by restarting mysqld upon the completion of the added
log_write_up_to() invocation below, during DROP INDEX. The index was
dropped after crash recovery, and re-issuing the DROP INDEX did not
crash the server.
Index: btr/btr0btr.c
===================================================================
--- btr/btr0btr.c (revision 6026)
+++ btr/btr0btr.c (working copy)
@@ -42,6 +42,7 @@ Created 6/2/1994 Heikki Tuuri
#include "ibuf0ibuf.h"
#include "trx0trx.h"
+#include "log0log.h"
/*
Latching strategy of the InnoDB B-tree
--------------------------------------
@@ -873,6 +874,8 @@ leaf_loop:
goto leaf_loop;
}
+
+ log_write_up_to(mtr.end_lsn, LOG_WAIT_ALL_GROUPS, TRUE);
top_loop:
mtr_start(&mtr);
------------------------------------------------------------------------
r6033 | calvin | 2009-10-02 06:19:46 +1000 (Fri, 02 Oct 2009) | 4 lines
branches/zip: fix a typo in error message
Reported as bug#47763.
------------------------------------------------------------------------
r6043 | inaam | 2009-10-06 01:45:35 +1100 (Tue, 06 Oct 2009) | 12 lines
branches/zip rb://176
Do not invalidate buffer pool while an LRU batch is active. Added
code to buf_pool_invalidate() to wait for the running batches to finish.
This patch also resets the state of buf_pool struct at invalidation. This
addresses the concern where buf_pool->freed_page_clock becomes non-zero
because we read in a system tablespace page for file format info at
startup.
Approved by: Marko
------------------------------------------------------------------------
r6044 | pekka | 2009-10-07 01:44:54 +1100 (Wed, 07 Oct 2009) | 5 lines
branches/zip:
Add os_file_is_same() function for Hot Backup (inside ifdef UNIV_HOTBACKUP).
This is part of the fix for Issue #186.
Note! The Windows implementation is incomplete.
------------------------------------------------------------------------
r6046 | pekka | 2009-10-08 20:24:56 +1100 (Thu, 08 Oct 2009) | 3 lines
branches/zip: Revert r6044 which added os_file_is_same() function
(issue#186). This functionality is moved to Hot Backup source tree.
------------------------------------------------------------------------
r6048 | vasil | 2009-10-09 16:42:55 +1100 (Fri, 09 Oct 2009) | 16 lines
branches/zip:
When scanning a directory readdir() is called and stat() after it,
if a file is deleted between the two calls stat will fail and the
whole precedure will fail. Change this behavior to continue with the
next entry if stat() fails because of nonexistent file. This is
transparent change as it will make it look as if the file was deleted
before the readdir() call.
This change is needed in order to fix
https://svn.innodb.com/mantis/view.php?id=174
in which we need to abort if os_file_readdir_next_file()
encounters "real" errors.
Approved by: Marko, Pekka (rb://177)
------------------------------------------------------------------------
r6049 | vasil | 2009-10-10 03:05:26 +1100 (Sat, 10 Oct 2009) | 7 lines
branches/zip:
Fix compilation warning in Hot Backup:
innodb/fil/fil0fil.c: In function 'fil_load_single_table_tablespace':
innodb/fil/fil0fil.c:3253: warning: format '%lld' expects type 'long long int', but argument 6 has type 'ib_int64_t'
------------------------------------------------------------------------
r6064 | calvin | 2009-10-14 02:23:35 +1100 (Wed, 14 Oct 2009) | 4 lines
branches/zip: non-functional changes
Changes from MySQL to fix build issue.
------------------------------------------------------------------------
r6065 | inaam | 2009-10-14 04:43:13 +1100 (Wed, 14 Oct 2009) | 7 lines
branches/zip rb://182
Call fsync() on datafiles after a batch of pages is written to disk
even when skip_innodb_doublewrite is set.
Approved by: Heikki
------------------------------------------------------------------------
r6080 | sunny | 2009-10-15 09:29:01 +1100 (Thu, 15 Oct 2009) | 3 lines
branches/zip: Change page_mem_alloc_free() to inline.
Fix Bug #47058 - Failure to compile innodb_plugin on solaris 10u7 + spro cc/CC 5.10
------------------------------------------------------------------------
r6084 | vasil | 2009-10-15 16:21:17 +1100 (Thu, 15 Oct 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r6080.
------------------------------------------------------------------------
r6095 | vasil | 2009-10-20 00:04:59 +1100 (Tue, 20 Oct 2009) | 7 lines
branches/zip:
Fix Bug#47808 innodb_information_schema.test fails when run under valgrind
by using the wait_until_rows_count macro that loops until the number of
rows becomes 14 instead of sleep 0.1, which is obviously very fragile.
------------------------------------------------------------------------
r6096 | vasil | 2009-10-20 00:06:09 +1100 (Tue, 20 Oct 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r6095.
------------------------------------------------------------------------
r6099 | jyang | 2009-10-22 13:58:39 +1100 (Thu, 22 Oct 2009) | 7 lines
branches/zip: Port bug #46000 related changes from 5.1 to zip
branch. Due to different code path for creating index in zip
branch comparing to 5.1), the index reserved name check function
is extended to be used in ha_innobase::add_index().
rb://190 Approved by: Marko
------------------------------------------------------------------------
r6100 | jyang | 2009-10-22 14:51:07 +1100 (Thu, 22 Oct 2009) | 6 lines
branches/zip: As a request from mysql, WARN_LEVEL_ERROR cannot
be used for push_warning_* call any more. Switch to
WARN_LEVEL_WARN. Bug #47233.
rb://172 approved by Sunny Bains and Marko.
------------------------------------------------------------------------
r6101 | jyang | 2009-10-23 19:45:50 +1100 (Fri, 23 Oct 2009) | 7 lines
branches/zip: Update test result with the WARN_LEVEL_ERROR
to WARN_LEVEL_WARN change. This is the same result as
submitted in rb://172 review, which approved by Sunny Bains
and Marko.
------------------------------------------------------------------------
r6102 | marko | 2009-10-26 18:32:23 +1100 (Mon, 26 Oct 2009) | 1 line
branches/zip: row_prebuilt_struct::prebuilts: Unused field, remove.
------------------------------------------------------------------------
r6103 | marko | 2009-10-27 00:46:18 +1100 (Tue, 27 Oct 2009) | 4 lines
branches/zip: row_ins_alloc_sys_fields(): Zero out the system columns
DB_TRX_ID, DB_ROLL_PTR and DB_ROW_ID, in order to avoid harmless
Valgrind warnings about uninitialized data. (The warnings were
harmless, because the fields would be initialized at a later stage.)
------------------------------------------------------------------------
r6105 | calvin | 2009-10-28 09:05:52 +1100 (Wed, 28 Oct 2009) | 6 lines
branches/zip: backport r3848 from 6.0 branch
----
branches/6.0: innobase_start_or_create_for_mysql(): Make the 10 MB
minimum tablespace limit independent of UNIV_PAGE_SIZE. (Bug #41490)
------------------------------------------------------------------------
r6107 | marko | 2009-10-29 01:10:34 +1100 (Thu, 29 Oct 2009) | 5 lines
branches/zip: buf_page_set_old(): Improve UNIV_LRU_DEBUG diagnostics
in order to catch the buf_pool->LRU_old corruption reported in Issue #381.
buf_LRU_old_init(): Set the property from the tail towards the front
of the buf_pool->LRU list, in order not to trip the debug check.
------------------------------------------------------------------------
r6108 | calvin | 2009-10-29 16:58:04 +1100 (Thu, 29 Oct 2009) | 5 lines
branches/zip: close file handle when building with UNIV_HOTBACKUP
The change does not affect regular InnoDB engine. Confirmed by
Marko.
------------------------------------------------------------------------
r6109 | jyang | 2009-10-29 19:37:32 +1100 (Thu, 29 Oct 2009) | 7 lines
branches/zip: In os_mem_alloc_large(), if we fail to attach
the shared memory, reset memory pointer ptr to NULL, and
allocate memory from conventional pool.
Bug #48237 Error handling in os_mem_alloc_large appears to be incorrect
rb://198 Approved by: Marko
------------------------------------------------------------------------
r6110 | marko | 2009-10-29 21:44:57 +1100 (Thu, 29 Oct 2009) | 2 lines
branches/zip: Makefile.am (INCLUDES): Merge a change from MySQL:
Use $(srcdir)/include instead of $(top_srcdir)/storage/innobase/include.
------------------------------------------------------------------------
r6111 | marko | 2009-10-29 22:04:11 +1100 (Thu, 29 Oct 2009) | 33 lines
branches/zip: Fix corruption of buf_pool->LRU_old and improve debug assertions.
This was reported as Issue #381.
buf_page_set_old(): Assert that blocks may only be set old if
buf_pool->LRU_old is initialized and buf_pool->LRU_old_len is nonzero.
Assert that buf_pool->LRU_old points to the block at the old/new boundary.
buf_LRU_old_adjust_len(): Invoke buf_page_set_old() after adjusting
buf_pool->LRU_old and buf_pool->LRU_old_len, in order not to violate
the added assertions.
buf_LRU_old_init(): Replace buf_page_set_old() with a direct
assignment to bpage->old, because these loops that initialize all the
blocks would temporarily violate the assertions about
buf_pool->LRU_old.
buf_LRU_remove_block(): When setting buf_pool->LRU_old = NULL, also
clear all bpage->old flags and set buf_pool->LRU_old_len = 0.
buf_LRU_add_block_to_end_low(), buf_LRU_add_block_low(): Move the
buf_page_set_old() call later in order not to violate the debug
assertions. If buf_pool->LRU_old is NULL, set old=FALSE.
buf_LRU_free_block(): Replace the UNIV_LRU_DEBUG assertion with a
dummy buf_page_set_old() call that performs more thorough checks.
buf_LRU_validate(): Do not tolerate garbage in buf_pool->LRU_old_len
even if buf_pool->LRU_old is NULL. Check that bpage->old is monotonic.
buf_relocate(): Make the UNIV_LRU_DEBUG checks stricter.
buf0buf.h: Revise the documentation of buf_page_t::old and
buf_pool_t::LRU_old_len.
------------------------------------------------------------------------
r6112 | calvin | 2009-10-30 01:21:15 +1100 (Fri, 30 Oct 2009) | 4 lines
branches/zip: consideration for icc compilers
Proposed by MySQL, and approved by Marko.
------------------------------------------------------------------------
r6113 | vasil | 2009-10-30 03:15:50 +1100 (Fri, 30 Oct 2009) | 93 lines
branches/zip: Merge r5912:6112 from branches/5.1:
(after this merge the innodb-autoinc test starts to fail, but
I commit anyway because it would be easier to investigate the
failure this way)
------------------------------------------------------------------------
r5952 | calvin | 2009-09-22 19:45:07 +0300 (Tue, 22 Sep 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: fix bug#42383: Can't create table 'test.bug39438'
For embedded server, MySQL may pass in full path, which is
currently disallowed. It is needed to relax the condition by
accepting full paths in the embedded case.
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r6032 | vasil | 2009-10-01 15:55:49 +0300 (Thu, 01 Oct 2009) | 8 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Fix Bug#38996 Race condition in ANALYZE TABLE
by serializing ANALYZE TABLE inside InnoDB.
Approved by: Heikki (rb://175)
------------------------------------------------------------------------
r6045 | jyang | 2009-10-08 02:27:08 +0300 (Thu, 08 Oct 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug47777.result
A /branches/5.1/mysql-test/innodb_bug47777.test
branches/5.1: Fix bug #47777. Treat the Geometry data same as
Binary BLOB in ha_innobase::store_key_val_for_row(), since the
Geometry data is stored as Binary BLOB in Innodb.
Review: rb://180 approved by Marko Makela.
------------------------------------------------------------------------
r6051 | sunny | 2009-10-12 07:05:00 +0300 (Mon, 12 Oct 2009) | 6 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Ignore negative values supplied by the user when calculating the
next value to store in dict_table_t. Setting autoincrement columns top negative
values is undefined behavior and this change should bring the behavior of
InnoDB closer to what users expect. Added several tests to check.
rb://162
------------------------------------------------------------------------
r6052 | sunny | 2009-10-12 07:09:56 +0300 (Mon, 12 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Reset the statement level autoinc counter on ROLLBACK. Fix
the test results too.
rb://164
------------------------------------------------------------------------
r6053 | sunny | 2009-10-12 07:37:49 +0300 (Mon, 12 Oct 2009) | 6 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Copy the maximum AUTOINC value from the old table to the new
table when MySQL does a CREATE INDEX ON T. This is required because MySQL
does a table copy, rename and drops the old table.
Fix Bug#47125: auto_increment start value is ignored if an index is created and engine=innodb
rb://168
------------------------------------------------------------------------
r6076 | vasil | 2009-10-14 19:30:12 +0300 (Wed, 14 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/row/row0mysql.c
branches/5.1:
Fix typo.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6114 | vasil | 2009-10-30 03:43:51 +1100 (Fri, 30 Oct 2009) | 6 lines
branches/zip:
* Add ChangeLog entries for latest changes
* Obey alphabetical order in the list of the files
* White-space fixup
------------------------------------------------------------------------
r6121 | sunny | 2009-10-30 10:42:11 +1100 (Fri, 30 Oct 2009) | 7 lines
branches/zip: This test has been problematic for sometime now. The underlying
bug is that the data dictionaries get out of sync. In the AUTOINC code we
try and apply salve to the symptoms. In the past MySQL made some unrelated
change and the dictionaries stopped getting out of sync and this test started
to fail. Now, it seems they have reverted that changed and the test is
passing again. I suspect this is not he last time that this test will change.
------------------------------------------------------------------------
r6124 | jyang | 2009-10-30 19:02:31 +1100 (Fri, 30 Oct 2009) | 5 lines
branches/zip: Correct the bug number for -r6109 change
from # 48273 to #48237
------------------------------------------------------------------------
r6126 | vasil | 2009-10-30 19:36:07 +1100 (Fri, 30 Oct 2009) | 45 lines
branches/zip: Merge r6112:6125 from branches/5.1:
(skipping r6122 and r6123, Jimmy says these are already present and need
not be merged):
------------------------------------------------------------------------
r6122 | jyang | 2009-10-30 05:18:38 +0200 (Fri, 30 Oct 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb_bug44369.result
M /branches/5.1/mysql-test/innodb_bug44369.test
M /branches/5.1/mysql-test/innodb_bug46000.result
M /branches/5.1/mysql-test/innodb_bug46000.test
branches/5.1: Chnage WARN_LEVEL_ERROR to WARN_LEVEL_WARN
for push_warning_printf() call in innodb.
Fix Bug#47233: Innodb calls push_warning(MYSQL_ERROR::WARN_LEVEL_ERROR)
rb://170 approved by Marko.
------------------------------------------------------------------------
r6123 | jyang | 2009-10-30 05:43:06 +0200 (Fri, 30 Oct 2009) | 8 lines
Changed paths:
M /branches/5.1/os/os0proc.c
branches/5.1: In os_mem_alloc_large(), if we fail to attach
the shared memory, reset memory pointer ptr to NULL, and
allocate memory from conventional pool. This is a port
from branches/zip.
Bug #48237 Error handling in os_mem_alloc_large appears to be incorrect
rb://198 Approved by: Marko
------------------------------------------------------------------------
r6125 | vasil | 2009-10-30 10:31:23 +0200 (Fri, 30 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
White-space fixup.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6130 | marko | 2009-11-02 20:42:56 +1100 (Mon, 02 Nov 2009) | 9 lines
branches/zip: Free all resources at shutdown. Set pointers to NULL, so
that Valgrind will not complain about freed data structures that are
reachable via pointers. This addresses Bug #45992 and Bug #46656.
This patch is mostly based on changes copied from branches/embedded-1.0,
mainly c5432, c3439, c3134, c2994, c2978, but also some other code was
copied. Some added cleanup code is specific to MySQL/InnoDB.
rb://199 approved by Sunny Bains
------------------------------------------------------------------------
2009-11-04 07:02:00 +01:00
|
|
|
|
2010-07-08 09:05:59 +02:00
|
|
|
#if defined(LINUX_NATIVE_AIO)
|
|
|
|
if (srv_use_native_aio) {
|
2016-08-12 10:17:45 +02:00
|
|
|
m_events.clear();
|
|
|
|
ut_free(m_aio_ctx);
|
2010-07-08 09:05:59 +02:00
|
|
|
}
|
|
|
|
#endif /* LINUX_NATIVE_AIO */
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
m_slots.clear();
|
branches/innodb+: Merge revisions r5971:6130 from branches/zip.
------------------------------------------------------------------------
r5971 | marko | 2009-09-23 23:03:51 +1000 (Wed, 23 Sep 2009) | 2 lines
branches/zip: os_file_pwrite(): Make the code compile in InnoDB Hot Backup
when the pwrite system call is not available.
------------------------------------------------------------------------
r5972 | marko | 2009-09-24 05:44:52 +1000 (Thu, 24 Sep 2009) | 5 lines
branches/zip: fil_node_open_file(): In InnoDB Hot Backup,
determine the page size of single-file tablespaces before computing
the file node size. Otherwise, the space->size of compressed tablespaces
would be computed with UNIV_PAGE_SIZE instead of key_block_size.
This should fix Issue #313.
------------------------------------------------------------------------
r5973 | marko | 2009-09-24 05:53:21 +1000 (Thu, 24 Sep 2009) | 2 lines
branches/zip: recv_add_to_hash_table():
Simplify obfuscated pointer arithmetics.
------------------------------------------------------------------------
r5978 | marko | 2009-09-24 17:47:56 +1000 (Thu, 24 Sep 2009) | 1 line
branches/zip: Fix warnings and errors when UNIV_HOTBACKUP is defined.
------------------------------------------------------------------------
r5979 | marko | 2009-09-24 20:16:10 +1000 (Thu, 24 Sep 2009) | 4 lines
branches/zip: ha_innodb.cc: Define MYSQL_PLUGIN_IMPORT when necessary.
This preprocessor symbol has been recently introduced in MySQL 5.1.
The InnoDB Plugin should remain source compatible with MySQL 5.1.24
and later.
------------------------------------------------------------------------
r5988 | calvin | 2009-09-26 05:14:43 +1000 (Sat, 26 Sep 2009) | 8 lines
branches/zip: fix bug#47055 unconditional exit(1) on ERROR_WORKING_SET_QUOTA
1453 (0x5AD) for InnoDB backend
When error ERROR_WORKING_SET_QUOTA or ERROR_NO_SYSTEM_RESOURCES
occurs, yields for 100ms and retries the operation.
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r5992 | vasil | 2009-09-28 17:10:29 +1000 (Mon, 28 Sep 2009) | 4 lines
branches/zip:
Add ChangeLog entry for c5988.
------------------------------------------------------------------------
r5994 | marko | 2009-09-28 18:33:59 +1000 (Mon, 28 Sep 2009) | 17 lines
branches/zip: Try to prevent the reuse of tablespace identifiers after
InnoDB has crashed during table creation. Also, refuse to start if
files with duplicate tablespace identifiers are encountered.
fil_node_create(): Update fil_system->max_assigned_id. This should
prevent the reuse of a space->id when InnoDB does a full crash
recovery and invokes fil_load_single_table_tablespaces(). Normally,
fil_system->max_assigned_id is initialized from
SELECT MAX(ID) FROM SYS_TABLES.
fil_open_single_table_tablespace(): Return FALSE when
fil_space_create() fails.
fil_load_single_table_tablespace(): Exit if fil_space_create() fails
and innodb_force_recovery=0.
rb://173 approved by Heikki Tuuri. This addresses Issue #335.
------------------------------------------------------------------------
r5995 | marko | 2009-09-28 18:52:25 +1000 (Mon, 28 Sep 2009) | 17 lines
branches/zip: Do not write to PAGE_INDEX_ID after page creation,
not even when restoring an uncompressed page after a compression failure.
btr_page_reorganize_low(): On compression failure, do not restore
those page header fields that should not be affected by the
reorganization. Instead, compare the fields.
page_zip_decompress(): Add the parameter ibool all, for copying all
page header fields. Pass the parameter all=TRUE on block read
completion, redo log application, and page_zip_validate(); pass
all=FALSE in all other cases.
page_zip_reorganize(): Do not restore the uncompressed page on
failure. It will be restored (to pre-modification state) by the
caller anyway.
rb://167, Issue #346
------------------------------------------------------------------------
r5996 | marko | 2009-09-28 22:46:02 +1000 (Mon, 28 Sep 2009) | 4 lines
branches/zip: Address Issue #350 in comments.
lock_rec_queue_validate(), lock_rec_queue_validate(): Note that
this debug code may violate the latching order and cause deadlocks.
------------------------------------------------------------------------
r5997 | marko | 2009-09-28 23:03:58 +1000 (Mon, 28 Sep 2009) | 12 lines
branches/zip: Remove an assertion failure when the InnoDB data dictionary
is inconsistent with the MySQL .frm file.
ha_innobase::index_read(): When the index cannot be found,
return an error.
ha_innobase::change_active_index(): When prebuilt->index == NULL,
set also prebuilt->index_usable = FALSE. This is not needed for
correctness, because prebuilt->index_usable is only checked by
row_search_for_mysql(), which requires prebuilt->index != NULL.
This addresses Issue #349. Approved by Heikki Tuuri over IM.
------------------------------------------------------------------------
r6005 | vasil | 2009-09-29 18:09:52 +1000 (Tue, 29 Sep 2009) | 4 lines
branches/zip:
ChangeLog: wrap around 78th column, not earlier.
------------------------------------------------------------------------
r6006 | vasil | 2009-09-29 20:15:25 +1000 (Tue, 29 Sep 2009) | 4 lines
branches/zip:
Add ChangeLog entry for the release of 1.0.4.
------------------------------------------------------------------------
r6007 | vasil | 2009-09-29 23:19:59 +1000 (Tue, 29 Sep 2009) | 6 lines
branches/zip:
Fix the year, should be 2009.
Pointed by: Calvin
------------------------------------------------------------------------
r6026 | marko | 2009-09-30 17:18:24 +1000 (Wed, 30 Sep 2009) | 1 line
branches/zip: Add some debug assertions for checking FSEG_MAGIC_N.
------------------------------------------------------------------------
r6028 | marko | 2009-09-30 23:55:23 +1000 (Wed, 30 Sep 2009) | 3 lines
branches/zip: recv_no_log_write: New debug flag for tracking down
Mantis Issue #347. No modifications should be made to the database
while recv_apply_hashed_log_recs() is about to complete.
------------------------------------------------------------------------
r6029 | calvin | 2009-10-01 06:32:02 +1000 (Thu, 01 Oct 2009) | 4 lines
branches/zip: non-functional changes
Fix typo.
------------------------------------------------------------------------
r6031 | marko | 2009-10-01 21:24:33 +1000 (Thu, 01 Oct 2009) | 49 lines
branches/zip: Clean up after a crash during DROP INDEX.
When InnoDB crashes while dropping an index, ensure that
the index will be completely dropped during crash recovery.
row_merge_drop_index(): Before dropping an index, rename the index to
start with TEMP_INDEX_PREFIX_STR and commit the change, so that
row_merge_drop_temp_indexes() will drop the index after crash
recovery if the server crashes while dropping the index.
fseg_inode_try_get(): New function, forked from fseg_inode_get().
Return NULL if the file segment index node is free.
fseg_inode_get(): Assert that the file segment index node is not free.
fseg_free_step(): If the file segment index node is already free,
print a diagnostic message and return TRUE.
fsp_free_seg_inode(): Write a nonzero number to FSEG_MAGIC_N, so that
allocated-and-freed file segment index nodes can be better
distinguished from uninitialized ones.
This is rb://174, addressing Issue #348.
Tested by restarting mysqld upon the completion of the added
log_write_up_to() invocation below, during DROP INDEX. The index was
dropped after crash recovery, and re-issuing the DROP INDEX did not
crash the server.
Index: btr/btr0btr.c
===================================================================
--- btr/btr0btr.c (revision 6026)
+++ btr/btr0btr.c (working copy)
@@ -42,6 +42,7 @@ Created 6/2/1994 Heikki Tuuri
#include "ibuf0ibuf.h"
#include "trx0trx.h"
+#include "log0log.h"
/*
Latching strategy of the InnoDB B-tree
--------------------------------------
@@ -873,6 +874,8 @@ leaf_loop:
goto leaf_loop;
}
+
+ log_write_up_to(mtr.end_lsn, LOG_WAIT_ALL_GROUPS, TRUE);
top_loop:
mtr_start(&mtr);
------------------------------------------------------------------------
r6033 | calvin | 2009-10-02 06:19:46 +1000 (Fri, 02 Oct 2009) | 4 lines
branches/zip: fix a typo in error message
Reported as bug#47763.
------------------------------------------------------------------------
r6043 | inaam | 2009-10-06 01:45:35 +1100 (Tue, 06 Oct 2009) | 12 lines
branches/zip rb://176
Do not invalidate buffer pool while an LRU batch is active. Added
code to buf_pool_invalidate() to wait for the running batches to finish.
This patch also resets the state of buf_pool struct at invalidation. This
addresses the concern where buf_pool->freed_page_clock becomes non-zero
because we read in a system tablespace page for file format info at
startup.
Approved by: Marko
------------------------------------------------------------------------
r6044 | pekka | 2009-10-07 01:44:54 +1100 (Wed, 07 Oct 2009) | 5 lines
branches/zip:
Add os_file_is_same() function for Hot Backup (inside ifdef UNIV_HOTBACKUP).
This is part of the fix for Issue #186.
Note! The Windows implementation is incomplete.
------------------------------------------------------------------------
r6046 | pekka | 2009-10-08 20:24:56 +1100 (Thu, 08 Oct 2009) | 3 lines
branches/zip: Revert r6044 which added os_file_is_same() function
(issue#186). This functionality is moved to Hot Backup source tree.
------------------------------------------------------------------------
r6048 | vasil | 2009-10-09 16:42:55 +1100 (Fri, 09 Oct 2009) | 16 lines
branches/zip:
When scanning a directory readdir() is called and stat() after it,
if a file is deleted between the two calls stat will fail and the
whole precedure will fail. Change this behavior to continue with the
next entry if stat() fails because of nonexistent file. This is
transparent change as it will make it look as if the file was deleted
before the readdir() call.
This change is needed in order to fix
https://svn.innodb.com/mantis/view.php?id=174
in which we need to abort if os_file_readdir_next_file()
encounters "real" errors.
Approved by: Marko, Pekka (rb://177)
------------------------------------------------------------------------
r6049 | vasil | 2009-10-10 03:05:26 +1100 (Sat, 10 Oct 2009) | 7 lines
branches/zip:
Fix compilation warning in Hot Backup:
innodb/fil/fil0fil.c: In function 'fil_load_single_table_tablespace':
innodb/fil/fil0fil.c:3253: warning: format '%lld' expects type 'long long int', but argument 6 has type 'ib_int64_t'
------------------------------------------------------------------------
r6064 | calvin | 2009-10-14 02:23:35 +1100 (Wed, 14 Oct 2009) | 4 lines
branches/zip: non-functional changes
Changes from MySQL to fix build issue.
------------------------------------------------------------------------
r6065 | inaam | 2009-10-14 04:43:13 +1100 (Wed, 14 Oct 2009) | 7 lines
branches/zip rb://182
Call fsync() on datafiles after a batch of pages is written to disk
even when skip_innodb_doublewrite is set.
Approved by: Heikki
------------------------------------------------------------------------
r6080 | sunny | 2009-10-15 09:29:01 +1100 (Thu, 15 Oct 2009) | 3 lines
branches/zip: Change page_mem_alloc_free() to inline.
Fix Bug #47058 - Failure to compile innodb_plugin on solaris 10u7 + spro cc/CC 5.10
------------------------------------------------------------------------
r6084 | vasil | 2009-10-15 16:21:17 +1100 (Thu, 15 Oct 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r6080.
------------------------------------------------------------------------
r6095 | vasil | 2009-10-20 00:04:59 +1100 (Tue, 20 Oct 2009) | 7 lines
branches/zip:
Fix Bug#47808 innodb_information_schema.test fails when run under valgrind
by using the wait_until_rows_count macro that loops until the number of
rows becomes 14 instead of sleep 0.1, which is obviously very fragile.
------------------------------------------------------------------------
r6096 | vasil | 2009-10-20 00:06:09 +1100 (Tue, 20 Oct 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r6095.
------------------------------------------------------------------------
r6099 | jyang | 2009-10-22 13:58:39 +1100 (Thu, 22 Oct 2009) | 7 lines
branches/zip: Port bug #46000 related changes from 5.1 to zip
branch. Due to different code path for creating index in zip
branch comparing to 5.1), the index reserved name check function
is extended to be used in ha_innobase::add_index().
rb://190 Approved by: Marko
------------------------------------------------------------------------
r6100 | jyang | 2009-10-22 14:51:07 +1100 (Thu, 22 Oct 2009) | 6 lines
branches/zip: As a request from mysql, WARN_LEVEL_ERROR cannot
be used for push_warning_* call any more. Switch to
WARN_LEVEL_WARN. Bug #47233.
rb://172 approved by Sunny Bains and Marko.
------------------------------------------------------------------------
r6101 | jyang | 2009-10-23 19:45:50 +1100 (Fri, 23 Oct 2009) | 7 lines
branches/zip: Update test result with the WARN_LEVEL_ERROR
to WARN_LEVEL_WARN change. This is the same result as
submitted in rb://172 review, which approved by Sunny Bains
and Marko.
------------------------------------------------------------------------
r6102 | marko | 2009-10-26 18:32:23 +1100 (Mon, 26 Oct 2009) | 1 line
branches/zip: row_prebuilt_struct::prebuilts: Unused field, remove.
------------------------------------------------------------------------
r6103 | marko | 2009-10-27 00:46:18 +1100 (Tue, 27 Oct 2009) | 4 lines
branches/zip: row_ins_alloc_sys_fields(): Zero out the system columns
DB_TRX_ID, DB_ROLL_PTR and DB_ROW_ID, in order to avoid harmless
Valgrind warnings about uninitialized data. (The warnings were
harmless, because the fields would be initialized at a later stage.)
------------------------------------------------------------------------
r6105 | calvin | 2009-10-28 09:05:52 +1100 (Wed, 28 Oct 2009) | 6 lines
branches/zip: backport r3848 from 6.0 branch
----
branches/6.0: innobase_start_or_create_for_mysql(): Make the 10 MB
minimum tablespace limit independent of UNIV_PAGE_SIZE. (Bug #41490)
------------------------------------------------------------------------
r6107 | marko | 2009-10-29 01:10:34 +1100 (Thu, 29 Oct 2009) | 5 lines
branches/zip: buf_page_set_old(): Improve UNIV_LRU_DEBUG diagnostics
in order to catch the buf_pool->LRU_old corruption reported in Issue #381.
buf_LRU_old_init(): Set the property from the tail towards the front
of the buf_pool->LRU list, in order not to trip the debug check.
------------------------------------------------------------------------
r6108 | calvin | 2009-10-29 16:58:04 +1100 (Thu, 29 Oct 2009) | 5 lines
branches/zip: close file handle when building with UNIV_HOTBACKUP
The change does not affect regular InnoDB engine. Confirmed by
Marko.
------------------------------------------------------------------------
r6109 | jyang | 2009-10-29 19:37:32 +1100 (Thu, 29 Oct 2009) | 7 lines
branches/zip: In os_mem_alloc_large(), if we fail to attach
the shared memory, reset memory pointer ptr to NULL, and
allocate memory from conventional pool.
Bug #48237 Error handling in os_mem_alloc_large appears to be incorrect
rb://198 Approved by: Marko
------------------------------------------------------------------------
r6110 | marko | 2009-10-29 21:44:57 +1100 (Thu, 29 Oct 2009) | 2 lines
branches/zip: Makefile.am (INCLUDES): Merge a change from MySQL:
Use $(srcdir)/include instead of $(top_srcdir)/storage/innobase/include.
------------------------------------------------------------------------
r6111 | marko | 2009-10-29 22:04:11 +1100 (Thu, 29 Oct 2009) | 33 lines
branches/zip: Fix corruption of buf_pool->LRU_old and improve debug assertions.
This was reported as Issue #381.
buf_page_set_old(): Assert that blocks may only be set old if
buf_pool->LRU_old is initialized and buf_pool->LRU_old_len is nonzero.
Assert that buf_pool->LRU_old points to the block at the old/new boundary.
buf_LRU_old_adjust_len(): Invoke buf_page_set_old() after adjusting
buf_pool->LRU_old and buf_pool->LRU_old_len, in order not to violate
the added assertions.
buf_LRU_old_init(): Replace buf_page_set_old() with a direct
assignment to bpage->old, because these loops that initialize all the
blocks would temporarily violate the assertions about
buf_pool->LRU_old.
buf_LRU_remove_block(): When setting buf_pool->LRU_old = NULL, also
clear all bpage->old flags and set buf_pool->LRU_old_len = 0.
buf_LRU_add_block_to_end_low(), buf_LRU_add_block_low(): Move the
buf_page_set_old() call later in order not to violate the debug
assertions. If buf_pool->LRU_old is NULL, set old=FALSE.
buf_LRU_free_block(): Replace the UNIV_LRU_DEBUG assertion with a
dummy buf_page_set_old() call that performs more thorough checks.
buf_LRU_validate(): Do not tolerate garbage in buf_pool->LRU_old_len
even if buf_pool->LRU_old is NULL. Check that bpage->old is monotonic.
buf_relocate(): Make the UNIV_LRU_DEBUG checks stricter.
buf0buf.h: Revise the documentation of buf_page_t::old and
buf_pool_t::LRU_old_len.
------------------------------------------------------------------------
r6112 | calvin | 2009-10-30 01:21:15 +1100 (Fri, 30 Oct 2009) | 4 lines
branches/zip: consideration for icc compilers
Proposed by MySQL, and approved by Marko.
------------------------------------------------------------------------
r6113 | vasil | 2009-10-30 03:15:50 +1100 (Fri, 30 Oct 2009) | 93 lines
branches/zip: Merge r5912:6112 from branches/5.1:
(after this merge the innodb-autoinc test starts to fail, but
I commit anyway because it would be easier to investigate the
failure this way)
------------------------------------------------------------------------
r5952 | calvin | 2009-09-22 19:45:07 +0300 (Tue, 22 Sep 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: fix bug#42383: Can't create table 'test.bug39438'
For embedded server, MySQL may pass in full path, which is
currently disallowed. It is needed to relax the condition by
accepting full paths in the embedded case.
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r6032 | vasil | 2009-10-01 15:55:49 +0300 (Thu, 01 Oct 2009) | 8 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Fix Bug#38996 Race condition in ANALYZE TABLE
by serializing ANALYZE TABLE inside InnoDB.
Approved by: Heikki (rb://175)
------------------------------------------------------------------------
r6045 | jyang | 2009-10-08 02:27:08 +0300 (Thu, 08 Oct 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug47777.result
A /branches/5.1/mysql-test/innodb_bug47777.test
branches/5.1: Fix bug #47777. Treat the Geometry data same as
Binary BLOB in ha_innobase::store_key_val_for_row(), since the
Geometry data is stored as Binary BLOB in Innodb.
Review: rb://180 approved by Marko Makela.
------------------------------------------------------------------------
r6051 | sunny | 2009-10-12 07:05:00 +0300 (Mon, 12 Oct 2009) | 6 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Ignore negative values supplied by the user when calculating the
next value to store in dict_table_t. Setting autoincrement columns top negative
values is undefined behavior and this change should bring the behavior of
InnoDB closer to what users expect. Added several tests to check.
rb://162
------------------------------------------------------------------------
r6052 | sunny | 2009-10-12 07:09:56 +0300 (Mon, 12 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Reset the statement level autoinc counter on ROLLBACK. Fix
the test results too.
rb://164
------------------------------------------------------------------------
r6053 | sunny | 2009-10-12 07:37:49 +0300 (Mon, 12 Oct 2009) | 6 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Copy the maximum AUTOINC value from the old table to the new
table when MySQL does a CREATE INDEX ON T. This is required because MySQL
does a table copy, rename and drops the old table.
Fix Bug#47125: auto_increment start value is ignored if an index is created and engine=innodb
rb://168
------------------------------------------------------------------------
r6076 | vasil | 2009-10-14 19:30:12 +0300 (Wed, 14 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/row/row0mysql.c
branches/5.1:
Fix typo.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6114 | vasil | 2009-10-30 03:43:51 +1100 (Fri, 30 Oct 2009) | 6 lines
branches/zip:
* Add ChangeLog entries for latest changes
* Obey alphabetical order in the list of the files
* White-space fixup
------------------------------------------------------------------------
r6121 | sunny | 2009-10-30 10:42:11 +1100 (Fri, 30 Oct 2009) | 7 lines
branches/zip: This test has been problematic for sometime now. The underlying
bug is that the data dictionaries get out of sync. In the AUTOINC code we
try and apply salve to the symptoms. In the past MySQL made some unrelated
change and the dictionaries stopped getting out of sync and this test started
to fail. Now, it seems they have reverted that changed and the test is
passing again. I suspect this is not he last time that this test will change.
------------------------------------------------------------------------
r6124 | jyang | 2009-10-30 19:02:31 +1100 (Fri, 30 Oct 2009) | 5 lines
branches/zip: Correct the bug number for -r6109 change
from # 48273 to #48237
------------------------------------------------------------------------
r6126 | vasil | 2009-10-30 19:36:07 +1100 (Fri, 30 Oct 2009) | 45 lines
branches/zip: Merge r6112:6125 from branches/5.1:
(skipping r6122 and r6123, Jimmy says these are already present and need
not be merged):
------------------------------------------------------------------------
r6122 | jyang | 2009-10-30 05:18:38 +0200 (Fri, 30 Oct 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb_bug44369.result
M /branches/5.1/mysql-test/innodb_bug44369.test
M /branches/5.1/mysql-test/innodb_bug46000.result
M /branches/5.1/mysql-test/innodb_bug46000.test
branches/5.1: Chnage WARN_LEVEL_ERROR to WARN_LEVEL_WARN
for push_warning_printf() call in innodb.
Fix Bug#47233: Innodb calls push_warning(MYSQL_ERROR::WARN_LEVEL_ERROR)
rb://170 approved by Marko.
------------------------------------------------------------------------
r6123 | jyang | 2009-10-30 05:43:06 +0200 (Fri, 30 Oct 2009) | 8 lines
Changed paths:
M /branches/5.1/os/os0proc.c
branches/5.1: In os_mem_alloc_large(), if we fail to attach
the shared memory, reset memory pointer ptr to NULL, and
allocate memory from conventional pool. This is a port
from branches/zip.
Bug #48237 Error handling in os_mem_alloc_large appears to be incorrect
rb://198 Approved by: Marko
------------------------------------------------------------------------
r6125 | vasil | 2009-10-30 10:31:23 +0200 (Fri, 30 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
White-space fixup.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6130 | marko | 2009-11-02 20:42:56 +1100 (Mon, 02 Nov 2009) | 9 lines
branches/zip: Free all resources at shutdown. Set pointers to NULL, so
that Valgrind will not complain about freed data structures that are
reachable via pointers. This addresses Bug #45992 and Bug #46656.
This patch is mostly based on changes copied from branches/embedded-1.0,
mainly c5432, c3439, c3134, c2994, c2978, but also some other code was
copied. Some added cleanup code is specific to MySQL/InnoDB.
rb://199 approved by Sunny Bains
------------------------------------------------------------------------
2009-11-04 07:02:00 +01:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Initializes the asynchronous io system. Creates one array each for ibuf
|
branches/innodb+: Merge revisions 5144:5524 from branches/zip
------------------------------------------------------------------------
r5147 | marko | 2009-05-27 06:55:14 -0400 (Wed, 27 May 2009) | 1 line
branches/zip: ibuf0ibuf.c: Improve a comment.
------------------------------------------------------------------------
r5149 | marko | 2009-05-27 07:46:42 -0400 (Wed, 27 May 2009) | 34 lines
branches/zip: Merge revisions 4994:5148 from branches/5.1:
------------------------------------------------------------------------
r5126 | vasil | 2009-05-26 16:57:12 +0300 (Tue, 26 May 2009) | 9 lines
branches/5.1:
Preparation for the fix of
Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Non-functional change: move FSP_* macros from fsp0fsp.h to a new file
fsp0types.h. This is needed in order to be able to use FSP_EXTENT_SIZE
in mtr0log.ic.
------------------------------------------------------------------------
r5127 | vasil | 2009-05-26 17:05:43 +0300 (Tue, 26 May 2009) | 9 lines
branches/5.1:
Preparation for the fix of
Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Do not include unnecessary headers mtr0log.h and fut0lst.h in trx0sys.h
and include fsp0fsp.h just before it is needed. This is needed in order
to be able to use TRX_SYS_SPACE in mtr0log.ic.
------------------------------------------------------------------------
r5128 | vasil | 2009-05-26 17:26:37 +0300 (Tue, 26 May 2009) | 7 lines
branches/5.1:
Fix Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Do not write redo log for the pages in the doublewrite buffer. Also, do not
make a dummy change to the page because this is not needed.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5169 | marko | 2009-05-28 03:21:55 -0400 (Thu, 28 May 2009) | 1 line
branches/zip: mtr0mtr.h: Add Doxygen comments for the redo log entry types.
------------------------------------------------------------------------
r5176 | marko | 2009-05-28 07:14:02 -0400 (Thu, 28 May 2009) | 1 line
branches/zip: Correct a debug assertion that was added in r5125.
------------------------------------------------------------------------
r5201 | marko | 2009-06-01 06:35:25 -0400 (Mon, 01 Jun 2009) | 2 lines
branches/zip: Clean up some comments.
Make the rec parameter of mlog_open_and_write_index() const.
------------------------------------------------------------------------
r5234 | marko | 2009-06-03 08:26:41 -0400 (Wed, 03 Jun 2009) | 44 lines
branches/zip: Merge revisions 5148:5233 from branches/5.1:
------------------------------------------------------------------------
r5150 | vasil | 2009-05-27 18:56:03 +0300 (Wed, 27 May 2009) | 4 lines
branches/5.1:
Whitespace fixup.
------------------------------------------------------------------------
r5191 | vasil | 2009-05-30 17:46:05 +0300 (Sat, 30 May 2009) | 19 lines
branches/5.1:
Merge a change from MySQL (this fixes the failing innodb_mysql test):
------------------------------------------------------------
revno: 1810.3894.10
committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
branch nick: mysql-5.0-bugteam
timestamp: Tue 2009-05-19 11:32:21 +0500
message:
Bug#39793 Foreign keys not constructed when column has a '#' in a comment or default value
Internal InnoDN FK parser does not recognize '\'' as quotation symbol.
Suggested fix is to add '\'' symbol check for quotation condition
(dict_strip_comments() function).
modified:
innobase/dict/dict0dict.c
mysql-test/r/innodb_mysql.result
mysql-test/t/innodb_mysql.test
------------------------------------------------------------------------
r5233 | marko | 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) | 11 lines
branches/5.1: Merge the test case from r5232 from branches/5.0:
------------------------------------------------------------------------
r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines
branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565
(Update Query Results in "1 Row Affected" But Should Be "Zero Rows").
Also, add a test case for Bug #40565.
rb://128 approved by Heikki Tuuri
------------------------------------------------------------------------
------------------------------------------------------------------------
------------------------------------------------------------------------
r5250 | marko | 2009-06-04 02:58:23 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Add Doxygen comments to the rest of buf0*.
------------------------------------------------------------------------
r5251 | marko | 2009-06-04 02:59:51 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Replace <= in a function comment.
------------------------------------------------------------------------
r5253 | marko | 2009-06-04 06:37:35 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Add missing Doxygen comments for page0zip.
------------------------------------------------------------------------
r5261 | vasil | 2009-06-05 11:13:31 -0400 (Fri, 05 Jun 2009) | 15 lines
branches/zip:
Fix Mantis Issue#244 fix bug in linear read ahead (no check on access pattern)
The changes are:
1) Take into account access pattern when deciding whether or not to do linear
read ahead.
2) Expose a knob innodb_read_ahead_factor = [0-64] default (8), dynamic,
global to control linear read ahead behvior
3) Disable random read ahead. Keep the code for now.
Submitted by: Inaam (rb://122)
Approved by: Heikki (rb://122)
------------------------------------------------------------------------
r5262 | vasil | 2009-06-05 12:04:25 -0400 (Fri, 05 Jun 2009) | 22 lines
branches/zip:
Enable functionality to have multiple background io helper threads.
This patch is based on percona contributions.
More details about this patch will be written at:
https://svn.innodb.com/innobase/MultipleBackgroundThreads
The patch essentially does the following:
expose following knobs:
innodb_read_io_threads = [1 - 64] default 1
innodb_write_io_threads = [1 - 64] default 1
deprecate innodb_file_io_threads (this parameter was relevant only on windows)
Internally it allows multiple segments for read and write IO request arrays
where one thread works on one segement.
Submitted by: Inaam (rb://124)
Approved by: Heikki (rb://124)
------------------------------------------------------------------------
r5263 | vasil | 2009-06-05 12:19:37 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Whitespace cleanup.
------------------------------------------------------------------------
r5264 | vasil | 2009-06-05 12:26:58 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5261.
------------------------------------------------------------------------
r5265 | vasil | 2009-06-05 12:34:11 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5262.
------------------------------------------------------------------------
r5268 | inaam | 2009-06-08 12:18:21 -0400 (Mon, 08 Jun 2009) | 7 lines
branches/zip
Non functional change:
Added legal notices acknowledging percona contribution to the multiple
IO helper threads patch i.e.: r5262
------------------------------------------------------------------------
r5283 | inaam | 2009-06-09 13:46:29 -0400 (Tue, 09 Jun 2009) | 9 lines
branches/zip
rb://130
Enable Group Commit functionality that was broken in 5.0 when
distributed transactions were introduced.
Reviewed by: Heikki
------------------------------------------------------------------------
r5319 | marko | 2009-06-11 04:40:33 -0400 (Thu, 11 Jun 2009) | 3 lines
branches/zip: Declare os_thread_id_t as unsigned long,
because ulint is wrong on Win64.
Pointed out by Vladislav Vaintroub <wlad@sun.com>.
------------------------------------------------------------------------
r5320 | inaam | 2009-06-11 09:15:41 -0400 (Thu, 11 Jun 2009) | 14 lines
branches/zip rb://131
This patch changes the following defaults:
max_dirty_pages_pct: default from 90 to 75. max allowed from 100 to 99
additional_mem_pool_size: default from 1 to 8 MB
buffer_pool_size: default from 8 to 128 MB
log_buffer_size: default from 1 to 8 MB
read_io_threads/write_io_threads: default from 1 to 4
The log file sizes are untouched because of upgrade issues
Reviewed by: Heikki
------------------------------------------------------------------------
r5330 | marko | 2009-06-16 04:08:59 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: buf_page_get_gen(): Reduce mutex holding time by adjusting
buf_pool->n_pend_unzip while only holding buf_pool_mutex.
------------------------------------------------------------------------
r5331 | marko | 2009-06-16 05:00:48 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: buf_page_get_zip(): Eliminate a buf_page_get_mutex() call.
The function must switch on the block state anyway.
------------------------------------------------------------------------
r5332 | vasil | 2009-06-16 05:03:27 -0400 (Tue, 16 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entries for r5283 and r5320.
------------------------------------------------------------------------
r5333 | marko | 2009-06-16 05:27:46 -0400 (Tue, 16 Jun 2009) | 1 line
branches/zip: buf_page_io_query(): Remove unused function.
------------------------------------------------------------------------
r5335 | marko | 2009-06-16 09:23:10 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: innodb.test: Adjust the tolerance of
innodb_buffer_pool_pages_total for r5320.
------------------------------------------------------------------------
r5342 | marko | 2009-06-17 06:15:32 -0400 (Wed, 17 Jun 2009) | 60 lines
branches/zip: Merge revisions 5233:5341 from branches/5.1:
------------------------------------------------------------------------
r5233 | marko | 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) | 11 lines
branches/5.1: Merge the test case from r5232 from branches/5.0:
------------------------------------------------------------------------
r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines
branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565
(Update Query Results in "1 Row Affected" But Should Be "Zero Rows").
Also, add a test case for Bug #40565.
rb://128 approved by Heikki Tuuri
------------------------------------------------------------------------
------------------------------------------------------------------------
r5243 | sunny | 2009-06-04 03:17:14 +0300 (Thu, 04 Jun 2009) | 14 lines
branches/5.1: When the InnoDB and MySQL data dictionaries go out of sync, before
the bug fix we would assert on missing autoinc columns. With this fix we allow
MySQL to open the table but set the next autoinc value for the column to the
MAX value. This effectively disables the next value generation. INSERTs will
fail with a generic AUTOINC failure. However, the user should be able to
read/dump the table, set the column values explicitly, use ALTER TABLE to
set the next autoinc value and/or sync the two data dictionaries to resume
normal operations.
Fix Bug#44030 Error: (1500) Couldn't read the MAX(ID) autoinc value from the
index (PRIMARY)
rb://118
------------------------------------------------------------------------
r5252 | sunny | 2009-06-04 10:16:24 +0300 (Thu, 04 Jun 2009) | 2 lines
branches/5.1: The version of the result file checked in was broken in r5243.
------------------------------------------------------------------------
r5259 | vasil | 2009-06-05 10:29:16 +0300 (Fri, 05 Jun 2009) | 7 lines
branches/5.1:
Remove the word "Error" from the printout because the mysqltest suite
interprets it as an error and thus the innodb-autoinc test fails.
Approved by: Sunny (via IM)
------------------------------------------------------------------------
r5339 | marko | 2009-06-17 11:01:37 +0300 (Wed, 17 Jun 2009) | 2 lines
branches/5.1: Add missing #include "mtr0log.h" so that the code compiles
with -DUNIV_MUST_NOT_INLINE.
(null merge; this had already been committed in branches/zip)
------------------------------------------------------------------------
r5340 | marko | 2009-06-17 12:11:49 +0300 (Wed, 17 Jun 2009) | 4 lines
branches/5.1: row_unlock_for_mysql(): When the clustered index is unknown,
refuse to unlock the record.
(Bug #45357, caused by the fix of Bug #39320).
rb://132 approved by Sunny Bains.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5343 | vasil | 2009-06-17 08:56:12 -0400 (Wed, 17 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5342.
------------------------------------------------------------------------
r5344 | marko | 2009-06-17 09:03:45 -0400 (Wed, 17 Jun 2009) | 1 line
branches/zip: row_merge_read_rec(): Fix a UNIV_DEBUG bug (Bug #45426)
------------------------------------------------------------------------
r5391 | marko | 2009-06-22 05:31:35 -0400 (Mon, 22 Jun 2009) | 2 lines
branches/zip: buf_page_get_zip(): Fix a bogus warning about
block_mutex being possibly uninitialized.
------------------------------------------------------------------------
r5392 | marko | 2009-06-22 07:58:20 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: ha_innobase::check_if_incompatible_data(): When
ROW_FORMAT=DEFAULT, do not compare to get_row_type().
Without this change, fast index creation will be disabled
in recent versions of MySQL 5.1.
------------------------------------------------------------------------
r5393 | pekka | 2009-06-22 09:27:55 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: Minor changes for Hot Backup to build correctly. (The
code bracketed between #ifdef UNIV_HOTBACKUP and #endif /* UNIV_HOTBACKUP */).
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r5394 | pekka | 2009-06-22 09:46:34 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: Add functions for checking the format of tablespaces
for Hot Backup build (UNIV_HOTBACKUP defined).
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r5397 | calvin | 2009-06-23 16:59:42 -0400 (Tue, 23 Jun 2009) | 7 lines
branches/zip: change the header file path.
Change the header file path from ../storage/innobase/include/
to ../include/. In the planned 5.1 + plugin release, the source
directory of the plugin will not be in storage/innobase.
Approved by: Heikki (IM)
------------------------------------------------------------------------
r5407 | calvin | 2009-06-24 09:51:08 -0400 (Wed, 24 Jun 2009) | 4 lines
branches/zip: remove relative path of header files.
Suggested by Marko.
------------------------------------------------------------------------
r5412 | marko | 2009-06-25 06:27:08 -0400 (Thu, 25 Jun 2009) | 1 line
branches/zip: Replace a DBUG_ASSERT with ut_a to track down Issue #290.
------------------------------------------------------------------------
r5415 | marko | 2009-06-25 06:45:57 -0400 (Thu, 25 Jun 2009) | 3 lines
branches/zip: dict_index_find_cols(): Print diagnostic on name mismatch.
This addresses Bug #44571 but does not fix it.
rb://135 approved by Sunny Bains.
------------------------------------------------------------------------
r5417 | marko | 2009-06-25 08:20:56 -0400 (Thu, 25 Jun 2009) | 1 line
branches/zip: ha_innodb.cc: Move the misplaced Doxygen @file comment.
------------------------------------------------------------------------
r5418 | marko | 2009-06-25 08:55:52 -0400 (Thu, 25 Jun 2009) | 5 lines
branches/zip: Fix a race condition caused by
SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749)
When innodb_commit_concurrency is initially set nonzero,
DEFAULT would change it back to 0, triggering Bug #42101.
rb://139 approved by Heikki Tuuri.
------------------------------------------------------------------------
r5423 | calvin | 2009-06-26 16:52:52 -0400 (Fri, 26 Jun 2009) | 2 lines
branches/zip: Fix typos.
------------------------------------------------------------------------
r5425 | marko | 2009-06-29 04:52:30 -0400 (Mon, 29 Jun 2009) | 4 lines
branches/zip: ha_innobase::add_index(), ha_innobase::final_drop_index():
Start prebuilt->trx before locking the table. This should fix Issue #293
and could fix Issue #229.
Approved by Sunny (over IM).
------------------------------------------------------------------------
r5426 | marko | 2009-06-29 05:24:27 -0400 (Mon, 29 Jun 2009) | 3 lines
branches/zip: buf_page_get_gen(): Fix a race condition when reading
buf_fix_count. This could explain Issue #156.
Tested by Michael.
------------------------------------------------------------------------
r5427 | marko | 2009-06-29 05:54:53 -0400 (Mon, 29 Jun 2009) | 5 lines
branches/zip: lock_print_info_all_transactions(), buf_read_recv_pages():
Tolerate missing tablespaces (zip_size==ULINT_UNDEFINED).
buf_page_get_gen(): Add ut_ad(ut_is_2pow(zip_size)).
Issue #289, rb://136 approved by Sunny Bains
------------------------------------------------------------------------
r5428 | marko | 2009-06-29 07:06:29 -0400 (Mon, 29 Jun 2009) | 2 lines
branches/zip: row_sel_store_mysql_rec(): Add missing pointer cast.
Do not do arithmetics on void pointers.
------------------------------------------------------------------------
r5429 | marko | 2009-06-29 09:49:54 -0400 (Mon, 29 Jun 2009) | 13 lines
branches/zip: Do not crash on SET GLOBAL innodb_file_format=DEFAULT
or SET GLOBAL innodb_file_format_check=DEFAULT.
innodb_file_format.test: New test for innodb_file_format and
innodb_file_format_check.
innodb_file_format_name_validate(): Store the string in *save.
innodb_file_format_name_update(): Check the string again.
innodb_file_format_check_validate(): Store the string in *save.
innodb_file_format_check_update(): Check the string again.
Issue #282, rb://140 approved by Heikki Tuuri
------------------------------------------------------------------------
r5430 | marko | 2009-06-29 09:58:07 -0400 (Mon, 29 Jun 2009) | 2 lines
branches/zip: lock_rec_validate_page(): Add another assertion
to track down Issue #289.
------------------------------------------------------------------------
r5431 | marko | 2009-06-29 09:58:40 -0400 (Mon, 29 Jun 2009) | 1 line
branches/zip: Revert an accidentally made change in r5430 to univ.i.
------------------------------------------------------------------------
r5437 | marko | 2009-06-30 05:10:01 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: ibuf_dummy_index_free(): Beautify the comment.
------------------------------------------------------------------------
r5438 | marko | 2009-06-30 05:10:32 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: fseg_free(): Remove this unused function.
------------------------------------------------------------------------
r5439 | marko | 2009-06-30 05:15:22 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: fseg_validate(): Enclose in #ifdef UNIV_DEBUG.
This function is unused, but it could turn out to be a useful debugging aid.
------------------------------------------------------------------------
r5441 | marko | 2009-06-30 06:30:14 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: ha_delete(): Remove this unused function that was
very similar to ha_search_and_delete_if_found().
------------------------------------------------------------------------
r5442 | marko | 2009-06-30 06:45:41 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: lock_is_on_table(), lock_table_unlock(): Unused, remove.
------------------------------------------------------------------------
r5443 | marko | 2009-06-30 07:03:00 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_event_create_auto(): Unused, remove.
------------------------------------------------------------------------
r5444 | marko | 2009-06-30 07:19:49 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: que_graph_try_free(): Unused, remove.
------------------------------------------------------------------------
r5445 | marko | 2009-06-30 07:28:11 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: row_build_row_ref_from_row(): Unused, remove.
------------------------------------------------------------------------
r5446 | marko | 2009-06-30 07:35:45 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: srv_que_round_robin(), srv_que_task_enqueue(): Unused, remove.
------------------------------------------------------------------------
r5447 | marko | 2009-06-30 07:37:58 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: srv_que_task_queue_check(): Unused, remove.
------------------------------------------------------------------------
r5448 | marko | 2009-06-30 07:56:36 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: mem_heap_cat(): Unused, remove.
------------------------------------------------------------------------
r5449 | marko | 2009-06-30 08:00:50 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: innobase_start_or_create_for_mysql():
Invoke os_get_os_version() at most once.
------------------------------------------------------------------------
r5450 | marko | 2009-06-30 08:02:20 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_file_close_no_error_handling(): Unused, remove.
------------------------------------------------------------------------
r5451 | marko | 2009-06-30 08:09:49 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: page_set_max_trx_id(): Make the code compile
with UNIV_HOTBACKUP.
------------------------------------------------------------------------
r5452 | marko | 2009-06-30 08:10:26 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: os_file_close_no_error_handling(): Restore,
as this function is used within InnoDB Hot Backup.
------------------------------------------------------------------------
r5453 | marko | 2009-06-30 08:14:01 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_process_set_priority_boost(): Unused, remove.
------------------------------------------------------------------------
r5454 | marko | 2009-06-30 08:42:52 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: Replace a non-ASCII character
(ISO 8859-1 encoded U+00AD SOFT HYPHEN) with a cheap ASCII substitute.
------------------------------------------------------------------------
r5456 | inaam | 2009-06-30 14:21:09 -0400 (Tue, 30 Jun 2009) | 4 lines
branches/zip
Non functional change. s/Percona/Percona Inc./
------------------------------------------------------------------------
r5470 | vasil | 2009-07-02 09:12:36 -0400 (Thu, 02 Jul 2009) | 16 lines
branches/zip:
Use PAUSE instruction inside spinloop if it is available.
The patch was originally developed by Mikael Ronstrom <mikael@mysql.com>
and can be found here:
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2768
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2771
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2772
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2774
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2777
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2799
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2800
Approved by: Heikki (rb://137)
------------------------------------------------------------------------
r5481 | vasil | 2009-07-06 13:16:32 -0400 (Mon, 06 Jul 2009) | 4 lines
branches/zip:
Remove unnecessary quotes and simplify plug.in.
------------------------------------------------------------------------
r5482 | calvin | 2009-07-06 18:36:35 -0400 (Mon, 06 Jul 2009) | 5 lines
branches/zip: add COPYING files for Percona and Sun Micro.
1.0.4 contains patches based on contributions from Percona
and Sun Microsystems.
------------------------------------------------------------------------
r5483 | calvin | 2009-07-07 05:36:43 -0400 (Tue, 07 Jul 2009) | 3 lines
branches/zip: add IB_HAVE_PAUSE_INSTRUCTION to CMake.
Windows will support PAUSE instruction by default.
------------------------------------------------------------------------
r5484 | inaam | 2009-07-07 18:57:14 -0400 (Tue, 07 Jul 2009) | 13 lines
branches/zip rb://126
Based on contribution from Google Inc.
This patch introduces a new parameter innodb_io_capacity to control the
rate at which master threads performs various tasks. The default value
is 200 and higher values imply more aggressive flushing and ibuf merges
from within the master thread.
This patch also changes the ibuf merge from synchronous to asynchronous.
Another minor change is not to force the master thread to wait for a
log flush to complete every second.
Approved by: Heikki
------------------------------------------------------------------------
r5485 | inaam | 2009-07-07 19:00:49 -0400 (Tue, 07 Jul 2009) | 18 lines
branches/zip rb://138
The current implementation is to try to flush the neighbors of every
page that we flush. This patch makes the following distinction:
1) If the flush is from flush_list AND
2) If the flush is intended to move the oldest_modification LSN ahead
(this happens when a user thread sees little space in the log file and
attempts to flush pages from the buffer pool so that a checkpoint can
be made)
THEN
Do not try to flush the neighbors. Just focus on flushing dirty pages at
the end of flush_list
Approved by: Heikki
------------------------------------------------------------------------
r5486 | inaam | 2009-07-08 12:11:40 -0400 (Wed, 08 Jul 2009) | 29 lines
branches/zip rb://133
This patch introduces heuristics based flushing rate of dirty pages to
avoid IO bursts at checkpoint.
1) log_capacity / log_generated per second gives us number of seconds
in which ALL dirty pages need to be flushed. Based on this rough
assumption we can say that
n_dirty_pages / (log_capacity / log_generation_rate) = desired_flush_rate
2) We use weighted averages (hard coded to 20 seconds) of
log_generation_rate to avoid resonance.
3) From the desired_flush_rate we subtract the number of pages that have
been flushed due to LRU flushing. That gives us pages that we should
flush as part of flush_list cleanup. And that is the number (capped by
maximum io_capacity) that we try to flush from the master thread.
Knobs:
======
innodb_adaptive_flushing: boolean, global, dynamic, default TRUE.
Since this heuristic is very experimental and has the potential to
dramatically change the IO pattern I think it is a good idea to leave a
knob to turn it off.
Approved by: Heikki
------------------------------------------------------------------------
r5487 | calvin | 2009-07-08 12:42:28 -0400 (Wed, 08 Jul 2009) | 7 lines
branches/zip: fix PAUSE instruction patch on Windows
The original PAUSE instruction patch (r5470) does not
compile on Windows. Also, there is an elegant way of
doing it on Windows - YieldProcessor().
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r5489 | vasil | 2009-07-10 05:02:22 -0400 (Fri, 10 Jul 2009) | 9 lines
branches/zip:
Change the defaults for
innodb_sync_spin_loops: 20 -> 30
innodb_spin_wait_delay: 5 -> 6
This change was proposed by Sun/MySQL based on their performance testing,
see https://svn.innodb.com/innobase/Release_tasks_for_InnoDB_Plugin_V1.0.4
------------------------------------------------------------------------
r5490 | vasil | 2009-07-10 05:04:20 -0400 (Fri, 10 Jul 2009) | 4 lines
branches/zip:
Add ChangeLog entry for 5489.
------------------------------------------------------------------------
r5491 | calvin | 2009-07-10 12:19:17 -0400 (Fri, 10 Jul 2009) | 6 lines
branches/zip: add copyright info to files related to PAUSE
instruction patch, contributed by Sun Microsystems.
------------------------------------------------------------------------
r5492 | calvin | 2009-07-10 17:47:34 -0400 (Fri, 10 Jul 2009) | 5 lines
branches/zip: add ChangeLog entries for r5484-r5486.
------------------------------------------------------------------------
r5494 | vasil | 2009-07-13 03:37:35 -0400 (Mon, 13 Jul 2009) | 6 lines
branches/zip:
Restore the original value of innodb_sync_spin_loops at the end, previously
the test assumed that setting it to 20 will do this, but now the default is
30 and MTR's internal check failed.
------------------------------------------------------------------------
r5495 | inaam | 2009-07-13 11:48:45 -0400 (Mon, 13 Jul 2009) | 5 lines
branches/zip rb://138 (REVERT)
Revert the flush neighbors patch as it shows regression in
the benchmarks run by Michael.
------------------------------------------------------------------------
r5496 | inaam | 2009-07-13 14:04:57 -0400 (Mon, 13 Jul 2009) | 4 lines
branches/zip
Fixed warnings on windows where ulint != ib_uint64_t
------------------------------------------------------------------------
r5497 | calvin | 2009-07-13 15:01:00 -0400 (Mon, 13 Jul 2009) | 9 lines
branches/zip: fix run-time symbols clash on Solaris.
This patch is from Sergey Vojtovich of Sun Microsystems,
to fix run-time symbols clash on Solaris with older C++
compiler:
- when finding out a way to hide symbols, make decision basing
on compiler, not operating system.
- Sun Studio supports __hidden declaration specifier for this
purpose.
------------------------------------------------------------------------
r5498 | vasil | 2009-07-14 03:16:18 -0400 (Tue, 14 Jul 2009) | 92 lines
branches/zip: Merge r5341:5497 from branches/5.1, skipping:
c5419 because it is merge from branches/zip into branches/5.1
c5466 because the source code has been adjusted to match the MySQL
behavior and the innodb-autoinc test does not fail in branches/zip,
if c5466 is merged, then innodb-autoinc starts failing, Sunny suggested
not to merge c5466.
and resolving conflicts in c5410, c5440, c5488:
------------------------------------------------------------------------
r5410 | marko | 2009-06-24 22:26:34 +0300 (Wed, 24 Jun 2009) | 2 lines
Changed paths:
M /branches/5.1/include/trx0sys.ic
M /branches/5.1/trx/trx0purge.c
M /branches/5.1/trx/trx0sys.c
M /branches/5.1/trx/trx0undo.c
branches/5.1: Add missing #include "mtr0log.h" to avoid warnings
when compiling with -DUNIV_MUST_NOT_INLINE.
------------------------------------------------------------------------
r5419 | marko | 2009-06-25 16:11:57 +0300 (Thu, 25 Jun 2009) | 18 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb_bug42101-nonzero.result
M /branches/5.1/mysql-test/innodb_bug42101-nonzero.test
M /branches/5.1/mysql-test/innodb_bug42101.result
M /branches/5.1/mysql-test/innodb_bug42101.test
branches/5.1: Merge r5418 from branches/zip:
------------------------------------------------------------------------
r5418 | marko | 2009-06-25 15:55:52 +0300 (Thu, 25 Jun 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
M /branches/zip/mysql-test/innodb_bug42101.result
M /branches/zip/mysql-test/innodb_bug42101.test
branches/zip: Fix a race condition caused by
SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749)
When innodb_commit_concurrency is initially set nonzero,
DEFAULT would change it back to 0, triggering Bug #42101.
rb://139 approved by Heikki Tuuri.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5440 | vasil | 2009-06-30 13:04:29 +0300 (Tue, 30 Jun 2009) | 8 lines
Changed paths:
M /branches/5.1/fil/fil0fil.c
branches/5.1:
Fix Bug#45814 URL reference in InnoDB server errors needs adjusting to match documentation
by changing the URL from
http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting.html to
http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting-datadict.html
------------------------------------------------------------------------
r5466 | vasil | 2009-07-02 10:46:45 +0300 (Thu, 02 Jul 2009) | 6 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1:
Adjust the failing innodb-autoinc test to conform to the latest behavior
of the MySQL code. The idea and the comment in innodb-autoinc.test come
from Sunny.
------------------------------------------------------------------------
r5488 | vasil | 2009-07-09 19:16:44 +0300 (Thu, 09 Jul 2009) | 13 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug21704.result
A /branches/5.1/mysql-test/innodb_bug21704.test
branches/5.1:
Fix Bug#21704 Renaming column does not update FK definition
by checking whether a column that participates in a FK definition is being
renamed and denying the ALTER in this case.
The patch was originally developed by Davi Arnaut <Davi.Arnaut@Sun.COM>:
http://lists.mysql.com/commits/77714
and was later adjusted to conform to InnoDB coding style by me (Vasil),
I also added some more comments and moved the bug specific mysql-test to
a separate file to make it more manageable and flexible.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5499 | calvin | 2009-07-14 12:55:10 -0400 (Tue, 14 Jul 2009) | 3 lines
branches/zip: add a missing file in Makefile.am
This change was suggested by MySQL.
------------------------------------------------------------------------
r5500 | calvin | 2009-07-14 13:03:26 -0400 (Tue, 14 Jul 2009) | 3 lines
branches/zip: minor change
Remove an extra "with".
------------------------------------------------------------------------
r5501 | vasil | 2009-07-14 13:58:15 -0400 (Tue, 14 Jul 2009) | 5 lines
branches/zip:
Add @ZLIB_INCLUDES@ so that the InnoDB Plugin picks up the same zlib.h
header file that is eventually used by mysqld.
------------------------------------------------------------------------
r5502 | vasil | 2009-07-14 13:59:59 -0400 (Tue, 14 Jul 2009) | 4 lines
branches/zip:
Add include/ut0auxconf.h to noinst_HEADERS
------------------------------------------------------------------------
r5503 | vasil | 2009-07-14 14:16:11 -0400 (Tue, 14 Jul 2009) | 8 lines
branches/zip:
Non-functional change:
put files in noinst_HEADERS and libinnobase_a_SOURCES one per line and sort
alphabetically, so it is easier to find if a file is there or not and
also diffs show exactly the added or removed file instead of surrounding
lines too.
------------------------------------------------------------------------
r5504 | calvin | 2009-07-15 04:58:44 -0400 (Wed, 15 Jul 2009) | 6 lines
branches/zip: fix compile errors on Win64
Both srv_read_ahead_factor and srv_io_capacity should
be defined as ulong.
Approved by: Sunny
------------------------------------------------------------------------
r5508 | calvin | 2009-07-16 09:40:47 -0400 (Thu, 16 Jul 2009) | 16 lines
branches/zip: Support inlining of functions and prefetch with
Sun Studio
Those changes are contributed by Sun/MySQL. Two sets of changes
in this patch when Sun Studio is used:
- Explicit inlining of functions
- Prefetch Support
This patch has been tested by Sunny with the plugin statically
built in. Since we've never built the plugin as a dynamically
loaded module on Solaris, it is a separate task to change
plug.in.
rb://142
Approved by: Heikki
------------------------------------------------------------------------
r5509 | calvin | 2009-07-16 09:45:28 -0400 (Thu, 16 Jul 2009) | 2 lines
branches/zip: add ChangeLog entry for r5508.
------------------------------------------------------------------------
r5512 | sunny | 2009-07-19 19:52:48 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Remove unused extern ref to timed_mutexes.
------------------------------------------------------------------------
r5513 | sunny | 2009-07-19 19:58:43 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Undo r5512
------------------------------------------------------------------------
r5514 | sunny | 2009-07-19 20:08:49 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Only use my_bool when UNIV_HOTBACKUP is not defined.
------------------------------------------------------------------------
r5515 | sunny | 2009-07-20 03:29:14 -0400 (Mon, 20 Jul 2009) | 2 lines
branches/zip: The dict_table_t::autoinc_mutex field is not used in HotBackup.
------------------------------------------------------------------------
r5516 | sunny | 2009-07-20 03:46:05 -0400 (Mon, 20 Jul 2009) | 4 lines
branches/zip: Make this file usable from within HotBackup. A new file has
been introduced called hb_univ.i. This file should have all the HotBackup
specific configuration.
------------------------------------------------------------------------
r5517 | sunny | 2009-07-20 03:55:11 -0400 (Mon, 20 Jul 2009) | 2 lines
Add /* UNIV_HOTBACK */
------------------------------------------------------------------------
r5519 | vasil | 2009-07-20 04:45:18 -0400 (Mon, 20 Jul 2009) | 31 lines
branches/zip: Merge r5497:5518 from branches/5.1:
------------------------------------------------------------------------
r5518 | vasil | 2009-07-20 11:29:47 +0300 (Mon, 20 Jul 2009) | 22 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Merge a change from MySQL:
------------------------------------------------------------
revno: 2874.2.1
committer: Anurag Shekhar <anurag.shekhar@sun.com>
branch nick: mysql-5.1-bugteam-windows-warning
timestamp: Wed 2009-05-13 15:41:24 +0530
message:
Bug #39802 On Windows, 32-bit time_t should be enforced
This patch fixes compilation warning, "conversion from 'time_t' to 'ulong',
possible loss of data".
The fix is to typecast time_t to ulong before assigning it to ulong.
Backported this from 6.0-bugteam tree.
modified:
storage/archive/ha_archive.cc
storage/federated/ha_federated.cc
storage/innobase/handler/ha_innodb.cc
storage/myisam/ha_myisam.cc
------------------------------------------------------------------------
------------------------------------------------------------------------
r5520 | vasil | 2009-07-20 04:51:47 -0400 (Mon, 20 Jul 2009) | 4 lines
branches/zip:
Add ChangeLog entries for r5498 and r5519.
------------------------------------------------------------------------
r5524 | inaam | 2009-07-20 12:23:15 -0400 (Mon, 20 Jul 2009) | 9 lines
branches/zip
Change the read ahead parameter name to innodb_read_ahead_threshold.
Change the meaning of this parameter to signify the number of pages
that must be sequentially accessed for InnoDB to trigger a readahead
request.
Suggested by: Ken
------------------------------------------------------------------------
2009-07-21 02:09:29 +02:00
|
|
|
and log i/o. Also creates one array each for read and write where each
|
2016-08-12 10:17:45 +02:00
|
|
|
array is divided logically into n_readers and n_writers
|
branches/innodb+: Merge revisions 5144:5524 from branches/zip
------------------------------------------------------------------------
r5147 | marko | 2009-05-27 06:55:14 -0400 (Wed, 27 May 2009) | 1 line
branches/zip: ibuf0ibuf.c: Improve a comment.
------------------------------------------------------------------------
r5149 | marko | 2009-05-27 07:46:42 -0400 (Wed, 27 May 2009) | 34 lines
branches/zip: Merge revisions 4994:5148 from branches/5.1:
------------------------------------------------------------------------
r5126 | vasil | 2009-05-26 16:57:12 +0300 (Tue, 26 May 2009) | 9 lines
branches/5.1:
Preparation for the fix of
Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Non-functional change: move FSP_* macros from fsp0fsp.h to a new file
fsp0types.h. This is needed in order to be able to use FSP_EXTENT_SIZE
in mtr0log.ic.
------------------------------------------------------------------------
r5127 | vasil | 2009-05-26 17:05:43 +0300 (Tue, 26 May 2009) | 9 lines
branches/5.1:
Preparation for the fix of
Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Do not include unnecessary headers mtr0log.h and fut0lst.h in trx0sys.h
and include fsp0fsp.h just before it is needed. This is needed in order
to be able to use TRX_SYS_SPACE in mtr0log.ic.
------------------------------------------------------------------------
r5128 | vasil | 2009-05-26 17:26:37 +0300 (Tue, 26 May 2009) | 7 lines
branches/5.1:
Fix Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Do not write redo log for the pages in the doublewrite buffer. Also, do not
make a dummy change to the page because this is not needed.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5169 | marko | 2009-05-28 03:21:55 -0400 (Thu, 28 May 2009) | 1 line
branches/zip: mtr0mtr.h: Add Doxygen comments for the redo log entry types.
------------------------------------------------------------------------
r5176 | marko | 2009-05-28 07:14:02 -0400 (Thu, 28 May 2009) | 1 line
branches/zip: Correct a debug assertion that was added in r5125.
------------------------------------------------------------------------
r5201 | marko | 2009-06-01 06:35:25 -0400 (Mon, 01 Jun 2009) | 2 lines
branches/zip: Clean up some comments.
Make the rec parameter of mlog_open_and_write_index() const.
------------------------------------------------------------------------
r5234 | marko | 2009-06-03 08:26:41 -0400 (Wed, 03 Jun 2009) | 44 lines
branches/zip: Merge revisions 5148:5233 from branches/5.1:
------------------------------------------------------------------------
r5150 | vasil | 2009-05-27 18:56:03 +0300 (Wed, 27 May 2009) | 4 lines
branches/5.1:
Whitespace fixup.
------------------------------------------------------------------------
r5191 | vasil | 2009-05-30 17:46:05 +0300 (Sat, 30 May 2009) | 19 lines
branches/5.1:
Merge a change from MySQL (this fixes the failing innodb_mysql test):
------------------------------------------------------------
revno: 1810.3894.10
committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
branch nick: mysql-5.0-bugteam
timestamp: Tue 2009-05-19 11:32:21 +0500
message:
Bug#39793 Foreign keys not constructed when column has a '#' in a comment or default value
Internal InnoDN FK parser does not recognize '\'' as quotation symbol.
Suggested fix is to add '\'' symbol check for quotation condition
(dict_strip_comments() function).
modified:
innobase/dict/dict0dict.c
mysql-test/r/innodb_mysql.result
mysql-test/t/innodb_mysql.test
------------------------------------------------------------------------
r5233 | marko | 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) | 11 lines
branches/5.1: Merge the test case from r5232 from branches/5.0:
------------------------------------------------------------------------
r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines
branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565
(Update Query Results in "1 Row Affected" But Should Be "Zero Rows").
Also, add a test case for Bug #40565.
rb://128 approved by Heikki Tuuri
------------------------------------------------------------------------
------------------------------------------------------------------------
------------------------------------------------------------------------
r5250 | marko | 2009-06-04 02:58:23 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Add Doxygen comments to the rest of buf0*.
------------------------------------------------------------------------
r5251 | marko | 2009-06-04 02:59:51 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Replace <= in a function comment.
------------------------------------------------------------------------
r5253 | marko | 2009-06-04 06:37:35 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Add missing Doxygen comments for page0zip.
------------------------------------------------------------------------
r5261 | vasil | 2009-06-05 11:13:31 -0400 (Fri, 05 Jun 2009) | 15 lines
branches/zip:
Fix Mantis Issue#244 fix bug in linear read ahead (no check on access pattern)
The changes are:
1) Take into account access pattern when deciding whether or not to do linear
read ahead.
2) Expose a knob innodb_read_ahead_factor = [0-64] default (8), dynamic,
global to control linear read ahead behvior
3) Disable random read ahead. Keep the code for now.
Submitted by: Inaam (rb://122)
Approved by: Heikki (rb://122)
------------------------------------------------------------------------
r5262 | vasil | 2009-06-05 12:04:25 -0400 (Fri, 05 Jun 2009) | 22 lines
branches/zip:
Enable functionality to have multiple background io helper threads.
This patch is based on percona contributions.
More details about this patch will be written at:
https://svn.innodb.com/innobase/MultipleBackgroundThreads
The patch essentially does the following:
expose following knobs:
innodb_read_io_threads = [1 - 64] default 1
innodb_write_io_threads = [1 - 64] default 1
deprecate innodb_file_io_threads (this parameter was relevant only on windows)
Internally it allows multiple segments for read and write IO request arrays
where one thread works on one segement.
Submitted by: Inaam (rb://124)
Approved by: Heikki (rb://124)
------------------------------------------------------------------------
r5263 | vasil | 2009-06-05 12:19:37 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Whitespace cleanup.
------------------------------------------------------------------------
r5264 | vasil | 2009-06-05 12:26:58 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5261.
------------------------------------------------------------------------
r5265 | vasil | 2009-06-05 12:34:11 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5262.
------------------------------------------------------------------------
r5268 | inaam | 2009-06-08 12:18:21 -0400 (Mon, 08 Jun 2009) | 7 lines
branches/zip
Non functional change:
Added legal notices acknowledging percona contribution to the multiple
IO helper threads patch i.e.: r5262
------------------------------------------------------------------------
r5283 | inaam | 2009-06-09 13:46:29 -0400 (Tue, 09 Jun 2009) | 9 lines
branches/zip
rb://130
Enable Group Commit functionality that was broken in 5.0 when
distributed transactions were introduced.
Reviewed by: Heikki
------------------------------------------------------------------------
r5319 | marko | 2009-06-11 04:40:33 -0400 (Thu, 11 Jun 2009) | 3 lines
branches/zip: Declare os_thread_id_t as unsigned long,
because ulint is wrong on Win64.
Pointed out by Vladislav Vaintroub <wlad@sun.com>.
------------------------------------------------------------------------
r5320 | inaam | 2009-06-11 09:15:41 -0400 (Thu, 11 Jun 2009) | 14 lines
branches/zip rb://131
This patch changes the following defaults:
max_dirty_pages_pct: default from 90 to 75. max allowed from 100 to 99
additional_mem_pool_size: default from 1 to 8 MB
buffer_pool_size: default from 8 to 128 MB
log_buffer_size: default from 1 to 8 MB
read_io_threads/write_io_threads: default from 1 to 4
The log file sizes are untouched because of upgrade issues
Reviewed by: Heikki
------------------------------------------------------------------------
r5330 | marko | 2009-06-16 04:08:59 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: buf_page_get_gen(): Reduce mutex holding time by adjusting
buf_pool->n_pend_unzip while only holding buf_pool_mutex.
------------------------------------------------------------------------
r5331 | marko | 2009-06-16 05:00:48 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: buf_page_get_zip(): Eliminate a buf_page_get_mutex() call.
The function must switch on the block state anyway.
------------------------------------------------------------------------
r5332 | vasil | 2009-06-16 05:03:27 -0400 (Tue, 16 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entries for r5283 and r5320.
------------------------------------------------------------------------
r5333 | marko | 2009-06-16 05:27:46 -0400 (Tue, 16 Jun 2009) | 1 line
branches/zip: buf_page_io_query(): Remove unused function.
------------------------------------------------------------------------
r5335 | marko | 2009-06-16 09:23:10 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: innodb.test: Adjust the tolerance of
innodb_buffer_pool_pages_total for r5320.
------------------------------------------------------------------------
r5342 | marko | 2009-06-17 06:15:32 -0400 (Wed, 17 Jun 2009) | 60 lines
branches/zip: Merge revisions 5233:5341 from branches/5.1:
------------------------------------------------------------------------
r5233 | marko | 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) | 11 lines
branches/5.1: Merge the test case from r5232 from branches/5.0:
------------------------------------------------------------------------
r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines
branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565
(Update Query Results in "1 Row Affected" But Should Be "Zero Rows").
Also, add a test case for Bug #40565.
rb://128 approved by Heikki Tuuri
------------------------------------------------------------------------
------------------------------------------------------------------------
r5243 | sunny | 2009-06-04 03:17:14 +0300 (Thu, 04 Jun 2009) | 14 lines
branches/5.1: When the InnoDB and MySQL data dictionaries go out of sync, before
the bug fix we would assert on missing autoinc columns. With this fix we allow
MySQL to open the table but set the next autoinc value for the column to the
MAX value. This effectively disables the next value generation. INSERTs will
fail with a generic AUTOINC failure. However, the user should be able to
read/dump the table, set the column values explicitly, use ALTER TABLE to
set the next autoinc value and/or sync the two data dictionaries to resume
normal operations.
Fix Bug#44030 Error: (1500) Couldn't read the MAX(ID) autoinc value from the
index (PRIMARY)
rb://118
------------------------------------------------------------------------
r5252 | sunny | 2009-06-04 10:16:24 +0300 (Thu, 04 Jun 2009) | 2 lines
branches/5.1: The version of the result file checked in was broken in r5243.
------------------------------------------------------------------------
r5259 | vasil | 2009-06-05 10:29:16 +0300 (Fri, 05 Jun 2009) | 7 lines
branches/5.1:
Remove the word "Error" from the printout because the mysqltest suite
interprets it as an error and thus the innodb-autoinc test fails.
Approved by: Sunny (via IM)
------------------------------------------------------------------------
r5339 | marko | 2009-06-17 11:01:37 +0300 (Wed, 17 Jun 2009) | 2 lines
branches/5.1: Add missing #include "mtr0log.h" so that the code compiles
with -DUNIV_MUST_NOT_INLINE.
(null merge; this had already been committed in branches/zip)
------------------------------------------------------------------------
r5340 | marko | 2009-06-17 12:11:49 +0300 (Wed, 17 Jun 2009) | 4 lines
branches/5.1: row_unlock_for_mysql(): When the clustered index is unknown,
refuse to unlock the record.
(Bug #45357, caused by the fix of Bug #39320).
rb://132 approved by Sunny Bains.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5343 | vasil | 2009-06-17 08:56:12 -0400 (Wed, 17 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5342.
------------------------------------------------------------------------
r5344 | marko | 2009-06-17 09:03:45 -0400 (Wed, 17 Jun 2009) | 1 line
branches/zip: row_merge_read_rec(): Fix a UNIV_DEBUG bug (Bug #45426)
------------------------------------------------------------------------
r5391 | marko | 2009-06-22 05:31:35 -0400 (Mon, 22 Jun 2009) | 2 lines
branches/zip: buf_page_get_zip(): Fix a bogus warning about
block_mutex being possibly uninitialized.
------------------------------------------------------------------------
r5392 | marko | 2009-06-22 07:58:20 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: ha_innobase::check_if_incompatible_data(): When
ROW_FORMAT=DEFAULT, do not compare to get_row_type().
Without this change, fast index creation will be disabled
in recent versions of MySQL 5.1.
------------------------------------------------------------------------
r5393 | pekka | 2009-06-22 09:27:55 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: Minor changes for Hot Backup to build correctly. (The
code bracketed between #ifdef UNIV_HOTBACKUP and #endif /* UNIV_HOTBACKUP */).
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r5394 | pekka | 2009-06-22 09:46:34 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: Add functions for checking the format of tablespaces
for Hot Backup build (UNIV_HOTBACKUP defined).
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r5397 | calvin | 2009-06-23 16:59:42 -0400 (Tue, 23 Jun 2009) | 7 lines
branches/zip: change the header file path.
Change the header file path from ../storage/innobase/include/
to ../include/. In the planned 5.1 + plugin release, the source
directory of the plugin will not be in storage/innobase.
Approved by: Heikki (IM)
------------------------------------------------------------------------
r5407 | calvin | 2009-06-24 09:51:08 -0400 (Wed, 24 Jun 2009) | 4 lines
branches/zip: remove relative path of header files.
Suggested by Marko.
------------------------------------------------------------------------
r5412 | marko | 2009-06-25 06:27:08 -0400 (Thu, 25 Jun 2009) | 1 line
branches/zip: Replace a DBUG_ASSERT with ut_a to track down Issue #290.
------------------------------------------------------------------------
r5415 | marko | 2009-06-25 06:45:57 -0400 (Thu, 25 Jun 2009) | 3 lines
branches/zip: dict_index_find_cols(): Print diagnostic on name mismatch.
This addresses Bug #44571 but does not fix it.
rb://135 approved by Sunny Bains.
------------------------------------------------------------------------
r5417 | marko | 2009-06-25 08:20:56 -0400 (Thu, 25 Jun 2009) | 1 line
branches/zip: ha_innodb.cc: Move the misplaced Doxygen @file comment.
------------------------------------------------------------------------
r5418 | marko | 2009-06-25 08:55:52 -0400 (Thu, 25 Jun 2009) | 5 lines
branches/zip: Fix a race condition caused by
SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749)
When innodb_commit_concurrency is initially set nonzero,
DEFAULT would change it back to 0, triggering Bug #42101.
rb://139 approved by Heikki Tuuri.
------------------------------------------------------------------------
r5423 | calvin | 2009-06-26 16:52:52 -0400 (Fri, 26 Jun 2009) | 2 lines
branches/zip: Fix typos.
------------------------------------------------------------------------
r5425 | marko | 2009-06-29 04:52:30 -0400 (Mon, 29 Jun 2009) | 4 lines
branches/zip: ha_innobase::add_index(), ha_innobase::final_drop_index():
Start prebuilt->trx before locking the table. This should fix Issue #293
and could fix Issue #229.
Approved by Sunny (over IM).
------------------------------------------------------------------------
r5426 | marko | 2009-06-29 05:24:27 -0400 (Mon, 29 Jun 2009) | 3 lines
branches/zip: buf_page_get_gen(): Fix a race condition when reading
buf_fix_count. This could explain Issue #156.
Tested by Michael.
------------------------------------------------------------------------
r5427 | marko | 2009-06-29 05:54:53 -0400 (Mon, 29 Jun 2009) | 5 lines
branches/zip: lock_print_info_all_transactions(), buf_read_recv_pages():
Tolerate missing tablespaces (zip_size==ULINT_UNDEFINED).
buf_page_get_gen(): Add ut_ad(ut_is_2pow(zip_size)).
Issue #289, rb://136 approved by Sunny Bains
------------------------------------------------------------------------
r5428 | marko | 2009-06-29 07:06:29 -0400 (Mon, 29 Jun 2009) | 2 lines
branches/zip: row_sel_store_mysql_rec(): Add missing pointer cast.
Do not do arithmetics on void pointers.
------------------------------------------------------------------------
r5429 | marko | 2009-06-29 09:49:54 -0400 (Mon, 29 Jun 2009) | 13 lines
branches/zip: Do not crash on SET GLOBAL innodb_file_format=DEFAULT
or SET GLOBAL innodb_file_format_check=DEFAULT.
innodb_file_format.test: New test for innodb_file_format and
innodb_file_format_check.
innodb_file_format_name_validate(): Store the string in *save.
innodb_file_format_name_update(): Check the string again.
innodb_file_format_check_validate(): Store the string in *save.
innodb_file_format_check_update(): Check the string again.
Issue #282, rb://140 approved by Heikki Tuuri
------------------------------------------------------------------------
r5430 | marko | 2009-06-29 09:58:07 -0400 (Mon, 29 Jun 2009) | 2 lines
branches/zip: lock_rec_validate_page(): Add another assertion
to track down Issue #289.
------------------------------------------------------------------------
r5431 | marko | 2009-06-29 09:58:40 -0400 (Mon, 29 Jun 2009) | 1 line
branches/zip: Revert an accidentally made change in r5430 to univ.i.
------------------------------------------------------------------------
r5437 | marko | 2009-06-30 05:10:01 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: ibuf_dummy_index_free(): Beautify the comment.
------------------------------------------------------------------------
r5438 | marko | 2009-06-30 05:10:32 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: fseg_free(): Remove this unused function.
------------------------------------------------------------------------
r5439 | marko | 2009-06-30 05:15:22 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: fseg_validate(): Enclose in #ifdef UNIV_DEBUG.
This function is unused, but it could turn out to be a useful debugging aid.
------------------------------------------------------------------------
r5441 | marko | 2009-06-30 06:30:14 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: ha_delete(): Remove this unused function that was
very similar to ha_search_and_delete_if_found().
------------------------------------------------------------------------
r5442 | marko | 2009-06-30 06:45:41 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: lock_is_on_table(), lock_table_unlock(): Unused, remove.
------------------------------------------------------------------------
r5443 | marko | 2009-06-30 07:03:00 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_event_create_auto(): Unused, remove.
------------------------------------------------------------------------
r5444 | marko | 2009-06-30 07:19:49 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: que_graph_try_free(): Unused, remove.
------------------------------------------------------------------------
r5445 | marko | 2009-06-30 07:28:11 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: row_build_row_ref_from_row(): Unused, remove.
------------------------------------------------------------------------
r5446 | marko | 2009-06-30 07:35:45 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: srv_que_round_robin(), srv_que_task_enqueue(): Unused, remove.
------------------------------------------------------------------------
r5447 | marko | 2009-06-30 07:37:58 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: srv_que_task_queue_check(): Unused, remove.
------------------------------------------------------------------------
r5448 | marko | 2009-06-30 07:56:36 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: mem_heap_cat(): Unused, remove.
------------------------------------------------------------------------
r5449 | marko | 2009-06-30 08:00:50 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: innobase_start_or_create_for_mysql():
Invoke os_get_os_version() at most once.
------------------------------------------------------------------------
r5450 | marko | 2009-06-30 08:02:20 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_file_close_no_error_handling(): Unused, remove.
------------------------------------------------------------------------
r5451 | marko | 2009-06-30 08:09:49 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: page_set_max_trx_id(): Make the code compile
with UNIV_HOTBACKUP.
------------------------------------------------------------------------
r5452 | marko | 2009-06-30 08:10:26 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: os_file_close_no_error_handling(): Restore,
as this function is used within InnoDB Hot Backup.
------------------------------------------------------------------------
r5453 | marko | 2009-06-30 08:14:01 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_process_set_priority_boost(): Unused, remove.
------------------------------------------------------------------------
r5454 | marko | 2009-06-30 08:42:52 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: Replace a non-ASCII character
(ISO 8859-1 encoded U+00AD SOFT HYPHEN) with a cheap ASCII substitute.
------------------------------------------------------------------------
r5456 | inaam | 2009-06-30 14:21:09 -0400 (Tue, 30 Jun 2009) | 4 lines
branches/zip
Non functional change. s/Percona/Percona Inc./
------------------------------------------------------------------------
r5470 | vasil | 2009-07-02 09:12:36 -0400 (Thu, 02 Jul 2009) | 16 lines
branches/zip:
Use PAUSE instruction inside spinloop if it is available.
The patch was originally developed by Mikael Ronstrom <mikael@mysql.com>
and can be found here:
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2768
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2771
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2772
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2774
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2777
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2799
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2800
Approved by: Heikki (rb://137)
------------------------------------------------------------------------
r5481 | vasil | 2009-07-06 13:16:32 -0400 (Mon, 06 Jul 2009) | 4 lines
branches/zip:
Remove unnecessary quotes and simplify plug.in.
------------------------------------------------------------------------
r5482 | calvin | 2009-07-06 18:36:35 -0400 (Mon, 06 Jul 2009) | 5 lines
branches/zip: add COPYING files for Percona and Sun Micro.
1.0.4 contains patches based on contributions from Percona
and Sun Microsystems.
------------------------------------------------------------------------
r5483 | calvin | 2009-07-07 05:36:43 -0400 (Tue, 07 Jul 2009) | 3 lines
branches/zip: add IB_HAVE_PAUSE_INSTRUCTION to CMake.
Windows will support PAUSE instruction by default.
------------------------------------------------------------------------
r5484 | inaam | 2009-07-07 18:57:14 -0400 (Tue, 07 Jul 2009) | 13 lines
branches/zip rb://126
Based on contribution from Google Inc.
This patch introduces a new parameter innodb_io_capacity to control the
rate at which master threads performs various tasks. The default value
is 200 and higher values imply more aggressive flushing and ibuf merges
from within the master thread.
This patch also changes the ibuf merge from synchronous to asynchronous.
Another minor change is not to force the master thread to wait for a
log flush to complete every second.
Approved by: Heikki
------------------------------------------------------------------------
r5485 | inaam | 2009-07-07 19:00:49 -0400 (Tue, 07 Jul 2009) | 18 lines
branches/zip rb://138
The current implementation is to try to flush the neighbors of every
page that we flush. This patch makes the following distinction:
1) If the flush is from flush_list AND
2) If the flush is intended to move the oldest_modification LSN ahead
(this happens when a user thread sees little space in the log file and
attempts to flush pages from the buffer pool so that a checkpoint can
be made)
THEN
Do not try to flush the neighbors. Just focus on flushing dirty pages at
the end of flush_list
Approved by: Heikki
------------------------------------------------------------------------
r5486 | inaam | 2009-07-08 12:11:40 -0400 (Wed, 08 Jul 2009) | 29 lines
branches/zip rb://133
This patch introduces heuristics based flushing rate of dirty pages to
avoid IO bursts at checkpoint.
1) log_capacity / log_generated per second gives us number of seconds
in which ALL dirty pages need to be flushed. Based on this rough
assumption we can say that
n_dirty_pages / (log_capacity / log_generation_rate) = desired_flush_rate
2) We use weighted averages (hard coded to 20 seconds) of
log_generation_rate to avoid resonance.
3) From the desired_flush_rate we subtract the number of pages that have
been flushed due to LRU flushing. That gives us pages that we should
flush as part of flush_list cleanup. And that is the number (capped by
maximum io_capacity) that we try to flush from the master thread.
Knobs:
======
innodb_adaptive_flushing: boolean, global, dynamic, default TRUE.
Since this heuristic is very experimental and has the potential to
dramatically change the IO pattern I think it is a good idea to leave a
knob to turn it off.
Approved by: Heikki
------------------------------------------------------------------------
r5487 | calvin | 2009-07-08 12:42:28 -0400 (Wed, 08 Jul 2009) | 7 lines
branches/zip: fix PAUSE instruction patch on Windows
The original PAUSE instruction patch (r5470) does not
compile on Windows. Also, there is an elegant way of
doing it on Windows - YieldProcessor().
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r5489 | vasil | 2009-07-10 05:02:22 -0400 (Fri, 10 Jul 2009) | 9 lines
branches/zip:
Change the defaults for
innodb_sync_spin_loops: 20 -> 30
innodb_spin_wait_delay: 5 -> 6
This change was proposed by Sun/MySQL based on their performance testing,
see https://svn.innodb.com/innobase/Release_tasks_for_InnoDB_Plugin_V1.0.4
------------------------------------------------------------------------
r5490 | vasil | 2009-07-10 05:04:20 -0400 (Fri, 10 Jul 2009) | 4 lines
branches/zip:
Add ChangeLog entry for 5489.
------------------------------------------------------------------------
r5491 | calvin | 2009-07-10 12:19:17 -0400 (Fri, 10 Jul 2009) | 6 lines
branches/zip: add copyright info to files related to PAUSE
instruction patch, contributed by Sun Microsystems.
------------------------------------------------------------------------
r5492 | calvin | 2009-07-10 17:47:34 -0400 (Fri, 10 Jul 2009) | 5 lines
branches/zip: add ChangeLog entries for r5484-r5486.
------------------------------------------------------------------------
r5494 | vasil | 2009-07-13 03:37:35 -0400 (Mon, 13 Jul 2009) | 6 lines
branches/zip:
Restore the original value of innodb_sync_spin_loops at the end, previously
the test assumed that setting it to 20 will do this, but now the default is
30 and MTR's internal check failed.
------------------------------------------------------------------------
r5495 | inaam | 2009-07-13 11:48:45 -0400 (Mon, 13 Jul 2009) | 5 lines
branches/zip rb://138 (REVERT)
Revert the flush neighbors patch as it shows regression in
the benchmarks run by Michael.
------------------------------------------------------------------------
r5496 | inaam | 2009-07-13 14:04:57 -0400 (Mon, 13 Jul 2009) | 4 lines
branches/zip
Fixed warnings on windows where ulint != ib_uint64_t
------------------------------------------------------------------------
r5497 | calvin | 2009-07-13 15:01:00 -0400 (Mon, 13 Jul 2009) | 9 lines
branches/zip: fix run-time symbols clash on Solaris.
This patch is from Sergey Vojtovich of Sun Microsystems,
to fix run-time symbols clash on Solaris with older C++
compiler:
- when finding out a way to hide symbols, make decision basing
on compiler, not operating system.
- Sun Studio supports __hidden declaration specifier for this
purpose.
------------------------------------------------------------------------
r5498 | vasil | 2009-07-14 03:16:18 -0400 (Tue, 14 Jul 2009) | 92 lines
branches/zip: Merge r5341:5497 from branches/5.1, skipping:
c5419 because it is merge from branches/zip into branches/5.1
c5466 because the source code has been adjusted to match the MySQL
behavior and the innodb-autoinc test does not fail in branches/zip,
if c5466 is merged, then innodb-autoinc starts failing, Sunny suggested
not to merge c5466.
and resolving conflicts in c5410, c5440, c5488:
------------------------------------------------------------------------
r5410 | marko | 2009-06-24 22:26:34 +0300 (Wed, 24 Jun 2009) | 2 lines
Changed paths:
M /branches/5.1/include/trx0sys.ic
M /branches/5.1/trx/trx0purge.c
M /branches/5.1/trx/trx0sys.c
M /branches/5.1/trx/trx0undo.c
branches/5.1: Add missing #include "mtr0log.h" to avoid warnings
when compiling with -DUNIV_MUST_NOT_INLINE.
------------------------------------------------------------------------
r5419 | marko | 2009-06-25 16:11:57 +0300 (Thu, 25 Jun 2009) | 18 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb_bug42101-nonzero.result
M /branches/5.1/mysql-test/innodb_bug42101-nonzero.test
M /branches/5.1/mysql-test/innodb_bug42101.result
M /branches/5.1/mysql-test/innodb_bug42101.test
branches/5.1: Merge r5418 from branches/zip:
------------------------------------------------------------------------
r5418 | marko | 2009-06-25 15:55:52 +0300 (Thu, 25 Jun 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
M /branches/zip/mysql-test/innodb_bug42101.result
M /branches/zip/mysql-test/innodb_bug42101.test
branches/zip: Fix a race condition caused by
SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749)
When innodb_commit_concurrency is initially set nonzero,
DEFAULT would change it back to 0, triggering Bug #42101.
rb://139 approved by Heikki Tuuri.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5440 | vasil | 2009-06-30 13:04:29 +0300 (Tue, 30 Jun 2009) | 8 lines
Changed paths:
M /branches/5.1/fil/fil0fil.c
branches/5.1:
Fix Bug#45814 URL reference in InnoDB server errors needs adjusting to match documentation
by changing the URL from
http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting.html to
http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting-datadict.html
------------------------------------------------------------------------
r5466 | vasil | 2009-07-02 10:46:45 +0300 (Thu, 02 Jul 2009) | 6 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1:
Adjust the failing innodb-autoinc test to conform to the latest behavior
of the MySQL code. The idea and the comment in innodb-autoinc.test come
from Sunny.
------------------------------------------------------------------------
r5488 | vasil | 2009-07-09 19:16:44 +0300 (Thu, 09 Jul 2009) | 13 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug21704.result
A /branches/5.1/mysql-test/innodb_bug21704.test
branches/5.1:
Fix Bug#21704 Renaming column does not update FK definition
by checking whether a column that participates in a FK definition is being
renamed and denying the ALTER in this case.
The patch was originally developed by Davi Arnaut <Davi.Arnaut@Sun.COM>:
http://lists.mysql.com/commits/77714
and was later adjusted to conform to InnoDB coding style by me (Vasil),
I also added some more comments and moved the bug specific mysql-test to
a separate file to make it more manageable and flexible.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5499 | calvin | 2009-07-14 12:55:10 -0400 (Tue, 14 Jul 2009) | 3 lines
branches/zip: add a missing file in Makefile.am
This change was suggested by MySQL.
------------------------------------------------------------------------
r5500 | calvin | 2009-07-14 13:03:26 -0400 (Tue, 14 Jul 2009) | 3 lines
branches/zip: minor change
Remove an extra "with".
------------------------------------------------------------------------
r5501 | vasil | 2009-07-14 13:58:15 -0400 (Tue, 14 Jul 2009) | 5 lines
branches/zip:
Add @ZLIB_INCLUDES@ so that the InnoDB Plugin picks up the same zlib.h
header file that is eventually used by mysqld.
------------------------------------------------------------------------
r5502 | vasil | 2009-07-14 13:59:59 -0400 (Tue, 14 Jul 2009) | 4 lines
branches/zip:
Add include/ut0auxconf.h to noinst_HEADERS
------------------------------------------------------------------------
r5503 | vasil | 2009-07-14 14:16:11 -0400 (Tue, 14 Jul 2009) | 8 lines
branches/zip:
Non-functional change:
put files in noinst_HEADERS and libinnobase_a_SOURCES one per line and sort
alphabetically, so it is easier to find if a file is there or not and
also diffs show exactly the added or removed file instead of surrounding
lines too.
------------------------------------------------------------------------
r5504 | calvin | 2009-07-15 04:58:44 -0400 (Wed, 15 Jul 2009) | 6 lines
branches/zip: fix compile errors on Win64
Both srv_read_ahead_factor and srv_io_capacity should
be defined as ulong.
Approved by: Sunny
------------------------------------------------------------------------
r5508 | calvin | 2009-07-16 09:40:47 -0400 (Thu, 16 Jul 2009) | 16 lines
branches/zip: Support inlining of functions and prefetch with
Sun Studio
Those changes are contributed by Sun/MySQL. Two sets of changes
in this patch when Sun Studio is used:
- Explicit inlining of functions
- Prefetch Support
This patch has been tested by Sunny with the plugin statically
built in. Since we've never built the plugin as a dynamically
loaded module on Solaris, it is a separate task to change
plug.in.
rb://142
Approved by: Heikki
------------------------------------------------------------------------
r5509 | calvin | 2009-07-16 09:45:28 -0400 (Thu, 16 Jul 2009) | 2 lines
branches/zip: add ChangeLog entry for r5508.
------------------------------------------------------------------------
r5512 | sunny | 2009-07-19 19:52:48 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Remove unused extern ref to timed_mutexes.
------------------------------------------------------------------------
r5513 | sunny | 2009-07-19 19:58:43 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Undo r5512
------------------------------------------------------------------------
r5514 | sunny | 2009-07-19 20:08:49 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Only use my_bool when UNIV_HOTBACKUP is not defined.
------------------------------------------------------------------------
r5515 | sunny | 2009-07-20 03:29:14 -0400 (Mon, 20 Jul 2009) | 2 lines
branches/zip: The dict_table_t::autoinc_mutex field is not used in HotBackup.
------------------------------------------------------------------------
r5516 | sunny | 2009-07-20 03:46:05 -0400 (Mon, 20 Jul 2009) | 4 lines
branches/zip: Make this file usable from within HotBackup. A new file has
been introduced called hb_univ.i. This file should have all the HotBackup
specific configuration.
------------------------------------------------------------------------
r5517 | sunny | 2009-07-20 03:55:11 -0400 (Mon, 20 Jul 2009) | 2 lines
Add /* UNIV_HOTBACK */
------------------------------------------------------------------------
r5519 | vasil | 2009-07-20 04:45:18 -0400 (Mon, 20 Jul 2009) | 31 lines
branches/zip: Merge r5497:5518 from branches/5.1:
------------------------------------------------------------------------
r5518 | vasil | 2009-07-20 11:29:47 +0300 (Mon, 20 Jul 2009) | 22 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Merge a change from MySQL:
------------------------------------------------------------
revno: 2874.2.1
committer: Anurag Shekhar <anurag.shekhar@sun.com>
branch nick: mysql-5.1-bugteam-windows-warning
timestamp: Wed 2009-05-13 15:41:24 +0530
message:
Bug #39802 On Windows, 32-bit time_t should be enforced
This patch fixes compilation warning, "conversion from 'time_t' to 'ulong',
possible loss of data".
The fix is to typecast time_t to ulong before assigning it to ulong.
Backported this from 6.0-bugteam tree.
modified:
storage/archive/ha_archive.cc
storage/federated/ha_federated.cc
storage/innobase/handler/ha_innodb.cc
storage/myisam/ha_myisam.cc
------------------------------------------------------------------------
------------------------------------------------------------------------
r5520 | vasil | 2009-07-20 04:51:47 -0400 (Mon, 20 Jul 2009) | 4 lines
branches/zip:
Add ChangeLog entries for r5498 and r5519.
------------------------------------------------------------------------
r5524 | inaam | 2009-07-20 12:23:15 -0400 (Mon, 20 Jul 2009) | 9 lines
branches/zip
Change the read ahead parameter name to innodb_read_ahead_threshold.
Change the meaning of this parameter to signify the number of pages
that must be sequentially accessed for InnoDB to trigger a readahead
request.
Suggested by: Ken
------------------------------------------------------------------------
2009-07-21 02:09:29 +02:00
|
|
|
respectively. The caller must create an i/o handler thread for each
|
|
|
|
segment in these arrays. This function also creates the sync array.
|
2016-08-12 10:17:45 +02:00
|
|
|
No i/o handler thread needs to be created for that
|
|
|
|
@param[in] n_per_seg maximum number of pending aio
|
|
|
|
operations allowed per segment
|
|
|
|
@param[in] n_readers number of reader threads
|
|
|
|
@param[in] n_writers number of writer threads
|
|
|
|
@param[in] n_slots_sync number of slots in the sync aio array
|
|
|
|
@return true if the AIO sub-system was started successfully */
|
|
|
|
bool
|
|
|
|
AIO::start(
|
|
|
|
ulint n_per_seg,
|
|
|
|
ulint n_readers,
|
|
|
|
ulint n_writers,
|
|
|
|
ulint n_slots_sync)
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
2012-01-19 15:10:30 +01:00
|
|
|
#if defined(LINUX_NATIVE_AIO)
|
|
|
|
/* Check if native aio is supported on this system and tmpfs */
|
2016-08-12 10:17:45 +02:00
|
|
|
if (srv_use_native_aio && !is_linux_native_aio_supported()) {
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ib::warn() << "Linux Native AIO disabled.";
|
2012-01-19 15:10:30 +01:00
|
|
|
|
|
|
|
srv_use_native_aio = FALSE;
|
|
|
|
}
|
|
|
|
#endif /* LINUX_NATIVE_AIO */
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
srv_reset_io_thread_op_info();
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
s_reads = create(
|
|
|
|
LATCH_ID_OS_AIO_READ_MUTEX, n_readers * n_per_seg, n_readers);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (s_reads == NULL) {
|
|
|
|
return(false);
|
2009-01-13 19:20:49 +01:00
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ulint start = srv_read_only_mode ? 0 : 2;
|
|
|
|
ulint n_segs = n_readers + start;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* 0 is the ibuf segment and 1 is the redo log segment. */
|
2013-03-25 23:03:13 +01:00
|
|
|
for (ulint i = start; i < n_segs; ++i) {
|
|
|
|
ut_a(i < SRV_MAX_N_IO_THREADS);
|
|
|
|
srv_io_thread_function[i] = "read thread";
|
2009-01-13 19:20:49 +01:00
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ulint n_segments = n_readers;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (!srv_read_only_mode) {
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
s_ibuf = create(LATCH_ID_OS_AIO_IBUF_MUTEX, n_per_seg, 1);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (s_ibuf == NULL) {
|
|
|
|
return(false);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
++n_segments;
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
srv_io_thread_function[0] = "insert buffer thread";
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
s_log = create(LATCH_ID_OS_AIO_LOG_MUTEX, n_per_seg, 1);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (s_log == NULL) {
|
|
|
|
return(false);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
++n_segments;
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
srv_io_thread_function[1] = "log thread";
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
} else {
|
|
|
|
s_ibuf = s_log = NULL;
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
s_writes = create(
|
|
|
|
LATCH_ID_OS_AIO_WRITE_MUTEX, n_writers * n_per_seg, n_writers);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (s_writes == NULL) {
|
|
|
|
return(false);
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
n_segments += n_writers;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
for (ulint i = start + n_readers; i < n_segments; ++i) {
|
|
|
|
ut_a(i < SRV_MAX_N_IO_THREADS);
|
|
|
|
srv_io_thread_function[i] = "write thread";
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_ad(n_segments >= static_cast<ulint>(srv_read_only_mode ? 2 : 4));
|
|
|
|
|
|
|
|
s_sync = create(LATCH_ID_OS_AIO_SYNC_MUTEX, n_slots_sync, 1);
|
|
|
|
|
|
|
|
if (s_sync == NULL) {
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(false);
|
2009-01-13 19:20:49 +01:00
|
|
|
}
|
|
|
|
|
2005-10-27 09:29:40 +02:00
|
|
|
os_aio_n_segments = n_segments;
|
|
|
|
|
|
|
|
os_aio_validate();
|
|
|
|
|
2017-02-17 09:32:21 +01:00
|
|
|
os_last_printout = ut_time();
|
|
|
|
|
|
|
|
if (srv_use_native_aio) {
|
|
|
|
return(true);
|
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
os_aio_segment_wait_events = static_cast<os_event_t*>(
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_zalloc_nokey(
|
|
|
|
n_segments * sizeof *os_aio_segment_wait_events));
|
|
|
|
|
|
|
|
if (os_aio_segment_wait_events == NULL) {
|
|
|
|
|
|
|
|
return(false);
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
for (ulint i = 0; i < n_segments; ++i) {
|
2016-08-12 10:17:45 +02:00
|
|
|
os_aio_segment_wait_events[i] = os_event_create(0);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(true);
|
2008-05-16 16:49:22 +02:00
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Free the AIO arrays */
|
branches/innodb+: Merge revisions r5971:6130 from branches/zip.
------------------------------------------------------------------------
r5971 | marko | 2009-09-23 23:03:51 +1000 (Wed, 23 Sep 2009) | 2 lines
branches/zip: os_file_pwrite(): Make the code compile in InnoDB Hot Backup
when the pwrite system call is not available.
------------------------------------------------------------------------
r5972 | marko | 2009-09-24 05:44:52 +1000 (Thu, 24 Sep 2009) | 5 lines
branches/zip: fil_node_open_file(): In InnoDB Hot Backup,
determine the page size of single-file tablespaces before computing
the file node size. Otherwise, the space->size of compressed tablespaces
would be computed with UNIV_PAGE_SIZE instead of key_block_size.
This should fix Issue #313.
------------------------------------------------------------------------
r5973 | marko | 2009-09-24 05:53:21 +1000 (Thu, 24 Sep 2009) | 2 lines
branches/zip: recv_add_to_hash_table():
Simplify obfuscated pointer arithmetics.
------------------------------------------------------------------------
r5978 | marko | 2009-09-24 17:47:56 +1000 (Thu, 24 Sep 2009) | 1 line
branches/zip: Fix warnings and errors when UNIV_HOTBACKUP is defined.
------------------------------------------------------------------------
r5979 | marko | 2009-09-24 20:16:10 +1000 (Thu, 24 Sep 2009) | 4 lines
branches/zip: ha_innodb.cc: Define MYSQL_PLUGIN_IMPORT when necessary.
This preprocessor symbol has been recently introduced in MySQL 5.1.
The InnoDB Plugin should remain source compatible with MySQL 5.1.24
and later.
------------------------------------------------------------------------
r5988 | calvin | 2009-09-26 05:14:43 +1000 (Sat, 26 Sep 2009) | 8 lines
branches/zip: fix bug#47055 unconditional exit(1) on ERROR_WORKING_SET_QUOTA
1453 (0x5AD) for InnoDB backend
When error ERROR_WORKING_SET_QUOTA or ERROR_NO_SYSTEM_RESOURCES
occurs, yields for 100ms and retries the operation.
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r5992 | vasil | 2009-09-28 17:10:29 +1000 (Mon, 28 Sep 2009) | 4 lines
branches/zip:
Add ChangeLog entry for c5988.
------------------------------------------------------------------------
r5994 | marko | 2009-09-28 18:33:59 +1000 (Mon, 28 Sep 2009) | 17 lines
branches/zip: Try to prevent the reuse of tablespace identifiers after
InnoDB has crashed during table creation. Also, refuse to start if
files with duplicate tablespace identifiers are encountered.
fil_node_create(): Update fil_system->max_assigned_id. This should
prevent the reuse of a space->id when InnoDB does a full crash
recovery and invokes fil_load_single_table_tablespaces(). Normally,
fil_system->max_assigned_id is initialized from
SELECT MAX(ID) FROM SYS_TABLES.
fil_open_single_table_tablespace(): Return FALSE when
fil_space_create() fails.
fil_load_single_table_tablespace(): Exit if fil_space_create() fails
and innodb_force_recovery=0.
rb://173 approved by Heikki Tuuri. This addresses Issue #335.
------------------------------------------------------------------------
r5995 | marko | 2009-09-28 18:52:25 +1000 (Mon, 28 Sep 2009) | 17 lines
branches/zip: Do not write to PAGE_INDEX_ID after page creation,
not even when restoring an uncompressed page after a compression failure.
btr_page_reorganize_low(): On compression failure, do not restore
those page header fields that should not be affected by the
reorganization. Instead, compare the fields.
page_zip_decompress(): Add the parameter ibool all, for copying all
page header fields. Pass the parameter all=TRUE on block read
completion, redo log application, and page_zip_validate(); pass
all=FALSE in all other cases.
page_zip_reorganize(): Do not restore the uncompressed page on
failure. It will be restored (to pre-modification state) by the
caller anyway.
rb://167, Issue #346
------------------------------------------------------------------------
r5996 | marko | 2009-09-28 22:46:02 +1000 (Mon, 28 Sep 2009) | 4 lines
branches/zip: Address Issue #350 in comments.
lock_rec_queue_validate(), lock_rec_queue_validate(): Note that
this debug code may violate the latching order and cause deadlocks.
------------------------------------------------------------------------
r5997 | marko | 2009-09-28 23:03:58 +1000 (Mon, 28 Sep 2009) | 12 lines
branches/zip: Remove an assertion failure when the InnoDB data dictionary
is inconsistent with the MySQL .frm file.
ha_innobase::index_read(): When the index cannot be found,
return an error.
ha_innobase::change_active_index(): When prebuilt->index == NULL,
set also prebuilt->index_usable = FALSE. This is not needed for
correctness, because prebuilt->index_usable is only checked by
row_search_for_mysql(), which requires prebuilt->index != NULL.
This addresses Issue #349. Approved by Heikki Tuuri over IM.
------------------------------------------------------------------------
r6005 | vasil | 2009-09-29 18:09:52 +1000 (Tue, 29 Sep 2009) | 4 lines
branches/zip:
ChangeLog: wrap around 78th column, not earlier.
------------------------------------------------------------------------
r6006 | vasil | 2009-09-29 20:15:25 +1000 (Tue, 29 Sep 2009) | 4 lines
branches/zip:
Add ChangeLog entry for the release of 1.0.4.
------------------------------------------------------------------------
r6007 | vasil | 2009-09-29 23:19:59 +1000 (Tue, 29 Sep 2009) | 6 lines
branches/zip:
Fix the year, should be 2009.
Pointed by: Calvin
------------------------------------------------------------------------
r6026 | marko | 2009-09-30 17:18:24 +1000 (Wed, 30 Sep 2009) | 1 line
branches/zip: Add some debug assertions for checking FSEG_MAGIC_N.
------------------------------------------------------------------------
r6028 | marko | 2009-09-30 23:55:23 +1000 (Wed, 30 Sep 2009) | 3 lines
branches/zip: recv_no_log_write: New debug flag for tracking down
Mantis Issue #347. No modifications should be made to the database
while recv_apply_hashed_log_recs() is about to complete.
------------------------------------------------------------------------
r6029 | calvin | 2009-10-01 06:32:02 +1000 (Thu, 01 Oct 2009) | 4 lines
branches/zip: non-functional changes
Fix typo.
------------------------------------------------------------------------
r6031 | marko | 2009-10-01 21:24:33 +1000 (Thu, 01 Oct 2009) | 49 lines
branches/zip: Clean up after a crash during DROP INDEX.
When InnoDB crashes while dropping an index, ensure that
the index will be completely dropped during crash recovery.
row_merge_drop_index(): Before dropping an index, rename the index to
start with TEMP_INDEX_PREFIX_STR and commit the change, so that
row_merge_drop_temp_indexes() will drop the index after crash
recovery if the server crashes while dropping the index.
fseg_inode_try_get(): New function, forked from fseg_inode_get().
Return NULL if the file segment index node is free.
fseg_inode_get(): Assert that the file segment index node is not free.
fseg_free_step(): If the file segment index node is already free,
print a diagnostic message and return TRUE.
fsp_free_seg_inode(): Write a nonzero number to FSEG_MAGIC_N, so that
allocated-and-freed file segment index nodes can be better
distinguished from uninitialized ones.
This is rb://174, addressing Issue #348.
Tested by restarting mysqld upon the completion of the added
log_write_up_to() invocation below, during DROP INDEX. The index was
dropped after crash recovery, and re-issuing the DROP INDEX did not
crash the server.
Index: btr/btr0btr.c
===================================================================
--- btr/btr0btr.c (revision 6026)
+++ btr/btr0btr.c (working copy)
@@ -42,6 +42,7 @@ Created 6/2/1994 Heikki Tuuri
#include "ibuf0ibuf.h"
#include "trx0trx.h"
+#include "log0log.h"
/*
Latching strategy of the InnoDB B-tree
--------------------------------------
@@ -873,6 +874,8 @@ leaf_loop:
goto leaf_loop;
}
+
+ log_write_up_to(mtr.end_lsn, LOG_WAIT_ALL_GROUPS, TRUE);
top_loop:
mtr_start(&mtr);
------------------------------------------------------------------------
r6033 | calvin | 2009-10-02 06:19:46 +1000 (Fri, 02 Oct 2009) | 4 lines
branches/zip: fix a typo in error message
Reported as bug#47763.
------------------------------------------------------------------------
r6043 | inaam | 2009-10-06 01:45:35 +1100 (Tue, 06 Oct 2009) | 12 lines
branches/zip rb://176
Do not invalidate buffer pool while an LRU batch is active. Added
code to buf_pool_invalidate() to wait for the running batches to finish.
This patch also resets the state of buf_pool struct at invalidation. This
addresses the concern where buf_pool->freed_page_clock becomes non-zero
because we read in a system tablespace page for file format info at
startup.
Approved by: Marko
------------------------------------------------------------------------
r6044 | pekka | 2009-10-07 01:44:54 +1100 (Wed, 07 Oct 2009) | 5 lines
branches/zip:
Add os_file_is_same() function for Hot Backup (inside ifdef UNIV_HOTBACKUP).
This is part of the fix for Issue #186.
Note! The Windows implementation is incomplete.
------------------------------------------------------------------------
r6046 | pekka | 2009-10-08 20:24:56 +1100 (Thu, 08 Oct 2009) | 3 lines
branches/zip: Revert r6044 which added os_file_is_same() function
(issue#186). This functionality is moved to Hot Backup source tree.
------------------------------------------------------------------------
r6048 | vasil | 2009-10-09 16:42:55 +1100 (Fri, 09 Oct 2009) | 16 lines
branches/zip:
When scanning a directory readdir() is called and stat() after it,
if a file is deleted between the two calls stat will fail and the
whole precedure will fail. Change this behavior to continue with the
next entry if stat() fails because of nonexistent file. This is
transparent change as it will make it look as if the file was deleted
before the readdir() call.
This change is needed in order to fix
https://svn.innodb.com/mantis/view.php?id=174
in which we need to abort if os_file_readdir_next_file()
encounters "real" errors.
Approved by: Marko, Pekka (rb://177)
------------------------------------------------------------------------
r6049 | vasil | 2009-10-10 03:05:26 +1100 (Sat, 10 Oct 2009) | 7 lines
branches/zip:
Fix compilation warning in Hot Backup:
innodb/fil/fil0fil.c: In function 'fil_load_single_table_tablespace':
innodb/fil/fil0fil.c:3253: warning: format '%lld' expects type 'long long int', but argument 6 has type 'ib_int64_t'
------------------------------------------------------------------------
r6064 | calvin | 2009-10-14 02:23:35 +1100 (Wed, 14 Oct 2009) | 4 lines
branches/zip: non-functional changes
Changes from MySQL to fix build issue.
------------------------------------------------------------------------
r6065 | inaam | 2009-10-14 04:43:13 +1100 (Wed, 14 Oct 2009) | 7 lines
branches/zip rb://182
Call fsync() on datafiles after a batch of pages is written to disk
even when skip_innodb_doublewrite is set.
Approved by: Heikki
------------------------------------------------------------------------
r6080 | sunny | 2009-10-15 09:29:01 +1100 (Thu, 15 Oct 2009) | 3 lines
branches/zip: Change page_mem_alloc_free() to inline.
Fix Bug #47058 - Failure to compile innodb_plugin on solaris 10u7 + spro cc/CC 5.10
------------------------------------------------------------------------
r6084 | vasil | 2009-10-15 16:21:17 +1100 (Thu, 15 Oct 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r6080.
------------------------------------------------------------------------
r6095 | vasil | 2009-10-20 00:04:59 +1100 (Tue, 20 Oct 2009) | 7 lines
branches/zip:
Fix Bug#47808 innodb_information_schema.test fails when run under valgrind
by using the wait_until_rows_count macro that loops until the number of
rows becomes 14 instead of sleep 0.1, which is obviously very fragile.
------------------------------------------------------------------------
r6096 | vasil | 2009-10-20 00:06:09 +1100 (Tue, 20 Oct 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r6095.
------------------------------------------------------------------------
r6099 | jyang | 2009-10-22 13:58:39 +1100 (Thu, 22 Oct 2009) | 7 lines
branches/zip: Port bug #46000 related changes from 5.1 to zip
branch. Due to different code path for creating index in zip
branch comparing to 5.1), the index reserved name check function
is extended to be used in ha_innobase::add_index().
rb://190 Approved by: Marko
------------------------------------------------------------------------
r6100 | jyang | 2009-10-22 14:51:07 +1100 (Thu, 22 Oct 2009) | 6 lines
branches/zip: As a request from mysql, WARN_LEVEL_ERROR cannot
be used for push_warning_* call any more. Switch to
WARN_LEVEL_WARN. Bug #47233.
rb://172 approved by Sunny Bains and Marko.
------------------------------------------------------------------------
r6101 | jyang | 2009-10-23 19:45:50 +1100 (Fri, 23 Oct 2009) | 7 lines
branches/zip: Update test result with the WARN_LEVEL_ERROR
to WARN_LEVEL_WARN change. This is the same result as
submitted in rb://172 review, which approved by Sunny Bains
and Marko.
------------------------------------------------------------------------
r6102 | marko | 2009-10-26 18:32:23 +1100 (Mon, 26 Oct 2009) | 1 line
branches/zip: row_prebuilt_struct::prebuilts: Unused field, remove.
------------------------------------------------------------------------
r6103 | marko | 2009-10-27 00:46:18 +1100 (Tue, 27 Oct 2009) | 4 lines
branches/zip: row_ins_alloc_sys_fields(): Zero out the system columns
DB_TRX_ID, DB_ROLL_PTR and DB_ROW_ID, in order to avoid harmless
Valgrind warnings about uninitialized data. (The warnings were
harmless, because the fields would be initialized at a later stage.)
------------------------------------------------------------------------
r6105 | calvin | 2009-10-28 09:05:52 +1100 (Wed, 28 Oct 2009) | 6 lines
branches/zip: backport r3848 from 6.0 branch
----
branches/6.0: innobase_start_or_create_for_mysql(): Make the 10 MB
minimum tablespace limit independent of UNIV_PAGE_SIZE. (Bug #41490)
------------------------------------------------------------------------
r6107 | marko | 2009-10-29 01:10:34 +1100 (Thu, 29 Oct 2009) | 5 lines
branches/zip: buf_page_set_old(): Improve UNIV_LRU_DEBUG diagnostics
in order to catch the buf_pool->LRU_old corruption reported in Issue #381.
buf_LRU_old_init(): Set the property from the tail towards the front
of the buf_pool->LRU list, in order not to trip the debug check.
------------------------------------------------------------------------
r6108 | calvin | 2009-10-29 16:58:04 +1100 (Thu, 29 Oct 2009) | 5 lines
branches/zip: close file handle when building with UNIV_HOTBACKUP
The change does not affect regular InnoDB engine. Confirmed by
Marko.
------------------------------------------------------------------------
r6109 | jyang | 2009-10-29 19:37:32 +1100 (Thu, 29 Oct 2009) | 7 lines
branches/zip: In os_mem_alloc_large(), if we fail to attach
the shared memory, reset memory pointer ptr to NULL, and
allocate memory from conventional pool.
Bug #48237 Error handling in os_mem_alloc_large appears to be incorrect
rb://198 Approved by: Marko
------------------------------------------------------------------------
r6110 | marko | 2009-10-29 21:44:57 +1100 (Thu, 29 Oct 2009) | 2 lines
branches/zip: Makefile.am (INCLUDES): Merge a change from MySQL:
Use $(srcdir)/include instead of $(top_srcdir)/storage/innobase/include.
------------------------------------------------------------------------
r6111 | marko | 2009-10-29 22:04:11 +1100 (Thu, 29 Oct 2009) | 33 lines
branches/zip: Fix corruption of buf_pool->LRU_old and improve debug assertions.
This was reported as Issue #381.
buf_page_set_old(): Assert that blocks may only be set old if
buf_pool->LRU_old is initialized and buf_pool->LRU_old_len is nonzero.
Assert that buf_pool->LRU_old points to the block at the old/new boundary.
buf_LRU_old_adjust_len(): Invoke buf_page_set_old() after adjusting
buf_pool->LRU_old and buf_pool->LRU_old_len, in order not to violate
the added assertions.
buf_LRU_old_init(): Replace buf_page_set_old() with a direct
assignment to bpage->old, because these loops that initialize all the
blocks would temporarily violate the assertions about
buf_pool->LRU_old.
buf_LRU_remove_block(): When setting buf_pool->LRU_old = NULL, also
clear all bpage->old flags and set buf_pool->LRU_old_len = 0.
buf_LRU_add_block_to_end_low(), buf_LRU_add_block_low(): Move the
buf_page_set_old() call later in order not to violate the debug
assertions. If buf_pool->LRU_old is NULL, set old=FALSE.
buf_LRU_free_block(): Replace the UNIV_LRU_DEBUG assertion with a
dummy buf_page_set_old() call that performs more thorough checks.
buf_LRU_validate(): Do not tolerate garbage in buf_pool->LRU_old_len
even if buf_pool->LRU_old is NULL. Check that bpage->old is monotonic.
buf_relocate(): Make the UNIV_LRU_DEBUG checks stricter.
buf0buf.h: Revise the documentation of buf_page_t::old and
buf_pool_t::LRU_old_len.
------------------------------------------------------------------------
r6112 | calvin | 2009-10-30 01:21:15 +1100 (Fri, 30 Oct 2009) | 4 lines
branches/zip: consideration for icc compilers
Proposed by MySQL, and approved by Marko.
------------------------------------------------------------------------
r6113 | vasil | 2009-10-30 03:15:50 +1100 (Fri, 30 Oct 2009) | 93 lines
branches/zip: Merge r5912:6112 from branches/5.1:
(after this merge the innodb-autoinc test starts to fail, but
I commit anyway because it would be easier to investigate the
failure this way)
------------------------------------------------------------------------
r5952 | calvin | 2009-09-22 19:45:07 +0300 (Tue, 22 Sep 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: fix bug#42383: Can't create table 'test.bug39438'
For embedded server, MySQL may pass in full path, which is
currently disallowed. It is needed to relax the condition by
accepting full paths in the embedded case.
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r6032 | vasil | 2009-10-01 15:55:49 +0300 (Thu, 01 Oct 2009) | 8 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Fix Bug#38996 Race condition in ANALYZE TABLE
by serializing ANALYZE TABLE inside InnoDB.
Approved by: Heikki (rb://175)
------------------------------------------------------------------------
r6045 | jyang | 2009-10-08 02:27:08 +0300 (Thu, 08 Oct 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug47777.result
A /branches/5.1/mysql-test/innodb_bug47777.test
branches/5.1: Fix bug #47777. Treat the Geometry data same as
Binary BLOB in ha_innobase::store_key_val_for_row(), since the
Geometry data is stored as Binary BLOB in Innodb.
Review: rb://180 approved by Marko Makela.
------------------------------------------------------------------------
r6051 | sunny | 2009-10-12 07:05:00 +0300 (Mon, 12 Oct 2009) | 6 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Ignore negative values supplied by the user when calculating the
next value to store in dict_table_t. Setting autoincrement columns top negative
values is undefined behavior and this change should bring the behavior of
InnoDB closer to what users expect. Added several tests to check.
rb://162
------------------------------------------------------------------------
r6052 | sunny | 2009-10-12 07:09:56 +0300 (Mon, 12 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Reset the statement level autoinc counter on ROLLBACK. Fix
the test results too.
rb://164
------------------------------------------------------------------------
r6053 | sunny | 2009-10-12 07:37:49 +0300 (Mon, 12 Oct 2009) | 6 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Copy the maximum AUTOINC value from the old table to the new
table when MySQL does a CREATE INDEX ON T. This is required because MySQL
does a table copy, rename and drops the old table.
Fix Bug#47125: auto_increment start value is ignored if an index is created and engine=innodb
rb://168
------------------------------------------------------------------------
r6076 | vasil | 2009-10-14 19:30:12 +0300 (Wed, 14 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/row/row0mysql.c
branches/5.1:
Fix typo.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6114 | vasil | 2009-10-30 03:43:51 +1100 (Fri, 30 Oct 2009) | 6 lines
branches/zip:
* Add ChangeLog entries for latest changes
* Obey alphabetical order in the list of the files
* White-space fixup
------------------------------------------------------------------------
r6121 | sunny | 2009-10-30 10:42:11 +1100 (Fri, 30 Oct 2009) | 7 lines
branches/zip: This test has been problematic for sometime now. The underlying
bug is that the data dictionaries get out of sync. In the AUTOINC code we
try and apply salve to the symptoms. In the past MySQL made some unrelated
change and the dictionaries stopped getting out of sync and this test started
to fail. Now, it seems they have reverted that changed and the test is
passing again. I suspect this is not he last time that this test will change.
------------------------------------------------------------------------
r6124 | jyang | 2009-10-30 19:02:31 +1100 (Fri, 30 Oct 2009) | 5 lines
branches/zip: Correct the bug number for -r6109 change
from # 48273 to #48237
------------------------------------------------------------------------
r6126 | vasil | 2009-10-30 19:36:07 +1100 (Fri, 30 Oct 2009) | 45 lines
branches/zip: Merge r6112:6125 from branches/5.1:
(skipping r6122 and r6123, Jimmy says these are already present and need
not be merged):
------------------------------------------------------------------------
r6122 | jyang | 2009-10-30 05:18:38 +0200 (Fri, 30 Oct 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb_bug44369.result
M /branches/5.1/mysql-test/innodb_bug44369.test
M /branches/5.1/mysql-test/innodb_bug46000.result
M /branches/5.1/mysql-test/innodb_bug46000.test
branches/5.1: Chnage WARN_LEVEL_ERROR to WARN_LEVEL_WARN
for push_warning_printf() call in innodb.
Fix Bug#47233: Innodb calls push_warning(MYSQL_ERROR::WARN_LEVEL_ERROR)
rb://170 approved by Marko.
------------------------------------------------------------------------
r6123 | jyang | 2009-10-30 05:43:06 +0200 (Fri, 30 Oct 2009) | 8 lines
Changed paths:
M /branches/5.1/os/os0proc.c
branches/5.1: In os_mem_alloc_large(), if we fail to attach
the shared memory, reset memory pointer ptr to NULL, and
allocate memory from conventional pool. This is a port
from branches/zip.
Bug #48237 Error handling in os_mem_alloc_large appears to be incorrect
rb://198 Approved by: Marko
------------------------------------------------------------------------
r6125 | vasil | 2009-10-30 10:31:23 +0200 (Fri, 30 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
White-space fixup.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6130 | marko | 2009-11-02 20:42:56 +1100 (Mon, 02 Nov 2009) | 9 lines
branches/zip: Free all resources at shutdown. Set pointers to NULL, so
that Valgrind will not complain about freed data structures that are
reachable via pointers. This addresses Bug #45992 and Bug #46656.
This patch is mostly based on changes copied from branches/embedded-1.0,
mainly c5432, c3439, c3134, c2994, c2978, but also some other code was
copied. Some added cleanup code is specific to MySQL/InnoDB.
rb://199 approved by Sunny Bains
------------------------------------------------------------------------
2009-11-04 07:02:00 +01:00
|
|
|
void
|
2016-08-12 10:17:45 +02:00
|
|
|
AIO::shutdown()
|
branches/innodb+: Merge revisions r5971:6130 from branches/zip.
------------------------------------------------------------------------
r5971 | marko | 2009-09-23 23:03:51 +1000 (Wed, 23 Sep 2009) | 2 lines
branches/zip: os_file_pwrite(): Make the code compile in InnoDB Hot Backup
when the pwrite system call is not available.
------------------------------------------------------------------------
r5972 | marko | 2009-09-24 05:44:52 +1000 (Thu, 24 Sep 2009) | 5 lines
branches/zip: fil_node_open_file(): In InnoDB Hot Backup,
determine the page size of single-file tablespaces before computing
the file node size. Otherwise, the space->size of compressed tablespaces
would be computed with UNIV_PAGE_SIZE instead of key_block_size.
This should fix Issue #313.
------------------------------------------------------------------------
r5973 | marko | 2009-09-24 05:53:21 +1000 (Thu, 24 Sep 2009) | 2 lines
branches/zip: recv_add_to_hash_table():
Simplify obfuscated pointer arithmetics.
------------------------------------------------------------------------
r5978 | marko | 2009-09-24 17:47:56 +1000 (Thu, 24 Sep 2009) | 1 line
branches/zip: Fix warnings and errors when UNIV_HOTBACKUP is defined.
------------------------------------------------------------------------
r5979 | marko | 2009-09-24 20:16:10 +1000 (Thu, 24 Sep 2009) | 4 lines
branches/zip: ha_innodb.cc: Define MYSQL_PLUGIN_IMPORT when necessary.
This preprocessor symbol has been recently introduced in MySQL 5.1.
The InnoDB Plugin should remain source compatible with MySQL 5.1.24
and later.
------------------------------------------------------------------------
r5988 | calvin | 2009-09-26 05:14:43 +1000 (Sat, 26 Sep 2009) | 8 lines
branches/zip: fix bug#47055 unconditional exit(1) on ERROR_WORKING_SET_QUOTA
1453 (0x5AD) for InnoDB backend
When error ERROR_WORKING_SET_QUOTA or ERROR_NO_SYSTEM_RESOURCES
occurs, yields for 100ms and retries the operation.
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r5992 | vasil | 2009-09-28 17:10:29 +1000 (Mon, 28 Sep 2009) | 4 lines
branches/zip:
Add ChangeLog entry for c5988.
------------------------------------------------------------------------
r5994 | marko | 2009-09-28 18:33:59 +1000 (Mon, 28 Sep 2009) | 17 lines
branches/zip: Try to prevent the reuse of tablespace identifiers after
InnoDB has crashed during table creation. Also, refuse to start if
files with duplicate tablespace identifiers are encountered.
fil_node_create(): Update fil_system->max_assigned_id. This should
prevent the reuse of a space->id when InnoDB does a full crash
recovery and invokes fil_load_single_table_tablespaces(). Normally,
fil_system->max_assigned_id is initialized from
SELECT MAX(ID) FROM SYS_TABLES.
fil_open_single_table_tablespace(): Return FALSE when
fil_space_create() fails.
fil_load_single_table_tablespace(): Exit if fil_space_create() fails
and innodb_force_recovery=0.
rb://173 approved by Heikki Tuuri. This addresses Issue #335.
------------------------------------------------------------------------
r5995 | marko | 2009-09-28 18:52:25 +1000 (Mon, 28 Sep 2009) | 17 lines
branches/zip: Do not write to PAGE_INDEX_ID after page creation,
not even when restoring an uncompressed page after a compression failure.
btr_page_reorganize_low(): On compression failure, do not restore
those page header fields that should not be affected by the
reorganization. Instead, compare the fields.
page_zip_decompress(): Add the parameter ibool all, for copying all
page header fields. Pass the parameter all=TRUE on block read
completion, redo log application, and page_zip_validate(); pass
all=FALSE in all other cases.
page_zip_reorganize(): Do not restore the uncompressed page on
failure. It will be restored (to pre-modification state) by the
caller anyway.
rb://167, Issue #346
------------------------------------------------------------------------
r5996 | marko | 2009-09-28 22:46:02 +1000 (Mon, 28 Sep 2009) | 4 lines
branches/zip: Address Issue #350 in comments.
lock_rec_queue_validate(), lock_rec_queue_validate(): Note that
this debug code may violate the latching order and cause deadlocks.
------------------------------------------------------------------------
r5997 | marko | 2009-09-28 23:03:58 +1000 (Mon, 28 Sep 2009) | 12 lines
branches/zip: Remove an assertion failure when the InnoDB data dictionary
is inconsistent with the MySQL .frm file.
ha_innobase::index_read(): When the index cannot be found,
return an error.
ha_innobase::change_active_index(): When prebuilt->index == NULL,
set also prebuilt->index_usable = FALSE. This is not needed for
correctness, because prebuilt->index_usable is only checked by
row_search_for_mysql(), which requires prebuilt->index != NULL.
This addresses Issue #349. Approved by Heikki Tuuri over IM.
------------------------------------------------------------------------
r6005 | vasil | 2009-09-29 18:09:52 +1000 (Tue, 29 Sep 2009) | 4 lines
branches/zip:
ChangeLog: wrap around 78th column, not earlier.
------------------------------------------------------------------------
r6006 | vasil | 2009-09-29 20:15:25 +1000 (Tue, 29 Sep 2009) | 4 lines
branches/zip:
Add ChangeLog entry for the release of 1.0.4.
------------------------------------------------------------------------
r6007 | vasil | 2009-09-29 23:19:59 +1000 (Tue, 29 Sep 2009) | 6 lines
branches/zip:
Fix the year, should be 2009.
Pointed by: Calvin
------------------------------------------------------------------------
r6026 | marko | 2009-09-30 17:18:24 +1000 (Wed, 30 Sep 2009) | 1 line
branches/zip: Add some debug assertions for checking FSEG_MAGIC_N.
------------------------------------------------------------------------
r6028 | marko | 2009-09-30 23:55:23 +1000 (Wed, 30 Sep 2009) | 3 lines
branches/zip: recv_no_log_write: New debug flag for tracking down
Mantis Issue #347. No modifications should be made to the database
while recv_apply_hashed_log_recs() is about to complete.
------------------------------------------------------------------------
r6029 | calvin | 2009-10-01 06:32:02 +1000 (Thu, 01 Oct 2009) | 4 lines
branches/zip: non-functional changes
Fix typo.
------------------------------------------------------------------------
r6031 | marko | 2009-10-01 21:24:33 +1000 (Thu, 01 Oct 2009) | 49 lines
branches/zip: Clean up after a crash during DROP INDEX.
When InnoDB crashes while dropping an index, ensure that
the index will be completely dropped during crash recovery.
row_merge_drop_index(): Before dropping an index, rename the index to
start with TEMP_INDEX_PREFIX_STR and commit the change, so that
row_merge_drop_temp_indexes() will drop the index after crash
recovery if the server crashes while dropping the index.
fseg_inode_try_get(): New function, forked from fseg_inode_get().
Return NULL if the file segment index node is free.
fseg_inode_get(): Assert that the file segment index node is not free.
fseg_free_step(): If the file segment index node is already free,
print a diagnostic message and return TRUE.
fsp_free_seg_inode(): Write a nonzero number to FSEG_MAGIC_N, so that
allocated-and-freed file segment index nodes can be better
distinguished from uninitialized ones.
This is rb://174, addressing Issue #348.
Tested by restarting mysqld upon the completion of the added
log_write_up_to() invocation below, during DROP INDEX. The index was
dropped after crash recovery, and re-issuing the DROP INDEX did not
crash the server.
Index: btr/btr0btr.c
===================================================================
--- btr/btr0btr.c (revision 6026)
+++ btr/btr0btr.c (working copy)
@@ -42,6 +42,7 @@ Created 6/2/1994 Heikki Tuuri
#include "ibuf0ibuf.h"
#include "trx0trx.h"
+#include "log0log.h"
/*
Latching strategy of the InnoDB B-tree
--------------------------------------
@@ -873,6 +874,8 @@ leaf_loop:
goto leaf_loop;
}
+
+ log_write_up_to(mtr.end_lsn, LOG_WAIT_ALL_GROUPS, TRUE);
top_loop:
mtr_start(&mtr);
------------------------------------------------------------------------
r6033 | calvin | 2009-10-02 06:19:46 +1000 (Fri, 02 Oct 2009) | 4 lines
branches/zip: fix a typo in error message
Reported as bug#47763.
------------------------------------------------------------------------
r6043 | inaam | 2009-10-06 01:45:35 +1100 (Tue, 06 Oct 2009) | 12 lines
branches/zip rb://176
Do not invalidate buffer pool while an LRU batch is active. Added
code to buf_pool_invalidate() to wait for the running batches to finish.
This patch also resets the state of buf_pool struct at invalidation. This
addresses the concern where buf_pool->freed_page_clock becomes non-zero
because we read in a system tablespace page for file format info at
startup.
Approved by: Marko
------------------------------------------------------------------------
r6044 | pekka | 2009-10-07 01:44:54 +1100 (Wed, 07 Oct 2009) | 5 lines
branches/zip:
Add os_file_is_same() function for Hot Backup (inside ifdef UNIV_HOTBACKUP).
This is part of the fix for Issue #186.
Note! The Windows implementation is incomplete.
------------------------------------------------------------------------
r6046 | pekka | 2009-10-08 20:24:56 +1100 (Thu, 08 Oct 2009) | 3 lines
branches/zip: Revert r6044 which added os_file_is_same() function
(issue#186). This functionality is moved to Hot Backup source tree.
------------------------------------------------------------------------
r6048 | vasil | 2009-10-09 16:42:55 +1100 (Fri, 09 Oct 2009) | 16 lines
branches/zip:
When scanning a directory readdir() is called and stat() after it,
if a file is deleted between the two calls stat will fail and the
whole precedure will fail. Change this behavior to continue with the
next entry if stat() fails because of nonexistent file. This is
transparent change as it will make it look as if the file was deleted
before the readdir() call.
This change is needed in order to fix
https://svn.innodb.com/mantis/view.php?id=174
in which we need to abort if os_file_readdir_next_file()
encounters "real" errors.
Approved by: Marko, Pekka (rb://177)
------------------------------------------------------------------------
r6049 | vasil | 2009-10-10 03:05:26 +1100 (Sat, 10 Oct 2009) | 7 lines
branches/zip:
Fix compilation warning in Hot Backup:
innodb/fil/fil0fil.c: In function 'fil_load_single_table_tablespace':
innodb/fil/fil0fil.c:3253: warning: format '%lld' expects type 'long long int', but argument 6 has type 'ib_int64_t'
------------------------------------------------------------------------
r6064 | calvin | 2009-10-14 02:23:35 +1100 (Wed, 14 Oct 2009) | 4 lines
branches/zip: non-functional changes
Changes from MySQL to fix build issue.
------------------------------------------------------------------------
r6065 | inaam | 2009-10-14 04:43:13 +1100 (Wed, 14 Oct 2009) | 7 lines
branches/zip rb://182
Call fsync() on datafiles after a batch of pages is written to disk
even when skip_innodb_doublewrite is set.
Approved by: Heikki
------------------------------------------------------------------------
r6080 | sunny | 2009-10-15 09:29:01 +1100 (Thu, 15 Oct 2009) | 3 lines
branches/zip: Change page_mem_alloc_free() to inline.
Fix Bug #47058 - Failure to compile innodb_plugin on solaris 10u7 + spro cc/CC 5.10
------------------------------------------------------------------------
r6084 | vasil | 2009-10-15 16:21:17 +1100 (Thu, 15 Oct 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r6080.
------------------------------------------------------------------------
r6095 | vasil | 2009-10-20 00:04:59 +1100 (Tue, 20 Oct 2009) | 7 lines
branches/zip:
Fix Bug#47808 innodb_information_schema.test fails when run under valgrind
by using the wait_until_rows_count macro that loops until the number of
rows becomes 14 instead of sleep 0.1, which is obviously very fragile.
------------------------------------------------------------------------
r6096 | vasil | 2009-10-20 00:06:09 +1100 (Tue, 20 Oct 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r6095.
------------------------------------------------------------------------
r6099 | jyang | 2009-10-22 13:58:39 +1100 (Thu, 22 Oct 2009) | 7 lines
branches/zip: Port bug #46000 related changes from 5.1 to zip
branch. Due to different code path for creating index in zip
branch comparing to 5.1), the index reserved name check function
is extended to be used in ha_innobase::add_index().
rb://190 Approved by: Marko
------------------------------------------------------------------------
r6100 | jyang | 2009-10-22 14:51:07 +1100 (Thu, 22 Oct 2009) | 6 lines
branches/zip: As a request from mysql, WARN_LEVEL_ERROR cannot
be used for push_warning_* call any more. Switch to
WARN_LEVEL_WARN. Bug #47233.
rb://172 approved by Sunny Bains and Marko.
------------------------------------------------------------------------
r6101 | jyang | 2009-10-23 19:45:50 +1100 (Fri, 23 Oct 2009) | 7 lines
branches/zip: Update test result with the WARN_LEVEL_ERROR
to WARN_LEVEL_WARN change. This is the same result as
submitted in rb://172 review, which approved by Sunny Bains
and Marko.
------------------------------------------------------------------------
r6102 | marko | 2009-10-26 18:32:23 +1100 (Mon, 26 Oct 2009) | 1 line
branches/zip: row_prebuilt_struct::prebuilts: Unused field, remove.
------------------------------------------------------------------------
r6103 | marko | 2009-10-27 00:46:18 +1100 (Tue, 27 Oct 2009) | 4 lines
branches/zip: row_ins_alloc_sys_fields(): Zero out the system columns
DB_TRX_ID, DB_ROLL_PTR and DB_ROW_ID, in order to avoid harmless
Valgrind warnings about uninitialized data. (The warnings were
harmless, because the fields would be initialized at a later stage.)
------------------------------------------------------------------------
r6105 | calvin | 2009-10-28 09:05:52 +1100 (Wed, 28 Oct 2009) | 6 lines
branches/zip: backport r3848 from 6.0 branch
----
branches/6.0: innobase_start_or_create_for_mysql(): Make the 10 MB
minimum tablespace limit independent of UNIV_PAGE_SIZE. (Bug #41490)
------------------------------------------------------------------------
r6107 | marko | 2009-10-29 01:10:34 +1100 (Thu, 29 Oct 2009) | 5 lines
branches/zip: buf_page_set_old(): Improve UNIV_LRU_DEBUG diagnostics
in order to catch the buf_pool->LRU_old corruption reported in Issue #381.
buf_LRU_old_init(): Set the property from the tail towards the front
of the buf_pool->LRU list, in order not to trip the debug check.
------------------------------------------------------------------------
r6108 | calvin | 2009-10-29 16:58:04 +1100 (Thu, 29 Oct 2009) | 5 lines
branches/zip: close file handle when building with UNIV_HOTBACKUP
The change does not affect regular InnoDB engine. Confirmed by
Marko.
------------------------------------------------------------------------
r6109 | jyang | 2009-10-29 19:37:32 +1100 (Thu, 29 Oct 2009) | 7 lines
branches/zip: In os_mem_alloc_large(), if we fail to attach
the shared memory, reset memory pointer ptr to NULL, and
allocate memory from conventional pool.
Bug #48237 Error handling in os_mem_alloc_large appears to be incorrect
rb://198 Approved by: Marko
------------------------------------------------------------------------
r6110 | marko | 2009-10-29 21:44:57 +1100 (Thu, 29 Oct 2009) | 2 lines
branches/zip: Makefile.am (INCLUDES): Merge a change from MySQL:
Use $(srcdir)/include instead of $(top_srcdir)/storage/innobase/include.
------------------------------------------------------------------------
r6111 | marko | 2009-10-29 22:04:11 +1100 (Thu, 29 Oct 2009) | 33 lines
branches/zip: Fix corruption of buf_pool->LRU_old and improve debug assertions.
This was reported as Issue #381.
buf_page_set_old(): Assert that blocks may only be set old if
buf_pool->LRU_old is initialized and buf_pool->LRU_old_len is nonzero.
Assert that buf_pool->LRU_old points to the block at the old/new boundary.
buf_LRU_old_adjust_len(): Invoke buf_page_set_old() after adjusting
buf_pool->LRU_old and buf_pool->LRU_old_len, in order not to violate
the added assertions.
buf_LRU_old_init(): Replace buf_page_set_old() with a direct
assignment to bpage->old, because these loops that initialize all the
blocks would temporarily violate the assertions about
buf_pool->LRU_old.
buf_LRU_remove_block(): When setting buf_pool->LRU_old = NULL, also
clear all bpage->old flags and set buf_pool->LRU_old_len = 0.
buf_LRU_add_block_to_end_low(), buf_LRU_add_block_low(): Move the
buf_page_set_old() call later in order not to violate the debug
assertions. If buf_pool->LRU_old is NULL, set old=FALSE.
buf_LRU_free_block(): Replace the UNIV_LRU_DEBUG assertion with a
dummy buf_page_set_old() call that performs more thorough checks.
buf_LRU_validate(): Do not tolerate garbage in buf_pool->LRU_old_len
even if buf_pool->LRU_old is NULL. Check that bpage->old is monotonic.
buf_relocate(): Make the UNIV_LRU_DEBUG checks stricter.
buf0buf.h: Revise the documentation of buf_page_t::old and
buf_pool_t::LRU_old_len.
------------------------------------------------------------------------
r6112 | calvin | 2009-10-30 01:21:15 +1100 (Fri, 30 Oct 2009) | 4 lines
branches/zip: consideration for icc compilers
Proposed by MySQL, and approved by Marko.
------------------------------------------------------------------------
r6113 | vasil | 2009-10-30 03:15:50 +1100 (Fri, 30 Oct 2009) | 93 lines
branches/zip: Merge r5912:6112 from branches/5.1:
(after this merge the innodb-autoinc test starts to fail, but
I commit anyway because it would be easier to investigate the
failure this way)
------------------------------------------------------------------------
r5952 | calvin | 2009-09-22 19:45:07 +0300 (Tue, 22 Sep 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: fix bug#42383: Can't create table 'test.bug39438'
For embedded server, MySQL may pass in full path, which is
currently disallowed. It is needed to relax the condition by
accepting full paths in the embedded case.
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r6032 | vasil | 2009-10-01 15:55:49 +0300 (Thu, 01 Oct 2009) | 8 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Fix Bug#38996 Race condition in ANALYZE TABLE
by serializing ANALYZE TABLE inside InnoDB.
Approved by: Heikki (rb://175)
------------------------------------------------------------------------
r6045 | jyang | 2009-10-08 02:27:08 +0300 (Thu, 08 Oct 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug47777.result
A /branches/5.1/mysql-test/innodb_bug47777.test
branches/5.1: Fix bug #47777. Treat the Geometry data same as
Binary BLOB in ha_innobase::store_key_val_for_row(), since the
Geometry data is stored as Binary BLOB in Innodb.
Review: rb://180 approved by Marko Makela.
------------------------------------------------------------------------
r6051 | sunny | 2009-10-12 07:05:00 +0300 (Mon, 12 Oct 2009) | 6 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Ignore negative values supplied by the user when calculating the
next value to store in dict_table_t. Setting autoincrement columns top negative
values is undefined behavior and this change should bring the behavior of
InnoDB closer to what users expect. Added several tests to check.
rb://162
------------------------------------------------------------------------
r6052 | sunny | 2009-10-12 07:09:56 +0300 (Mon, 12 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Reset the statement level autoinc counter on ROLLBACK. Fix
the test results too.
rb://164
------------------------------------------------------------------------
r6053 | sunny | 2009-10-12 07:37:49 +0300 (Mon, 12 Oct 2009) | 6 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Copy the maximum AUTOINC value from the old table to the new
table when MySQL does a CREATE INDEX ON T. This is required because MySQL
does a table copy, rename and drops the old table.
Fix Bug#47125: auto_increment start value is ignored if an index is created and engine=innodb
rb://168
------------------------------------------------------------------------
r6076 | vasil | 2009-10-14 19:30:12 +0300 (Wed, 14 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/row/row0mysql.c
branches/5.1:
Fix typo.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6114 | vasil | 2009-10-30 03:43:51 +1100 (Fri, 30 Oct 2009) | 6 lines
branches/zip:
* Add ChangeLog entries for latest changes
* Obey alphabetical order in the list of the files
* White-space fixup
------------------------------------------------------------------------
r6121 | sunny | 2009-10-30 10:42:11 +1100 (Fri, 30 Oct 2009) | 7 lines
branches/zip: This test has been problematic for sometime now. The underlying
bug is that the data dictionaries get out of sync. In the AUTOINC code we
try and apply salve to the symptoms. In the past MySQL made some unrelated
change and the dictionaries stopped getting out of sync and this test started
to fail. Now, it seems they have reverted that changed and the test is
passing again. I suspect this is not he last time that this test will change.
------------------------------------------------------------------------
r6124 | jyang | 2009-10-30 19:02:31 +1100 (Fri, 30 Oct 2009) | 5 lines
branches/zip: Correct the bug number for -r6109 change
from # 48273 to #48237
------------------------------------------------------------------------
r6126 | vasil | 2009-10-30 19:36:07 +1100 (Fri, 30 Oct 2009) | 45 lines
branches/zip: Merge r6112:6125 from branches/5.1:
(skipping r6122 and r6123, Jimmy says these are already present and need
not be merged):
------------------------------------------------------------------------
r6122 | jyang | 2009-10-30 05:18:38 +0200 (Fri, 30 Oct 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb_bug44369.result
M /branches/5.1/mysql-test/innodb_bug44369.test
M /branches/5.1/mysql-test/innodb_bug46000.result
M /branches/5.1/mysql-test/innodb_bug46000.test
branches/5.1: Chnage WARN_LEVEL_ERROR to WARN_LEVEL_WARN
for push_warning_printf() call in innodb.
Fix Bug#47233: Innodb calls push_warning(MYSQL_ERROR::WARN_LEVEL_ERROR)
rb://170 approved by Marko.
------------------------------------------------------------------------
r6123 | jyang | 2009-10-30 05:43:06 +0200 (Fri, 30 Oct 2009) | 8 lines
Changed paths:
M /branches/5.1/os/os0proc.c
branches/5.1: In os_mem_alloc_large(), if we fail to attach
the shared memory, reset memory pointer ptr to NULL, and
allocate memory from conventional pool. This is a port
from branches/zip.
Bug #48237 Error handling in os_mem_alloc_large appears to be incorrect
rb://198 Approved by: Marko
------------------------------------------------------------------------
r6125 | vasil | 2009-10-30 10:31:23 +0200 (Fri, 30 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
White-space fixup.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6130 | marko | 2009-11-02 20:42:56 +1100 (Mon, 02 Nov 2009) | 9 lines
branches/zip: Free all resources at shutdown. Set pointers to NULL, so
that Valgrind will not complain about freed data structures that are
reachable via pointers. This addresses Bug #45992 and Bug #46656.
This patch is mostly based on changes copied from branches/embedded-1.0,
mainly c5432, c3439, c3134, c2994, c2978, but also some other code was
copied. Some added cleanup code is specific to MySQL/InnoDB.
rb://199 approved by Sunny Bains
------------------------------------------------------------------------
2009-11-04 07:02:00 +01:00
|
|
|
{
|
2016-08-12 10:17:45 +02:00
|
|
|
UT_DELETE(s_ibuf);
|
|
|
|
s_ibuf = NULL;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
UT_DELETE(s_log);
|
|
|
|
s_log = NULL;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
UT_DELETE(s_writes);
|
|
|
|
s_writes = NULL;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
UT_DELETE(s_sync);
|
|
|
|
s_sync = NULL;
|
branches/innodb+: Merge revisions r5971:6130 from branches/zip.
------------------------------------------------------------------------
r5971 | marko | 2009-09-23 23:03:51 +1000 (Wed, 23 Sep 2009) | 2 lines
branches/zip: os_file_pwrite(): Make the code compile in InnoDB Hot Backup
when the pwrite system call is not available.
------------------------------------------------------------------------
r5972 | marko | 2009-09-24 05:44:52 +1000 (Thu, 24 Sep 2009) | 5 lines
branches/zip: fil_node_open_file(): In InnoDB Hot Backup,
determine the page size of single-file tablespaces before computing
the file node size. Otherwise, the space->size of compressed tablespaces
would be computed with UNIV_PAGE_SIZE instead of key_block_size.
This should fix Issue #313.
------------------------------------------------------------------------
r5973 | marko | 2009-09-24 05:53:21 +1000 (Thu, 24 Sep 2009) | 2 lines
branches/zip: recv_add_to_hash_table():
Simplify obfuscated pointer arithmetics.
------------------------------------------------------------------------
r5978 | marko | 2009-09-24 17:47:56 +1000 (Thu, 24 Sep 2009) | 1 line
branches/zip: Fix warnings and errors when UNIV_HOTBACKUP is defined.
------------------------------------------------------------------------
r5979 | marko | 2009-09-24 20:16:10 +1000 (Thu, 24 Sep 2009) | 4 lines
branches/zip: ha_innodb.cc: Define MYSQL_PLUGIN_IMPORT when necessary.
This preprocessor symbol has been recently introduced in MySQL 5.1.
The InnoDB Plugin should remain source compatible with MySQL 5.1.24
and later.
------------------------------------------------------------------------
r5988 | calvin | 2009-09-26 05:14:43 +1000 (Sat, 26 Sep 2009) | 8 lines
branches/zip: fix bug#47055 unconditional exit(1) on ERROR_WORKING_SET_QUOTA
1453 (0x5AD) for InnoDB backend
When error ERROR_WORKING_SET_QUOTA or ERROR_NO_SYSTEM_RESOURCES
occurs, yields for 100ms and retries the operation.
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r5992 | vasil | 2009-09-28 17:10:29 +1000 (Mon, 28 Sep 2009) | 4 lines
branches/zip:
Add ChangeLog entry for c5988.
------------------------------------------------------------------------
r5994 | marko | 2009-09-28 18:33:59 +1000 (Mon, 28 Sep 2009) | 17 lines
branches/zip: Try to prevent the reuse of tablespace identifiers after
InnoDB has crashed during table creation. Also, refuse to start if
files with duplicate tablespace identifiers are encountered.
fil_node_create(): Update fil_system->max_assigned_id. This should
prevent the reuse of a space->id when InnoDB does a full crash
recovery and invokes fil_load_single_table_tablespaces(). Normally,
fil_system->max_assigned_id is initialized from
SELECT MAX(ID) FROM SYS_TABLES.
fil_open_single_table_tablespace(): Return FALSE when
fil_space_create() fails.
fil_load_single_table_tablespace(): Exit if fil_space_create() fails
and innodb_force_recovery=0.
rb://173 approved by Heikki Tuuri. This addresses Issue #335.
------------------------------------------------------------------------
r5995 | marko | 2009-09-28 18:52:25 +1000 (Mon, 28 Sep 2009) | 17 lines
branches/zip: Do not write to PAGE_INDEX_ID after page creation,
not even when restoring an uncompressed page after a compression failure.
btr_page_reorganize_low(): On compression failure, do not restore
those page header fields that should not be affected by the
reorganization. Instead, compare the fields.
page_zip_decompress(): Add the parameter ibool all, for copying all
page header fields. Pass the parameter all=TRUE on block read
completion, redo log application, and page_zip_validate(); pass
all=FALSE in all other cases.
page_zip_reorganize(): Do not restore the uncompressed page on
failure. It will be restored (to pre-modification state) by the
caller anyway.
rb://167, Issue #346
------------------------------------------------------------------------
r5996 | marko | 2009-09-28 22:46:02 +1000 (Mon, 28 Sep 2009) | 4 lines
branches/zip: Address Issue #350 in comments.
lock_rec_queue_validate(), lock_rec_queue_validate(): Note that
this debug code may violate the latching order and cause deadlocks.
------------------------------------------------------------------------
r5997 | marko | 2009-09-28 23:03:58 +1000 (Mon, 28 Sep 2009) | 12 lines
branches/zip: Remove an assertion failure when the InnoDB data dictionary
is inconsistent with the MySQL .frm file.
ha_innobase::index_read(): When the index cannot be found,
return an error.
ha_innobase::change_active_index(): When prebuilt->index == NULL,
set also prebuilt->index_usable = FALSE. This is not needed for
correctness, because prebuilt->index_usable is only checked by
row_search_for_mysql(), which requires prebuilt->index != NULL.
This addresses Issue #349. Approved by Heikki Tuuri over IM.
------------------------------------------------------------------------
r6005 | vasil | 2009-09-29 18:09:52 +1000 (Tue, 29 Sep 2009) | 4 lines
branches/zip:
ChangeLog: wrap around 78th column, not earlier.
------------------------------------------------------------------------
r6006 | vasil | 2009-09-29 20:15:25 +1000 (Tue, 29 Sep 2009) | 4 lines
branches/zip:
Add ChangeLog entry for the release of 1.0.4.
------------------------------------------------------------------------
r6007 | vasil | 2009-09-29 23:19:59 +1000 (Tue, 29 Sep 2009) | 6 lines
branches/zip:
Fix the year, should be 2009.
Pointed by: Calvin
------------------------------------------------------------------------
r6026 | marko | 2009-09-30 17:18:24 +1000 (Wed, 30 Sep 2009) | 1 line
branches/zip: Add some debug assertions for checking FSEG_MAGIC_N.
------------------------------------------------------------------------
r6028 | marko | 2009-09-30 23:55:23 +1000 (Wed, 30 Sep 2009) | 3 lines
branches/zip: recv_no_log_write: New debug flag for tracking down
Mantis Issue #347. No modifications should be made to the database
while recv_apply_hashed_log_recs() is about to complete.
------------------------------------------------------------------------
r6029 | calvin | 2009-10-01 06:32:02 +1000 (Thu, 01 Oct 2009) | 4 lines
branches/zip: non-functional changes
Fix typo.
------------------------------------------------------------------------
r6031 | marko | 2009-10-01 21:24:33 +1000 (Thu, 01 Oct 2009) | 49 lines
branches/zip: Clean up after a crash during DROP INDEX.
When InnoDB crashes while dropping an index, ensure that
the index will be completely dropped during crash recovery.
row_merge_drop_index(): Before dropping an index, rename the index to
start with TEMP_INDEX_PREFIX_STR and commit the change, so that
row_merge_drop_temp_indexes() will drop the index after crash
recovery if the server crashes while dropping the index.
fseg_inode_try_get(): New function, forked from fseg_inode_get().
Return NULL if the file segment index node is free.
fseg_inode_get(): Assert that the file segment index node is not free.
fseg_free_step(): If the file segment index node is already free,
print a diagnostic message and return TRUE.
fsp_free_seg_inode(): Write a nonzero number to FSEG_MAGIC_N, so that
allocated-and-freed file segment index nodes can be better
distinguished from uninitialized ones.
This is rb://174, addressing Issue #348.
Tested by restarting mysqld upon the completion of the added
log_write_up_to() invocation below, during DROP INDEX. The index was
dropped after crash recovery, and re-issuing the DROP INDEX did not
crash the server.
Index: btr/btr0btr.c
===================================================================
--- btr/btr0btr.c (revision 6026)
+++ btr/btr0btr.c (working copy)
@@ -42,6 +42,7 @@ Created 6/2/1994 Heikki Tuuri
#include "ibuf0ibuf.h"
#include "trx0trx.h"
+#include "log0log.h"
/*
Latching strategy of the InnoDB B-tree
--------------------------------------
@@ -873,6 +874,8 @@ leaf_loop:
goto leaf_loop;
}
+
+ log_write_up_to(mtr.end_lsn, LOG_WAIT_ALL_GROUPS, TRUE);
top_loop:
mtr_start(&mtr);
------------------------------------------------------------------------
r6033 | calvin | 2009-10-02 06:19:46 +1000 (Fri, 02 Oct 2009) | 4 lines
branches/zip: fix a typo in error message
Reported as bug#47763.
------------------------------------------------------------------------
r6043 | inaam | 2009-10-06 01:45:35 +1100 (Tue, 06 Oct 2009) | 12 lines
branches/zip rb://176
Do not invalidate buffer pool while an LRU batch is active. Added
code to buf_pool_invalidate() to wait for the running batches to finish.
This patch also resets the state of buf_pool struct at invalidation. This
addresses the concern where buf_pool->freed_page_clock becomes non-zero
because we read in a system tablespace page for file format info at
startup.
Approved by: Marko
------------------------------------------------------------------------
r6044 | pekka | 2009-10-07 01:44:54 +1100 (Wed, 07 Oct 2009) | 5 lines
branches/zip:
Add os_file_is_same() function for Hot Backup (inside ifdef UNIV_HOTBACKUP).
This is part of the fix for Issue #186.
Note! The Windows implementation is incomplete.
------------------------------------------------------------------------
r6046 | pekka | 2009-10-08 20:24:56 +1100 (Thu, 08 Oct 2009) | 3 lines
branches/zip: Revert r6044 which added os_file_is_same() function
(issue#186). This functionality is moved to Hot Backup source tree.
------------------------------------------------------------------------
r6048 | vasil | 2009-10-09 16:42:55 +1100 (Fri, 09 Oct 2009) | 16 lines
branches/zip:
When scanning a directory readdir() is called and stat() after it,
if a file is deleted between the two calls stat will fail and the
whole precedure will fail. Change this behavior to continue with the
next entry if stat() fails because of nonexistent file. This is
transparent change as it will make it look as if the file was deleted
before the readdir() call.
This change is needed in order to fix
https://svn.innodb.com/mantis/view.php?id=174
in which we need to abort if os_file_readdir_next_file()
encounters "real" errors.
Approved by: Marko, Pekka (rb://177)
------------------------------------------------------------------------
r6049 | vasil | 2009-10-10 03:05:26 +1100 (Sat, 10 Oct 2009) | 7 lines
branches/zip:
Fix compilation warning in Hot Backup:
innodb/fil/fil0fil.c: In function 'fil_load_single_table_tablespace':
innodb/fil/fil0fil.c:3253: warning: format '%lld' expects type 'long long int', but argument 6 has type 'ib_int64_t'
------------------------------------------------------------------------
r6064 | calvin | 2009-10-14 02:23:35 +1100 (Wed, 14 Oct 2009) | 4 lines
branches/zip: non-functional changes
Changes from MySQL to fix build issue.
------------------------------------------------------------------------
r6065 | inaam | 2009-10-14 04:43:13 +1100 (Wed, 14 Oct 2009) | 7 lines
branches/zip rb://182
Call fsync() on datafiles after a batch of pages is written to disk
even when skip_innodb_doublewrite is set.
Approved by: Heikki
------------------------------------------------------------------------
r6080 | sunny | 2009-10-15 09:29:01 +1100 (Thu, 15 Oct 2009) | 3 lines
branches/zip: Change page_mem_alloc_free() to inline.
Fix Bug #47058 - Failure to compile innodb_plugin on solaris 10u7 + spro cc/CC 5.10
------------------------------------------------------------------------
r6084 | vasil | 2009-10-15 16:21:17 +1100 (Thu, 15 Oct 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r6080.
------------------------------------------------------------------------
r6095 | vasil | 2009-10-20 00:04:59 +1100 (Tue, 20 Oct 2009) | 7 lines
branches/zip:
Fix Bug#47808 innodb_information_schema.test fails when run under valgrind
by using the wait_until_rows_count macro that loops until the number of
rows becomes 14 instead of sleep 0.1, which is obviously very fragile.
------------------------------------------------------------------------
r6096 | vasil | 2009-10-20 00:06:09 +1100 (Tue, 20 Oct 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r6095.
------------------------------------------------------------------------
r6099 | jyang | 2009-10-22 13:58:39 +1100 (Thu, 22 Oct 2009) | 7 lines
branches/zip: Port bug #46000 related changes from 5.1 to zip
branch. Due to different code path for creating index in zip
branch comparing to 5.1), the index reserved name check function
is extended to be used in ha_innobase::add_index().
rb://190 Approved by: Marko
------------------------------------------------------------------------
r6100 | jyang | 2009-10-22 14:51:07 +1100 (Thu, 22 Oct 2009) | 6 lines
branches/zip: As a request from mysql, WARN_LEVEL_ERROR cannot
be used for push_warning_* call any more. Switch to
WARN_LEVEL_WARN. Bug #47233.
rb://172 approved by Sunny Bains and Marko.
------------------------------------------------------------------------
r6101 | jyang | 2009-10-23 19:45:50 +1100 (Fri, 23 Oct 2009) | 7 lines
branches/zip: Update test result with the WARN_LEVEL_ERROR
to WARN_LEVEL_WARN change. This is the same result as
submitted in rb://172 review, which approved by Sunny Bains
and Marko.
------------------------------------------------------------------------
r6102 | marko | 2009-10-26 18:32:23 +1100 (Mon, 26 Oct 2009) | 1 line
branches/zip: row_prebuilt_struct::prebuilts: Unused field, remove.
------------------------------------------------------------------------
r6103 | marko | 2009-10-27 00:46:18 +1100 (Tue, 27 Oct 2009) | 4 lines
branches/zip: row_ins_alloc_sys_fields(): Zero out the system columns
DB_TRX_ID, DB_ROLL_PTR and DB_ROW_ID, in order to avoid harmless
Valgrind warnings about uninitialized data. (The warnings were
harmless, because the fields would be initialized at a later stage.)
------------------------------------------------------------------------
r6105 | calvin | 2009-10-28 09:05:52 +1100 (Wed, 28 Oct 2009) | 6 lines
branches/zip: backport r3848 from 6.0 branch
----
branches/6.0: innobase_start_or_create_for_mysql(): Make the 10 MB
minimum tablespace limit independent of UNIV_PAGE_SIZE. (Bug #41490)
------------------------------------------------------------------------
r6107 | marko | 2009-10-29 01:10:34 +1100 (Thu, 29 Oct 2009) | 5 lines
branches/zip: buf_page_set_old(): Improve UNIV_LRU_DEBUG diagnostics
in order to catch the buf_pool->LRU_old corruption reported in Issue #381.
buf_LRU_old_init(): Set the property from the tail towards the front
of the buf_pool->LRU list, in order not to trip the debug check.
------------------------------------------------------------------------
r6108 | calvin | 2009-10-29 16:58:04 +1100 (Thu, 29 Oct 2009) | 5 lines
branches/zip: close file handle when building with UNIV_HOTBACKUP
The change does not affect regular InnoDB engine. Confirmed by
Marko.
------------------------------------------------------------------------
r6109 | jyang | 2009-10-29 19:37:32 +1100 (Thu, 29 Oct 2009) | 7 lines
branches/zip: In os_mem_alloc_large(), if we fail to attach
the shared memory, reset memory pointer ptr to NULL, and
allocate memory from conventional pool.
Bug #48237 Error handling in os_mem_alloc_large appears to be incorrect
rb://198 Approved by: Marko
------------------------------------------------------------------------
r6110 | marko | 2009-10-29 21:44:57 +1100 (Thu, 29 Oct 2009) | 2 lines
branches/zip: Makefile.am (INCLUDES): Merge a change from MySQL:
Use $(srcdir)/include instead of $(top_srcdir)/storage/innobase/include.
------------------------------------------------------------------------
r6111 | marko | 2009-10-29 22:04:11 +1100 (Thu, 29 Oct 2009) | 33 lines
branches/zip: Fix corruption of buf_pool->LRU_old and improve debug assertions.
This was reported as Issue #381.
buf_page_set_old(): Assert that blocks may only be set old if
buf_pool->LRU_old is initialized and buf_pool->LRU_old_len is nonzero.
Assert that buf_pool->LRU_old points to the block at the old/new boundary.
buf_LRU_old_adjust_len(): Invoke buf_page_set_old() after adjusting
buf_pool->LRU_old and buf_pool->LRU_old_len, in order not to violate
the added assertions.
buf_LRU_old_init(): Replace buf_page_set_old() with a direct
assignment to bpage->old, because these loops that initialize all the
blocks would temporarily violate the assertions about
buf_pool->LRU_old.
buf_LRU_remove_block(): When setting buf_pool->LRU_old = NULL, also
clear all bpage->old flags and set buf_pool->LRU_old_len = 0.
buf_LRU_add_block_to_end_low(), buf_LRU_add_block_low(): Move the
buf_page_set_old() call later in order not to violate the debug
assertions. If buf_pool->LRU_old is NULL, set old=FALSE.
buf_LRU_free_block(): Replace the UNIV_LRU_DEBUG assertion with a
dummy buf_page_set_old() call that performs more thorough checks.
buf_LRU_validate(): Do not tolerate garbage in buf_pool->LRU_old_len
even if buf_pool->LRU_old is NULL. Check that bpage->old is monotonic.
buf_relocate(): Make the UNIV_LRU_DEBUG checks stricter.
buf0buf.h: Revise the documentation of buf_page_t::old and
buf_pool_t::LRU_old_len.
------------------------------------------------------------------------
r6112 | calvin | 2009-10-30 01:21:15 +1100 (Fri, 30 Oct 2009) | 4 lines
branches/zip: consideration for icc compilers
Proposed by MySQL, and approved by Marko.
------------------------------------------------------------------------
r6113 | vasil | 2009-10-30 03:15:50 +1100 (Fri, 30 Oct 2009) | 93 lines
branches/zip: Merge r5912:6112 from branches/5.1:
(after this merge the innodb-autoinc test starts to fail, but
I commit anyway because it would be easier to investigate the
failure this way)
------------------------------------------------------------------------
r5952 | calvin | 2009-09-22 19:45:07 +0300 (Tue, 22 Sep 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: fix bug#42383: Can't create table 'test.bug39438'
For embedded server, MySQL may pass in full path, which is
currently disallowed. It is needed to relax the condition by
accepting full paths in the embedded case.
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r6032 | vasil | 2009-10-01 15:55:49 +0300 (Thu, 01 Oct 2009) | 8 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Fix Bug#38996 Race condition in ANALYZE TABLE
by serializing ANALYZE TABLE inside InnoDB.
Approved by: Heikki (rb://175)
------------------------------------------------------------------------
r6045 | jyang | 2009-10-08 02:27:08 +0300 (Thu, 08 Oct 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug47777.result
A /branches/5.1/mysql-test/innodb_bug47777.test
branches/5.1: Fix bug #47777. Treat the Geometry data same as
Binary BLOB in ha_innobase::store_key_val_for_row(), since the
Geometry data is stored as Binary BLOB in Innodb.
Review: rb://180 approved by Marko Makela.
------------------------------------------------------------------------
r6051 | sunny | 2009-10-12 07:05:00 +0300 (Mon, 12 Oct 2009) | 6 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Ignore negative values supplied by the user when calculating the
next value to store in dict_table_t. Setting autoincrement columns top negative
values is undefined behavior and this change should bring the behavior of
InnoDB closer to what users expect. Added several tests to check.
rb://162
------------------------------------------------------------------------
r6052 | sunny | 2009-10-12 07:09:56 +0300 (Mon, 12 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Reset the statement level autoinc counter on ROLLBACK. Fix
the test results too.
rb://164
------------------------------------------------------------------------
r6053 | sunny | 2009-10-12 07:37:49 +0300 (Mon, 12 Oct 2009) | 6 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Copy the maximum AUTOINC value from the old table to the new
table when MySQL does a CREATE INDEX ON T. This is required because MySQL
does a table copy, rename and drops the old table.
Fix Bug#47125: auto_increment start value is ignored if an index is created and engine=innodb
rb://168
------------------------------------------------------------------------
r6076 | vasil | 2009-10-14 19:30:12 +0300 (Wed, 14 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/row/row0mysql.c
branches/5.1:
Fix typo.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6114 | vasil | 2009-10-30 03:43:51 +1100 (Fri, 30 Oct 2009) | 6 lines
branches/zip:
* Add ChangeLog entries for latest changes
* Obey alphabetical order in the list of the files
* White-space fixup
------------------------------------------------------------------------
r6121 | sunny | 2009-10-30 10:42:11 +1100 (Fri, 30 Oct 2009) | 7 lines
branches/zip: This test has been problematic for sometime now. The underlying
bug is that the data dictionaries get out of sync. In the AUTOINC code we
try and apply salve to the symptoms. In the past MySQL made some unrelated
change and the dictionaries stopped getting out of sync and this test started
to fail. Now, it seems they have reverted that changed and the test is
passing again. I suspect this is not he last time that this test will change.
------------------------------------------------------------------------
r6124 | jyang | 2009-10-30 19:02:31 +1100 (Fri, 30 Oct 2009) | 5 lines
branches/zip: Correct the bug number for -r6109 change
from # 48273 to #48237
------------------------------------------------------------------------
r6126 | vasil | 2009-10-30 19:36:07 +1100 (Fri, 30 Oct 2009) | 45 lines
branches/zip: Merge r6112:6125 from branches/5.1:
(skipping r6122 and r6123, Jimmy says these are already present and need
not be merged):
------------------------------------------------------------------------
r6122 | jyang | 2009-10-30 05:18:38 +0200 (Fri, 30 Oct 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb_bug44369.result
M /branches/5.1/mysql-test/innodb_bug44369.test
M /branches/5.1/mysql-test/innodb_bug46000.result
M /branches/5.1/mysql-test/innodb_bug46000.test
branches/5.1: Chnage WARN_LEVEL_ERROR to WARN_LEVEL_WARN
for push_warning_printf() call in innodb.
Fix Bug#47233: Innodb calls push_warning(MYSQL_ERROR::WARN_LEVEL_ERROR)
rb://170 approved by Marko.
------------------------------------------------------------------------
r6123 | jyang | 2009-10-30 05:43:06 +0200 (Fri, 30 Oct 2009) | 8 lines
Changed paths:
M /branches/5.1/os/os0proc.c
branches/5.1: In os_mem_alloc_large(), if we fail to attach
the shared memory, reset memory pointer ptr to NULL, and
allocate memory from conventional pool. This is a port
from branches/zip.
Bug #48237 Error handling in os_mem_alloc_large appears to be incorrect
rb://198 Approved by: Marko
------------------------------------------------------------------------
r6125 | vasil | 2009-10-30 10:31:23 +0200 (Fri, 30 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
White-space fixup.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6130 | marko | 2009-11-02 20:42:56 +1100 (Mon, 02 Nov 2009) | 9 lines
branches/zip: Free all resources at shutdown. Set pointers to NULL, so
that Valgrind will not complain about freed data structures that are
reachable via pointers. This addresses Bug #45992 and Bug #46656.
This patch is mostly based on changes copied from branches/embedded-1.0,
mainly c5432, c3439, c3134, c2994, c2978, but also some other code was
copied. Some added cleanup code is specific to MySQL/InnoDB.
rb://199 approved by Sunny Bains
------------------------------------------------------------------------
2009-11-04 07:02:00 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
UT_DELETE(s_reads);
|
|
|
|
s_reads = NULL;
|
|
|
|
}
|
branches/innodb+: Merge revisions r5971:6130 from branches/zip.
------------------------------------------------------------------------
r5971 | marko | 2009-09-23 23:03:51 +1000 (Wed, 23 Sep 2009) | 2 lines
branches/zip: os_file_pwrite(): Make the code compile in InnoDB Hot Backup
when the pwrite system call is not available.
------------------------------------------------------------------------
r5972 | marko | 2009-09-24 05:44:52 +1000 (Thu, 24 Sep 2009) | 5 lines
branches/zip: fil_node_open_file(): In InnoDB Hot Backup,
determine the page size of single-file tablespaces before computing
the file node size. Otherwise, the space->size of compressed tablespaces
would be computed with UNIV_PAGE_SIZE instead of key_block_size.
This should fix Issue #313.
------------------------------------------------------------------------
r5973 | marko | 2009-09-24 05:53:21 +1000 (Thu, 24 Sep 2009) | 2 lines
branches/zip: recv_add_to_hash_table():
Simplify obfuscated pointer arithmetics.
------------------------------------------------------------------------
r5978 | marko | 2009-09-24 17:47:56 +1000 (Thu, 24 Sep 2009) | 1 line
branches/zip: Fix warnings and errors when UNIV_HOTBACKUP is defined.
------------------------------------------------------------------------
r5979 | marko | 2009-09-24 20:16:10 +1000 (Thu, 24 Sep 2009) | 4 lines
branches/zip: ha_innodb.cc: Define MYSQL_PLUGIN_IMPORT when necessary.
This preprocessor symbol has been recently introduced in MySQL 5.1.
The InnoDB Plugin should remain source compatible with MySQL 5.1.24
and later.
------------------------------------------------------------------------
r5988 | calvin | 2009-09-26 05:14:43 +1000 (Sat, 26 Sep 2009) | 8 lines
branches/zip: fix bug#47055 unconditional exit(1) on ERROR_WORKING_SET_QUOTA
1453 (0x5AD) for InnoDB backend
When error ERROR_WORKING_SET_QUOTA or ERROR_NO_SYSTEM_RESOURCES
occurs, yields for 100ms and retries the operation.
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r5992 | vasil | 2009-09-28 17:10:29 +1000 (Mon, 28 Sep 2009) | 4 lines
branches/zip:
Add ChangeLog entry for c5988.
------------------------------------------------------------------------
r5994 | marko | 2009-09-28 18:33:59 +1000 (Mon, 28 Sep 2009) | 17 lines
branches/zip: Try to prevent the reuse of tablespace identifiers after
InnoDB has crashed during table creation. Also, refuse to start if
files with duplicate tablespace identifiers are encountered.
fil_node_create(): Update fil_system->max_assigned_id. This should
prevent the reuse of a space->id when InnoDB does a full crash
recovery and invokes fil_load_single_table_tablespaces(). Normally,
fil_system->max_assigned_id is initialized from
SELECT MAX(ID) FROM SYS_TABLES.
fil_open_single_table_tablespace(): Return FALSE when
fil_space_create() fails.
fil_load_single_table_tablespace(): Exit if fil_space_create() fails
and innodb_force_recovery=0.
rb://173 approved by Heikki Tuuri. This addresses Issue #335.
------------------------------------------------------------------------
r5995 | marko | 2009-09-28 18:52:25 +1000 (Mon, 28 Sep 2009) | 17 lines
branches/zip: Do not write to PAGE_INDEX_ID after page creation,
not even when restoring an uncompressed page after a compression failure.
btr_page_reorganize_low(): On compression failure, do not restore
those page header fields that should not be affected by the
reorganization. Instead, compare the fields.
page_zip_decompress(): Add the parameter ibool all, for copying all
page header fields. Pass the parameter all=TRUE on block read
completion, redo log application, and page_zip_validate(); pass
all=FALSE in all other cases.
page_zip_reorganize(): Do not restore the uncompressed page on
failure. It will be restored (to pre-modification state) by the
caller anyway.
rb://167, Issue #346
------------------------------------------------------------------------
r5996 | marko | 2009-09-28 22:46:02 +1000 (Mon, 28 Sep 2009) | 4 lines
branches/zip: Address Issue #350 in comments.
lock_rec_queue_validate(), lock_rec_queue_validate(): Note that
this debug code may violate the latching order and cause deadlocks.
------------------------------------------------------------------------
r5997 | marko | 2009-09-28 23:03:58 +1000 (Mon, 28 Sep 2009) | 12 lines
branches/zip: Remove an assertion failure when the InnoDB data dictionary
is inconsistent with the MySQL .frm file.
ha_innobase::index_read(): When the index cannot be found,
return an error.
ha_innobase::change_active_index(): When prebuilt->index == NULL,
set also prebuilt->index_usable = FALSE. This is not needed for
correctness, because prebuilt->index_usable is only checked by
row_search_for_mysql(), which requires prebuilt->index != NULL.
This addresses Issue #349. Approved by Heikki Tuuri over IM.
------------------------------------------------------------------------
r6005 | vasil | 2009-09-29 18:09:52 +1000 (Tue, 29 Sep 2009) | 4 lines
branches/zip:
ChangeLog: wrap around 78th column, not earlier.
------------------------------------------------------------------------
r6006 | vasil | 2009-09-29 20:15:25 +1000 (Tue, 29 Sep 2009) | 4 lines
branches/zip:
Add ChangeLog entry for the release of 1.0.4.
------------------------------------------------------------------------
r6007 | vasil | 2009-09-29 23:19:59 +1000 (Tue, 29 Sep 2009) | 6 lines
branches/zip:
Fix the year, should be 2009.
Pointed by: Calvin
------------------------------------------------------------------------
r6026 | marko | 2009-09-30 17:18:24 +1000 (Wed, 30 Sep 2009) | 1 line
branches/zip: Add some debug assertions for checking FSEG_MAGIC_N.
------------------------------------------------------------------------
r6028 | marko | 2009-09-30 23:55:23 +1000 (Wed, 30 Sep 2009) | 3 lines
branches/zip: recv_no_log_write: New debug flag for tracking down
Mantis Issue #347. No modifications should be made to the database
while recv_apply_hashed_log_recs() is about to complete.
------------------------------------------------------------------------
r6029 | calvin | 2009-10-01 06:32:02 +1000 (Thu, 01 Oct 2009) | 4 lines
branches/zip: non-functional changes
Fix typo.
------------------------------------------------------------------------
r6031 | marko | 2009-10-01 21:24:33 +1000 (Thu, 01 Oct 2009) | 49 lines
branches/zip: Clean up after a crash during DROP INDEX.
When InnoDB crashes while dropping an index, ensure that
the index will be completely dropped during crash recovery.
row_merge_drop_index(): Before dropping an index, rename the index to
start with TEMP_INDEX_PREFIX_STR and commit the change, so that
row_merge_drop_temp_indexes() will drop the index after crash
recovery if the server crashes while dropping the index.
fseg_inode_try_get(): New function, forked from fseg_inode_get().
Return NULL if the file segment index node is free.
fseg_inode_get(): Assert that the file segment index node is not free.
fseg_free_step(): If the file segment index node is already free,
print a diagnostic message and return TRUE.
fsp_free_seg_inode(): Write a nonzero number to FSEG_MAGIC_N, so that
allocated-and-freed file segment index nodes can be better
distinguished from uninitialized ones.
This is rb://174, addressing Issue #348.
Tested by restarting mysqld upon the completion of the added
log_write_up_to() invocation below, during DROP INDEX. The index was
dropped after crash recovery, and re-issuing the DROP INDEX did not
crash the server.
Index: btr/btr0btr.c
===================================================================
--- btr/btr0btr.c (revision 6026)
+++ btr/btr0btr.c (working copy)
@@ -42,6 +42,7 @@ Created 6/2/1994 Heikki Tuuri
#include "ibuf0ibuf.h"
#include "trx0trx.h"
+#include "log0log.h"
/*
Latching strategy of the InnoDB B-tree
--------------------------------------
@@ -873,6 +874,8 @@ leaf_loop:
goto leaf_loop;
}
+
+ log_write_up_to(mtr.end_lsn, LOG_WAIT_ALL_GROUPS, TRUE);
top_loop:
mtr_start(&mtr);
------------------------------------------------------------------------
r6033 | calvin | 2009-10-02 06:19:46 +1000 (Fri, 02 Oct 2009) | 4 lines
branches/zip: fix a typo in error message
Reported as bug#47763.
------------------------------------------------------------------------
r6043 | inaam | 2009-10-06 01:45:35 +1100 (Tue, 06 Oct 2009) | 12 lines
branches/zip rb://176
Do not invalidate buffer pool while an LRU batch is active. Added
code to buf_pool_invalidate() to wait for the running batches to finish.
This patch also resets the state of buf_pool struct at invalidation. This
addresses the concern where buf_pool->freed_page_clock becomes non-zero
because we read in a system tablespace page for file format info at
startup.
Approved by: Marko
------------------------------------------------------------------------
r6044 | pekka | 2009-10-07 01:44:54 +1100 (Wed, 07 Oct 2009) | 5 lines
branches/zip:
Add os_file_is_same() function for Hot Backup (inside ifdef UNIV_HOTBACKUP).
This is part of the fix for Issue #186.
Note! The Windows implementation is incomplete.
------------------------------------------------------------------------
r6046 | pekka | 2009-10-08 20:24:56 +1100 (Thu, 08 Oct 2009) | 3 lines
branches/zip: Revert r6044 which added os_file_is_same() function
(issue#186). This functionality is moved to Hot Backup source tree.
------------------------------------------------------------------------
r6048 | vasil | 2009-10-09 16:42:55 +1100 (Fri, 09 Oct 2009) | 16 lines
branches/zip:
When scanning a directory readdir() is called and stat() after it,
if a file is deleted between the two calls stat will fail and the
whole precedure will fail. Change this behavior to continue with the
next entry if stat() fails because of nonexistent file. This is
transparent change as it will make it look as if the file was deleted
before the readdir() call.
This change is needed in order to fix
https://svn.innodb.com/mantis/view.php?id=174
in which we need to abort if os_file_readdir_next_file()
encounters "real" errors.
Approved by: Marko, Pekka (rb://177)
------------------------------------------------------------------------
r6049 | vasil | 2009-10-10 03:05:26 +1100 (Sat, 10 Oct 2009) | 7 lines
branches/zip:
Fix compilation warning in Hot Backup:
innodb/fil/fil0fil.c: In function 'fil_load_single_table_tablespace':
innodb/fil/fil0fil.c:3253: warning: format '%lld' expects type 'long long int', but argument 6 has type 'ib_int64_t'
------------------------------------------------------------------------
r6064 | calvin | 2009-10-14 02:23:35 +1100 (Wed, 14 Oct 2009) | 4 lines
branches/zip: non-functional changes
Changes from MySQL to fix build issue.
------------------------------------------------------------------------
r6065 | inaam | 2009-10-14 04:43:13 +1100 (Wed, 14 Oct 2009) | 7 lines
branches/zip rb://182
Call fsync() on datafiles after a batch of pages is written to disk
even when skip_innodb_doublewrite is set.
Approved by: Heikki
------------------------------------------------------------------------
r6080 | sunny | 2009-10-15 09:29:01 +1100 (Thu, 15 Oct 2009) | 3 lines
branches/zip: Change page_mem_alloc_free() to inline.
Fix Bug #47058 - Failure to compile innodb_plugin on solaris 10u7 + spro cc/CC 5.10
------------------------------------------------------------------------
r6084 | vasil | 2009-10-15 16:21:17 +1100 (Thu, 15 Oct 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r6080.
------------------------------------------------------------------------
r6095 | vasil | 2009-10-20 00:04:59 +1100 (Tue, 20 Oct 2009) | 7 lines
branches/zip:
Fix Bug#47808 innodb_information_schema.test fails when run under valgrind
by using the wait_until_rows_count macro that loops until the number of
rows becomes 14 instead of sleep 0.1, which is obviously very fragile.
------------------------------------------------------------------------
r6096 | vasil | 2009-10-20 00:06:09 +1100 (Tue, 20 Oct 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r6095.
------------------------------------------------------------------------
r6099 | jyang | 2009-10-22 13:58:39 +1100 (Thu, 22 Oct 2009) | 7 lines
branches/zip: Port bug #46000 related changes from 5.1 to zip
branch. Due to different code path for creating index in zip
branch comparing to 5.1), the index reserved name check function
is extended to be used in ha_innobase::add_index().
rb://190 Approved by: Marko
------------------------------------------------------------------------
r6100 | jyang | 2009-10-22 14:51:07 +1100 (Thu, 22 Oct 2009) | 6 lines
branches/zip: As a request from mysql, WARN_LEVEL_ERROR cannot
be used for push_warning_* call any more. Switch to
WARN_LEVEL_WARN. Bug #47233.
rb://172 approved by Sunny Bains and Marko.
------------------------------------------------------------------------
r6101 | jyang | 2009-10-23 19:45:50 +1100 (Fri, 23 Oct 2009) | 7 lines
branches/zip: Update test result with the WARN_LEVEL_ERROR
to WARN_LEVEL_WARN change. This is the same result as
submitted in rb://172 review, which approved by Sunny Bains
and Marko.
------------------------------------------------------------------------
r6102 | marko | 2009-10-26 18:32:23 +1100 (Mon, 26 Oct 2009) | 1 line
branches/zip: row_prebuilt_struct::prebuilts: Unused field, remove.
------------------------------------------------------------------------
r6103 | marko | 2009-10-27 00:46:18 +1100 (Tue, 27 Oct 2009) | 4 lines
branches/zip: row_ins_alloc_sys_fields(): Zero out the system columns
DB_TRX_ID, DB_ROLL_PTR and DB_ROW_ID, in order to avoid harmless
Valgrind warnings about uninitialized data. (The warnings were
harmless, because the fields would be initialized at a later stage.)
------------------------------------------------------------------------
r6105 | calvin | 2009-10-28 09:05:52 +1100 (Wed, 28 Oct 2009) | 6 lines
branches/zip: backport r3848 from 6.0 branch
----
branches/6.0: innobase_start_or_create_for_mysql(): Make the 10 MB
minimum tablespace limit independent of UNIV_PAGE_SIZE. (Bug #41490)
------------------------------------------------------------------------
r6107 | marko | 2009-10-29 01:10:34 +1100 (Thu, 29 Oct 2009) | 5 lines
branches/zip: buf_page_set_old(): Improve UNIV_LRU_DEBUG diagnostics
in order to catch the buf_pool->LRU_old corruption reported in Issue #381.
buf_LRU_old_init(): Set the property from the tail towards the front
of the buf_pool->LRU list, in order not to trip the debug check.
------------------------------------------------------------------------
r6108 | calvin | 2009-10-29 16:58:04 +1100 (Thu, 29 Oct 2009) | 5 lines
branches/zip: close file handle when building with UNIV_HOTBACKUP
The change does not affect regular InnoDB engine. Confirmed by
Marko.
------------------------------------------------------------------------
r6109 | jyang | 2009-10-29 19:37:32 +1100 (Thu, 29 Oct 2009) | 7 lines
branches/zip: In os_mem_alloc_large(), if we fail to attach
the shared memory, reset memory pointer ptr to NULL, and
allocate memory from conventional pool.
Bug #48237 Error handling in os_mem_alloc_large appears to be incorrect
rb://198 Approved by: Marko
------------------------------------------------------------------------
r6110 | marko | 2009-10-29 21:44:57 +1100 (Thu, 29 Oct 2009) | 2 lines
branches/zip: Makefile.am (INCLUDES): Merge a change from MySQL:
Use $(srcdir)/include instead of $(top_srcdir)/storage/innobase/include.
------------------------------------------------------------------------
r6111 | marko | 2009-10-29 22:04:11 +1100 (Thu, 29 Oct 2009) | 33 lines
branches/zip: Fix corruption of buf_pool->LRU_old and improve debug assertions.
This was reported as Issue #381.
buf_page_set_old(): Assert that blocks may only be set old if
buf_pool->LRU_old is initialized and buf_pool->LRU_old_len is nonzero.
Assert that buf_pool->LRU_old points to the block at the old/new boundary.
buf_LRU_old_adjust_len(): Invoke buf_page_set_old() after adjusting
buf_pool->LRU_old and buf_pool->LRU_old_len, in order not to violate
the added assertions.
buf_LRU_old_init(): Replace buf_page_set_old() with a direct
assignment to bpage->old, because these loops that initialize all the
blocks would temporarily violate the assertions about
buf_pool->LRU_old.
buf_LRU_remove_block(): When setting buf_pool->LRU_old = NULL, also
clear all bpage->old flags and set buf_pool->LRU_old_len = 0.
buf_LRU_add_block_to_end_low(), buf_LRU_add_block_low(): Move the
buf_page_set_old() call later in order not to violate the debug
assertions. If buf_pool->LRU_old is NULL, set old=FALSE.
buf_LRU_free_block(): Replace the UNIV_LRU_DEBUG assertion with a
dummy buf_page_set_old() call that performs more thorough checks.
buf_LRU_validate(): Do not tolerate garbage in buf_pool->LRU_old_len
even if buf_pool->LRU_old is NULL. Check that bpage->old is monotonic.
buf_relocate(): Make the UNIV_LRU_DEBUG checks stricter.
buf0buf.h: Revise the documentation of buf_page_t::old and
buf_pool_t::LRU_old_len.
------------------------------------------------------------------------
r6112 | calvin | 2009-10-30 01:21:15 +1100 (Fri, 30 Oct 2009) | 4 lines
branches/zip: consideration for icc compilers
Proposed by MySQL, and approved by Marko.
------------------------------------------------------------------------
r6113 | vasil | 2009-10-30 03:15:50 +1100 (Fri, 30 Oct 2009) | 93 lines
branches/zip: Merge r5912:6112 from branches/5.1:
(after this merge the innodb-autoinc test starts to fail, but
I commit anyway because it would be easier to investigate the
failure this way)
------------------------------------------------------------------------
r5952 | calvin | 2009-09-22 19:45:07 +0300 (Tue, 22 Sep 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: fix bug#42383: Can't create table 'test.bug39438'
For embedded server, MySQL may pass in full path, which is
currently disallowed. It is needed to relax the condition by
accepting full paths in the embedded case.
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r6032 | vasil | 2009-10-01 15:55:49 +0300 (Thu, 01 Oct 2009) | 8 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Fix Bug#38996 Race condition in ANALYZE TABLE
by serializing ANALYZE TABLE inside InnoDB.
Approved by: Heikki (rb://175)
------------------------------------------------------------------------
r6045 | jyang | 2009-10-08 02:27:08 +0300 (Thu, 08 Oct 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug47777.result
A /branches/5.1/mysql-test/innodb_bug47777.test
branches/5.1: Fix bug #47777. Treat the Geometry data same as
Binary BLOB in ha_innobase::store_key_val_for_row(), since the
Geometry data is stored as Binary BLOB in Innodb.
Review: rb://180 approved by Marko Makela.
------------------------------------------------------------------------
r6051 | sunny | 2009-10-12 07:05:00 +0300 (Mon, 12 Oct 2009) | 6 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Ignore negative values supplied by the user when calculating the
next value to store in dict_table_t. Setting autoincrement columns top negative
values is undefined behavior and this change should bring the behavior of
InnoDB closer to what users expect. Added several tests to check.
rb://162
------------------------------------------------------------------------
r6052 | sunny | 2009-10-12 07:09:56 +0300 (Mon, 12 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Reset the statement level autoinc counter on ROLLBACK. Fix
the test results too.
rb://164
------------------------------------------------------------------------
r6053 | sunny | 2009-10-12 07:37:49 +0300 (Mon, 12 Oct 2009) | 6 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Copy the maximum AUTOINC value from the old table to the new
table when MySQL does a CREATE INDEX ON T. This is required because MySQL
does a table copy, rename and drops the old table.
Fix Bug#47125: auto_increment start value is ignored if an index is created and engine=innodb
rb://168
------------------------------------------------------------------------
r6076 | vasil | 2009-10-14 19:30:12 +0300 (Wed, 14 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/row/row0mysql.c
branches/5.1:
Fix typo.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6114 | vasil | 2009-10-30 03:43:51 +1100 (Fri, 30 Oct 2009) | 6 lines
branches/zip:
* Add ChangeLog entries for latest changes
* Obey alphabetical order in the list of the files
* White-space fixup
------------------------------------------------------------------------
r6121 | sunny | 2009-10-30 10:42:11 +1100 (Fri, 30 Oct 2009) | 7 lines
branches/zip: This test has been problematic for sometime now. The underlying
bug is that the data dictionaries get out of sync. In the AUTOINC code we
try and apply salve to the symptoms. In the past MySQL made some unrelated
change and the dictionaries stopped getting out of sync and this test started
to fail. Now, it seems they have reverted that changed and the test is
passing again. I suspect this is not he last time that this test will change.
------------------------------------------------------------------------
r6124 | jyang | 2009-10-30 19:02:31 +1100 (Fri, 30 Oct 2009) | 5 lines
branches/zip: Correct the bug number for -r6109 change
from # 48273 to #48237
------------------------------------------------------------------------
r6126 | vasil | 2009-10-30 19:36:07 +1100 (Fri, 30 Oct 2009) | 45 lines
branches/zip: Merge r6112:6125 from branches/5.1:
(skipping r6122 and r6123, Jimmy says these are already present and need
not be merged):
------------------------------------------------------------------------
r6122 | jyang | 2009-10-30 05:18:38 +0200 (Fri, 30 Oct 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb_bug44369.result
M /branches/5.1/mysql-test/innodb_bug44369.test
M /branches/5.1/mysql-test/innodb_bug46000.result
M /branches/5.1/mysql-test/innodb_bug46000.test
branches/5.1: Chnage WARN_LEVEL_ERROR to WARN_LEVEL_WARN
for push_warning_printf() call in innodb.
Fix Bug#47233: Innodb calls push_warning(MYSQL_ERROR::WARN_LEVEL_ERROR)
rb://170 approved by Marko.
------------------------------------------------------------------------
r6123 | jyang | 2009-10-30 05:43:06 +0200 (Fri, 30 Oct 2009) | 8 lines
Changed paths:
M /branches/5.1/os/os0proc.c
branches/5.1: In os_mem_alloc_large(), if we fail to attach
the shared memory, reset memory pointer ptr to NULL, and
allocate memory from conventional pool. This is a port
from branches/zip.
Bug #48237 Error handling in os_mem_alloc_large appears to be incorrect
rb://198 Approved by: Marko
------------------------------------------------------------------------
r6125 | vasil | 2009-10-30 10:31:23 +0200 (Fri, 30 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
White-space fixup.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6130 | marko | 2009-11-02 20:42:56 +1100 (Mon, 02 Nov 2009) | 9 lines
branches/zip: Free all resources at shutdown. Set pointers to NULL, so
that Valgrind will not complain about freed data structures that are
reachable via pointers. This addresses Bug #45992 and Bug #46656.
This patch is mostly based on changes copied from branches/embedded-1.0,
mainly c5432, c3439, c3134, c2994, c2978, but also some other code was
copied. Some added cleanup code is specific to MySQL/InnoDB.
rb://199 approved by Sunny Bains
------------------------------------------------------------------------
2009-11-04 07:02:00 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Initializes the asynchronous io system. Creates one array each for ibuf
|
|
|
|
and log i/o. Also creates one array each for read and write where each
|
|
|
|
array is divided logically into n_readers and n_writers
|
|
|
|
respectively. The caller must create an i/o handler thread for each
|
|
|
|
segment in these arrays. This function also creates the sync array.
|
|
|
|
No i/o handler thread needs to be created for that
|
|
|
|
@param[in] n_readers number of reader threads
|
|
|
|
@param[in] n_writers number of writer threads
|
|
|
|
@param[in] n_slots_sync number of slots in the sync aio array */
|
|
|
|
bool
|
|
|
|
os_aio_init(
|
|
|
|
ulint n_readers,
|
|
|
|
ulint n_writers,
|
|
|
|
ulint n_slots_sync)
|
|
|
|
{
|
|
|
|
/* Maximum number of pending aio operations allowed per segment */
|
|
|
|
ulint limit = 8 * OS_AIO_N_PENDING_IOS_PER_THREAD;
|
|
|
|
|
|
|
|
return(AIO::start(limit, n_readers, n_writers, n_slots_sync));
|
branches/innodb+: Merge revisions r5971:6130 from branches/zip.
------------------------------------------------------------------------
r5971 | marko | 2009-09-23 23:03:51 +1000 (Wed, 23 Sep 2009) | 2 lines
branches/zip: os_file_pwrite(): Make the code compile in InnoDB Hot Backup
when the pwrite system call is not available.
------------------------------------------------------------------------
r5972 | marko | 2009-09-24 05:44:52 +1000 (Thu, 24 Sep 2009) | 5 lines
branches/zip: fil_node_open_file(): In InnoDB Hot Backup,
determine the page size of single-file tablespaces before computing
the file node size. Otherwise, the space->size of compressed tablespaces
would be computed with UNIV_PAGE_SIZE instead of key_block_size.
This should fix Issue #313.
------------------------------------------------------------------------
r5973 | marko | 2009-09-24 05:53:21 +1000 (Thu, 24 Sep 2009) | 2 lines
branches/zip: recv_add_to_hash_table():
Simplify obfuscated pointer arithmetics.
------------------------------------------------------------------------
r5978 | marko | 2009-09-24 17:47:56 +1000 (Thu, 24 Sep 2009) | 1 line
branches/zip: Fix warnings and errors when UNIV_HOTBACKUP is defined.
------------------------------------------------------------------------
r5979 | marko | 2009-09-24 20:16:10 +1000 (Thu, 24 Sep 2009) | 4 lines
branches/zip: ha_innodb.cc: Define MYSQL_PLUGIN_IMPORT when necessary.
This preprocessor symbol has been recently introduced in MySQL 5.1.
The InnoDB Plugin should remain source compatible with MySQL 5.1.24
and later.
------------------------------------------------------------------------
r5988 | calvin | 2009-09-26 05:14:43 +1000 (Sat, 26 Sep 2009) | 8 lines
branches/zip: fix bug#47055 unconditional exit(1) on ERROR_WORKING_SET_QUOTA
1453 (0x5AD) for InnoDB backend
When error ERROR_WORKING_SET_QUOTA or ERROR_NO_SYSTEM_RESOURCES
occurs, yields for 100ms and retries the operation.
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r5992 | vasil | 2009-09-28 17:10:29 +1000 (Mon, 28 Sep 2009) | 4 lines
branches/zip:
Add ChangeLog entry for c5988.
------------------------------------------------------------------------
r5994 | marko | 2009-09-28 18:33:59 +1000 (Mon, 28 Sep 2009) | 17 lines
branches/zip: Try to prevent the reuse of tablespace identifiers after
InnoDB has crashed during table creation. Also, refuse to start if
files with duplicate tablespace identifiers are encountered.
fil_node_create(): Update fil_system->max_assigned_id. This should
prevent the reuse of a space->id when InnoDB does a full crash
recovery and invokes fil_load_single_table_tablespaces(). Normally,
fil_system->max_assigned_id is initialized from
SELECT MAX(ID) FROM SYS_TABLES.
fil_open_single_table_tablespace(): Return FALSE when
fil_space_create() fails.
fil_load_single_table_tablespace(): Exit if fil_space_create() fails
and innodb_force_recovery=0.
rb://173 approved by Heikki Tuuri. This addresses Issue #335.
------------------------------------------------------------------------
r5995 | marko | 2009-09-28 18:52:25 +1000 (Mon, 28 Sep 2009) | 17 lines
branches/zip: Do not write to PAGE_INDEX_ID after page creation,
not even when restoring an uncompressed page after a compression failure.
btr_page_reorganize_low(): On compression failure, do not restore
those page header fields that should not be affected by the
reorganization. Instead, compare the fields.
page_zip_decompress(): Add the parameter ibool all, for copying all
page header fields. Pass the parameter all=TRUE on block read
completion, redo log application, and page_zip_validate(); pass
all=FALSE in all other cases.
page_zip_reorganize(): Do not restore the uncompressed page on
failure. It will be restored (to pre-modification state) by the
caller anyway.
rb://167, Issue #346
------------------------------------------------------------------------
r5996 | marko | 2009-09-28 22:46:02 +1000 (Mon, 28 Sep 2009) | 4 lines
branches/zip: Address Issue #350 in comments.
lock_rec_queue_validate(), lock_rec_queue_validate(): Note that
this debug code may violate the latching order and cause deadlocks.
------------------------------------------------------------------------
r5997 | marko | 2009-09-28 23:03:58 +1000 (Mon, 28 Sep 2009) | 12 lines
branches/zip: Remove an assertion failure when the InnoDB data dictionary
is inconsistent with the MySQL .frm file.
ha_innobase::index_read(): When the index cannot be found,
return an error.
ha_innobase::change_active_index(): When prebuilt->index == NULL,
set also prebuilt->index_usable = FALSE. This is not needed for
correctness, because prebuilt->index_usable is only checked by
row_search_for_mysql(), which requires prebuilt->index != NULL.
This addresses Issue #349. Approved by Heikki Tuuri over IM.
------------------------------------------------------------------------
r6005 | vasil | 2009-09-29 18:09:52 +1000 (Tue, 29 Sep 2009) | 4 lines
branches/zip:
ChangeLog: wrap around 78th column, not earlier.
------------------------------------------------------------------------
r6006 | vasil | 2009-09-29 20:15:25 +1000 (Tue, 29 Sep 2009) | 4 lines
branches/zip:
Add ChangeLog entry for the release of 1.0.4.
------------------------------------------------------------------------
r6007 | vasil | 2009-09-29 23:19:59 +1000 (Tue, 29 Sep 2009) | 6 lines
branches/zip:
Fix the year, should be 2009.
Pointed by: Calvin
------------------------------------------------------------------------
r6026 | marko | 2009-09-30 17:18:24 +1000 (Wed, 30 Sep 2009) | 1 line
branches/zip: Add some debug assertions for checking FSEG_MAGIC_N.
------------------------------------------------------------------------
r6028 | marko | 2009-09-30 23:55:23 +1000 (Wed, 30 Sep 2009) | 3 lines
branches/zip: recv_no_log_write: New debug flag for tracking down
Mantis Issue #347. No modifications should be made to the database
while recv_apply_hashed_log_recs() is about to complete.
------------------------------------------------------------------------
r6029 | calvin | 2009-10-01 06:32:02 +1000 (Thu, 01 Oct 2009) | 4 lines
branches/zip: non-functional changes
Fix typo.
------------------------------------------------------------------------
r6031 | marko | 2009-10-01 21:24:33 +1000 (Thu, 01 Oct 2009) | 49 lines
branches/zip: Clean up after a crash during DROP INDEX.
When InnoDB crashes while dropping an index, ensure that
the index will be completely dropped during crash recovery.
row_merge_drop_index(): Before dropping an index, rename the index to
start with TEMP_INDEX_PREFIX_STR and commit the change, so that
row_merge_drop_temp_indexes() will drop the index after crash
recovery if the server crashes while dropping the index.
fseg_inode_try_get(): New function, forked from fseg_inode_get().
Return NULL if the file segment index node is free.
fseg_inode_get(): Assert that the file segment index node is not free.
fseg_free_step(): If the file segment index node is already free,
print a diagnostic message and return TRUE.
fsp_free_seg_inode(): Write a nonzero number to FSEG_MAGIC_N, so that
allocated-and-freed file segment index nodes can be better
distinguished from uninitialized ones.
This is rb://174, addressing Issue #348.
Tested by restarting mysqld upon the completion of the added
log_write_up_to() invocation below, during DROP INDEX. The index was
dropped after crash recovery, and re-issuing the DROP INDEX did not
crash the server.
Index: btr/btr0btr.c
===================================================================
--- btr/btr0btr.c (revision 6026)
+++ btr/btr0btr.c (working copy)
@@ -42,6 +42,7 @@ Created 6/2/1994 Heikki Tuuri
#include "ibuf0ibuf.h"
#include "trx0trx.h"
+#include "log0log.h"
/*
Latching strategy of the InnoDB B-tree
--------------------------------------
@@ -873,6 +874,8 @@ leaf_loop:
goto leaf_loop;
}
+
+ log_write_up_to(mtr.end_lsn, LOG_WAIT_ALL_GROUPS, TRUE);
top_loop:
mtr_start(&mtr);
------------------------------------------------------------------------
r6033 | calvin | 2009-10-02 06:19:46 +1000 (Fri, 02 Oct 2009) | 4 lines
branches/zip: fix a typo in error message
Reported as bug#47763.
------------------------------------------------------------------------
r6043 | inaam | 2009-10-06 01:45:35 +1100 (Tue, 06 Oct 2009) | 12 lines
branches/zip rb://176
Do not invalidate buffer pool while an LRU batch is active. Added
code to buf_pool_invalidate() to wait for the running batches to finish.
This patch also resets the state of buf_pool struct at invalidation. This
addresses the concern where buf_pool->freed_page_clock becomes non-zero
because we read in a system tablespace page for file format info at
startup.
Approved by: Marko
------------------------------------------------------------------------
r6044 | pekka | 2009-10-07 01:44:54 +1100 (Wed, 07 Oct 2009) | 5 lines
branches/zip:
Add os_file_is_same() function for Hot Backup (inside ifdef UNIV_HOTBACKUP).
This is part of the fix for Issue #186.
Note! The Windows implementation is incomplete.
------------------------------------------------------------------------
r6046 | pekka | 2009-10-08 20:24:56 +1100 (Thu, 08 Oct 2009) | 3 lines
branches/zip: Revert r6044 which added os_file_is_same() function
(issue#186). This functionality is moved to Hot Backup source tree.
------------------------------------------------------------------------
r6048 | vasil | 2009-10-09 16:42:55 +1100 (Fri, 09 Oct 2009) | 16 lines
branches/zip:
When scanning a directory readdir() is called and stat() after it,
if a file is deleted between the two calls stat will fail and the
whole precedure will fail. Change this behavior to continue with the
next entry if stat() fails because of nonexistent file. This is
transparent change as it will make it look as if the file was deleted
before the readdir() call.
This change is needed in order to fix
https://svn.innodb.com/mantis/view.php?id=174
in which we need to abort if os_file_readdir_next_file()
encounters "real" errors.
Approved by: Marko, Pekka (rb://177)
------------------------------------------------------------------------
r6049 | vasil | 2009-10-10 03:05:26 +1100 (Sat, 10 Oct 2009) | 7 lines
branches/zip:
Fix compilation warning in Hot Backup:
innodb/fil/fil0fil.c: In function 'fil_load_single_table_tablespace':
innodb/fil/fil0fil.c:3253: warning: format '%lld' expects type 'long long int', but argument 6 has type 'ib_int64_t'
------------------------------------------------------------------------
r6064 | calvin | 2009-10-14 02:23:35 +1100 (Wed, 14 Oct 2009) | 4 lines
branches/zip: non-functional changes
Changes from MySQL to fix build issue.
------------------------------------------------------------------------
r6065 | inaam | 2009-10-14 04:43:13 +1100 (Wed, 14 Oct 2009) | 7 lines
branches/zip rb://182
Call fsync() on datafiles after a batch of pages is written to disk
even when skip_innodb_doublewrite is set.
Approved by: Heikki
------------------------------------------------------------------------
r6080 | sunny | 2009-10-15 09:29:01 +1100 (Thu, 15 Oct 2009) | 3 lines
branches/zip: Change page_mem_alloc_free() to inline.
Fix Bug #47058 - Failure to compile innodb_plugin on solaris 10u7 + spro cc/CC 5.10
------------------------------------------------------------------------
r6084 | vasil | 2009-10-15 16:21:17 +1100 (Thu, 15 Oct 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r6080.
------------------------------------------------------------------------
r6095 | vasil | 2009-10-20 00:04:59 +1100 (Tue, 20 Oct 2009) | 7 lines
branches/zip:
Fix Bug#47808 innodb_information_schema.test fails when run under valgrind
by using the wait_until_rows_count macro that loops until the number of
rows becomes 14 instead of sleep 0.1, which is obviously very fragile.
------------------------------------------------------------------------
r6096 | vasil | 2009-10-20 00:06:09 +1100 (Tue, 20 Oct 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r6095.
------------------------------------------------------------------------
r6099 | jyang | 2009-10-22 13:58:39 +1100 (Thu, 22 Oct 2009) | 7 lines
branches/zip: Port bug #46000 related changes from 5.1 to zip
branch. Due to different code path for creating index in zip
branch comparing to 5.1), the index reserved name check function
is extended to be used in ha_innobase::add_index().
rb://190 Approved by: Marko
------------------------------------------------------------------------
r6100 | jyang | 2009-10-22 14:51:07 +1100 (Thu, 22 Oct 2009) | 6 lines
branches/zip: As a request from mysql, WARN_LEVEL_ERROR cannot
be used for push_warning_* call any more. Switch to
WARN_LEVEL_WARN. Bug #47233.
rb://172 approved by Sunny Bains and Marko.
------------------------------------------------------------------------
r6101 | jyang | 2009-10-23 19:45:50 +1100 (Fri, 23 Oct 2009) | 7 lines
branches/zip: Update test result with the WARN_LEVEL_ERROR
to WARN_LEVEL_WARN change. This is the same result as
submitted in rb://172 review, which approved by Sunny Bains
and Marko.
------------------------------------------------------------------------
r6102 | marko | 2009-10-26 18:32:23 +1100 (Mon, 26 Oct 2009) | 1 line
branches/zip: row_prebuilt_struct::prebuilts: Unused field, remove.
------------------------------------------------------------------------
r6103 | marko | 2009-10-27 00:46:18 +1100 (Tue, 27 Oct 2009) | 4 lines
branches/zip: row_ins_alloc_sys_fields(): Zero out the system columns
DB_TRX_ID, DB_ROLL_PTR and DB_ROW_ID, in order to avoid harmless
Valgrind warnings about uninitialized data. (The warnings were
harmless, because the fields would be initialized at a later stage.)
------------------------------------------------------------------------
r6105 | calvin | 2009-10-28 09:05:52 +1100 (Wed, 28 Oct 2009) | 6 lines
branches/zip: backport r3848 from 6.0 branch
----
branches/6.0: innobase_start_or_create_for_mysql(): Make the 10 MB
minimum tablespace limit independent of UNIV_PAGE_SIZE. (Bug #41490)
------------------------------------------------------------------------
r6107 | marko | 2009-10-29 01:10:34 +1100 (Thu, 29 Oct 2009) | 5 lines
branches/zip: buf_page_set_old(): Improve UNIV_LRU_DEBUG diagnostics
in order to catch the buf_pool->LRU_old corruption reported in Issue #381.
buf_LRU_old_init(): Set the property from the tail towards the front
of the buf_pool->LRU list, in order not to trip the debug check.
------------------------------------------------------------------------
r6108 | calvin | 2009-10-29 16:58:04 +1100 (Thu, 29 Oct 2009) | 5 lines
branches/zip: close file handle when building with UNIV_HOTBACKUP
The change does not affect regular InnoDB engine. Confirmed by
Marko.
------------------------------------------------------------------------
r6109 | jyang | 2009-10-29 19:37:32 +1100 (Thu, 29 Oct 2009) | 7 lines
branches/zip: In os_mem_alloc_large(), if we fail to attach
the shared memory, reset memory pointer ptr to NULL, and
allocate memory from conventional pool.
Bug #48237 Error handling in os_mem_alloc_large appears to be incorrect
rb://198 Approved by: Marko
------------------------------------------------------------------------
r6110 | marko | 2009-10-29 21:44:57 +1100 (Thu, 29 Oct 2009) | 2 lines
branches/zip: Makefile.am (INCLUDES): Merge a change from MySQL:
Use $(srcdir)/include instead of $(top_srcdir)/storage/innobase/include.
------------------------------------------------------------------------
r6111 | marko | 2009-10-29 22:04:11 +1100 (Thu, 29 Oct 2009) | 33 lines
branches/zip: Fix corruption of buf_pool->LRU_old and improve debug assertions.
This was reported as Issue #381.
buf_page_set_old(): Assert that blocks may only be set old if
buf_pool->LRU_old is initialized and buf_pool->LRU_old_len is nonzero.
Assert that buf_pool->LRU_old points to the block at the old/new boundary.
buf_LRU_old_adjust_len(): Invoke buf_page_set_old() after adjusting
buf_pool->LRU_old and buf_pool->LRU_old_len, in order not to violate
the added assertions.
buf_LRU_old_init(): Replace buf_page_set_old() with a direct
assignment to bpage->old, because these loops that initialize all the
blocks would temporarily violate the assertions about
buf_pool->LRU_old.
buf_LRU_remove_block(): When setting buf_pool->LRU_old = NULL, also
clear all bpage->old flags and set buf_pool->LRU_old_len = 0.
buf_LRU_add_block_to_end_low(), buf_LRU_add_block_low(): Move the
buf_page_set_old() call later in order not to violate the debug
assertions. If buf_pool->LRU_old is NULL, set old=FALSE.
buf_LRU_free_block(): Replace the UNIV_LRU_DEBUG assertion with a
dummy buf_page_set_old() call that performs more thorough checks.
buf_LRU_validate(): Do not tolerate garbage in buf_pool->LRU_old_len
even if buf_pool->LRU_old is NULL. Check that bpage->old is monotonic.
buf_relocate(): Make the UNIV_LRU_DEBUG checks stricter.
buf0buf.h: Revise the documentation of buf_page_t::old and
buf_pool_t::LRU_old_len.
------------------------------------------------------------------------
r6112 | calvin | 2009-10-30 01:21:15 +1100 (Fri, 30 Oct 2009) | 4 lines
branches/zip: consideration for icc compilers
Proposed by MySQL, and approved by Marko.
------------------------------------------------------------------------
r6113 | vasil | 2009-10-30 03:15:50 +1100 (Fri, 30 Oct 2009) | 93 lines
branches/zip: Merge r5912:6112 from branches/5.1:
(after this merge the innodb-autoinc test starts to fail, but
I commit anyway because it would be easier to investigate the
failure this way)
------------------------------------------------------------------------
r5952 | calvin | 2009-09-22 19:45:07 +0300 (Tue, 22 Sep 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: fix bug#42383: Can't create table 'test.bug39438'
For embedded server, MySQL may pass in full path, which is
currently disallowed. It is needed to relax the condition by
accepting full paths in the embedded case.
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r6032 | vasil | 2009-10-01 15:55:49 +0300 (Thu, 01 Oct 2009) | 8 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Fix Bug#38996 Race condition in ANALYZE TABLE
by serializing ANALYZE TABLE inside InnoDB.
Approved by: Heikki (rb://175)
------------------------------------------------------------------------
r6045 | jyang | 2009-10-08 02:27:08 +0300 (Thu, 08 Oct 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug47777.result
A /branches/5.1/mysql-test/innodb_bug47777.test
branches/5.1: Fix bug #47777. Treat the Geometry data same as
Binary BLOB in ha_innobase::store_key_val_for_row(), since the
Geometry data is stored as Binary BLOB in Innodb.
Review: rb://180 approved by Marko Makela.
------------------------------------------------------------------------
r6051 | sunny | 2009-10-12 07:05:00 +0300 (Mon, 12 Oct 2009) | 6 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Ignore negative values supplied by the user when calculating the
next value to store in dict_table_t. Setting autoincrement columns top negative
values is undefined behavior and this change should bring the behavior of
InnoDB closer to what users expect. Added several tests to check.
rb://162
------------------------------------------------------------------------
r6052 | sunny | 2009-10-12 07:09:56 +0300 (Mon, 12 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Reset the statement level autoinc counter on ROLLBACK. Fix
the test results too.
rb://164
------------------------------------------------------------------------
r6053 | sunny | 2009-10-12 07:37:49 +0300 (Mon, 12 Oct 2009) | 6 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Copy the maximum AUTOINC value from the old table to the new
table when MySQL does a CREATE INDEX ON T. This is required because MySQL
does a table copy, rename and drops the old table.
Fix Bug#47125: auto_increment start value is ignored if an index is created and engine=innodb
rb://168
------------------------------------------------------------------------
r6076 | vasil | 2009-10-14 19:30:12 +0300 (Wed, 14 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/row/row0mysql.c
branches/5.1:
Fix typo.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6114 | vasil | 2009-10-30 03:43:51 +1100 (Fri, 30 Oct 2009) | 6 lines
branches/zip:
* Add ChangeLog entries for latest changes
* Obey alphabetical order in the list of the files
* White-space fixup
------------------------------------------------------------------------
r6121 | sunny | 2009-10-30 10:42:11 +1100 (Fri, 30 Oct 2009) | 7 lines
branches/zip: This test has been problematic for sometime now. The underlying
bug is that the data dictionaries get out of sync. In the AUTOINC code we
try and apply salve to the symptoms. In the past MySQL made some unrelated
change and the dictionaries stopped getting out of sync and this test started
to fail. Now, it seems they have reverted that changed and the test is
passing again. I suspect this is not he last time that this test will change.
------------------------------------------------------------------------
r6124 | jyang | 2009-10-30 19:02:31 +1100 (Fri, 30 Oct 2009) | 5 lines
branches/zip: Correct the bug number for -r6109 change
from # 48273 to #48237
------------------------------------------------------------------------
r6126 | vasil | 2009-10-30 19:36:07 +1100 (Fri, 30 Oct 2009) | 45 lines
branches/zip: Merge r6112:6125 from branches/5.1:
(skipping r6122 and r6123, Jimmy says these are already present and need
not be merged):
------------------------------------------------------------------------
r6122 | jyang | 2009-10-30 05:18:38 +0200 (Fri, 30 Oct 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb_bug44369.result
M /branches/5.1/mysql-test/innodb_bug44369.test
M /branches/5.1/mysql-test/innodb_bug46000.result
M /branches/5.1/mysql-test/innodb_bug46000.test
branches/5.1: Chnage WARN_LEVEL_ERROR to WARN_LEVEL_WARN
for push_warning_printf() call in innodb.
Fix Bug#47233: Innodb calls push_warning(MYSQL_ERROR::WARN_LEVEL_ERROR)
rb://170 approved by Marko.
------------------------------------------------------------------------
r6123 | jyang | 2009-10-30 05:43:06 +0200 (Fri, 30 Oct 2009) | 8 lines
Changed paths:
M /branches/5.1/os/os0proc.c
branches/5.1: In os_mem_alloc_large(), if we fail to attach
the shared memory, reset memory pointer ptr to NULL, and
allocate memory from conventional pool. This is a port
from branches/zip.
Bug #48237 Error handling in os_mem_alloc_large appears to be incorrect
rb://198 Approved by: Marko
------------------------------------------------------------------------
r6125 | vasil | 2009-10-30 10:31:23 +0200 (Fri, 30 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
White-space fixup.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6130 | marko | 2009-11-02 20:42:56 +1100 (Mon, 02 Nov 2009) | 9 lines
branches/zip: Free all resources at shutdown. Set pointers to NULL, so
that Valgrind will not complain about freed data structures that are
reachable via pointers. This addresses Bug #45992 and Bug #46656.
This patch is mostly based on changes copied from branches/embedded-1.0,
mainly c5432, c3439, c3134, c2994, c2978, but also some other code was
copied. Some added cleanup code is specific to MySQL/InnoDB.
rb://199 approved by Sunny Bains
------------------------------------------------------------------------
2009-11-04 07:02:00 +01:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Frees the asynchronous io system. */
|
2005-10-27 09:29:40 +02:00
|
|
|
void
|
2016-08-12 10:17:45 +02:00
|
|
|
os_aio_free()
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
2016-08-12 10:17:45 +02:00
|
|
|
AIO::shutdown();
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2017-02-17 09:32:21 +01:00
|
|
|
if (!srv_use_native_aio) {
|
|
|
|
for (ulint i = 0; i < os_aio_n_segments; i++) {
|
|
|
|
os_event_destroy(os_aio_segment_wait_events[i]);
|
|
|
|
}
|
2016-08-12 10:17:45 +02:00
|
|
|
|
2017-02-17 09:32:21 +01:00
|
|
|
ut_free(os_aio_segment_wait_events);
|
|
|
|
os_aio_segment_wait_events = 0;
|
|
|
|
}
|
2016-08-12 10:17:45 +02:00
|
|
|
os_aio_n_segments = 0;
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Wakes up all async i/o threads so that they know to exit themselves in
|
2005-10-27 09:29:40 +02:00
|
|
|
shutdown. */
|
|
|
|
void
|
2016-08-12 10:17:45 +02:00
|
|
|
os_aio_wake_all_threads_at_shutdown()
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
|
|
|
#ifdef WIN_ASYNC_IO
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
AIO::wake_at_shutdown();
|
2009-01-13 19:20:49 +01:00
|
|
|
|
|
|
|
#elif defined(LINUX_NATIVE_AIO)
|
|
|
|
/* When using native AIO interface the io helper threads
|
|
|
|
wait on io_getevents with a timeout value of 500ms. At
|
|
|
|
each wake up these threads check the server status.
|
|
|
|
No need to do anything to wake them up. */
|
2017-02-17 09:32:21 +01:00
|
|
|
#endif /* !WIN_ASYNC_AIO */
|
2009-01-13 19:20:49 +01:00
|
|
|
|
|
|
|
if (srv_use_native_aio) {
|
|
|
|
return;
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2005-10-27 09:29:40 +02:00
|
|
|
/* This loop wakes up all simulated ai/o threads */
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
for (ulint i = 0; i < os_aio_n_segments; ++i) {
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2005-10-27 09:29:40 +02:00
|
|
|
os_event_set(os_aio_segment_wait_events[i]);
|
2006-02-23 20:25:29 +01:00
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Waits until there are no pending writes in AIO::s_writes. There can
|
2005-10-27 09:29:40 +02:00
|
|
|
be other, synchronous, pending writes. */
|
|
|
|
void
|
2016-08-12 10:17:45 +02:00
|
|
|
os_aio_wait_until_no_pending_writes()
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
2016-08-12 10:17:45 +02:00
|
|
|
AIO::wait_until_no_pending_writes();
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Calculates segment number for a slot.
|
|
|
|
@param[in] array AIO wait array
|
|
|
|
@param[in] slot slot in this array
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 11:52:16 +02:00
|
|
|
@return segment number (which is the number used by, for example,
|
2016-08-12 10:17:45 +02:00
|
|
|
I/O-handler threads) */
|
2005-10-27 09:29:40 +02:00
|
|
|
ulint
|
2016-08-12 10:17:45 +02:00
|
|
|
AIO::get_segment_no_from_slot(
|
|
|
|
const AIO* array,
|
|
|
|
const Slot* slot)
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
|
|
|
ulint segment;
|
|
|
|
ulint seg_len;
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (array == s_ibuf) {
|
2013-03-25 23:03:13 +01:00
|
|
|
ut_ad(!srv_read_only_mode);
|
|
|
|
|
|
|
|
segment = IO_IBUF_SEGMENT;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
} else if (array == s_log) {
|
2013-03-25 23:03:13 +01:00
|
|
|
ut_ad(!srv_read_only_mode);
|
|
|
|
|
|
|
|
segment = IO_LOG_SEGMENT;
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
} else if (array == s_reads) {
|
|
|
|
seg_len = s_reads->slots_per_segment();
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
segment = (srv_read_only_mode ? 0 : 2) + slot->pos / seg_len;
|
2005-10-27 09:29:40 +02:00
|
|
|
} else {
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_a(array == s_writes);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
seg_len = s_writes->slots_per_segment();
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
segment = s_reads->m_n_segments
|
|
|
|
+ (srv_read_only_mode ? 0 : 2) + slot->pos / seg_len;
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return(segment);
|
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Requests for a slot in the aio array. If no slot is available, waits until
|
2009-05-25 08:46:10 +02:00
|
|
|
not_full-event becomes signaled.
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
@param[in,out] type IO context
|
|
|
|
@param[in,out] m1 message to be passed along with the AIO
|
|
|
|
operation
|
|
|
|
@param[in,out] m2 message to be passed along with the AIO
|
|
|
|
operation
|
|
|
|
@param[in] file file handle
|
|
|
|
@param[in] name name of the file or path as a NUL-terminated
|
|
|
|
string
|
|
|
|
@param[in,out] buf buffer where to read or from which to write
|
|
|
|
@param[in] offset file offset, where to read from or start writing
|
|
|
|
@param[in] len length of the block to read or write
|
|
|
|
@return pointer to slot */
|
|
|
|
Slot*
|
|
|
|
AIO::reserve_slot(
|
|
|
|
IORequest& type,
|
|
|
|
fil_node_t* m1,
|
|
|
|
void* m2,
|
|
|
|
os_file_t file,
|
|
|
|
const char* name,
|
|
|
|
void* buf,
|
|
|
|
os_offset_t offset,
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
ulint len)
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
2010-10-28 07:34:53 +02:00
|
|
|
#ifdef WIN_ASYNC_IO
|
|
|
|
ut_a((len & 0xFFFFFFFFUL) == len);
|
2013-03-25 23:03:13 +01:00
|
|
|
#endif /* WIN_ASYNC_IO */
|
2010-10-28 07:34:53 +02:00
|
|
|
|
branches/innodb+: Merge revisions 5144:5524 from branches/zip
------------------------------------------------------------------------
r5147 | marko | 2009-05-27 06:55:14 -0400 (Wed, 27 May 2009) | 1 line
branches/zip: ibuf0ibuf.c: Improve a comment.
------------------------------------------------------------------------
r5149 | marko | 2009-05-27 07:46:42 -0400 (Wed, 27 May 2009) | 34 lines
branches/zip: Merge revisions 4994:5148 from branches/5.1:
------------------------------------------------------------------------
r5126 | vasil | 2009-05-26 16:57:12 +0300 (Tue, 26 May 2009) | 9 lines
branches/5.1:
Preparation for the fix of
Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Non-functional change: move FSP_* macros from fsp0fsp.h to a new file
fsp0types.h. This is needed in order to be able to use FSP_EXTENT_SIZE
in mtr0log.ic.
------------------------------------------------------------------------
r5127 | vasil | 2009-05-26 17:05:43 +0300 (Tue, 26 May 2009) | 9 lines
branches/5.1:
Preparation for the fix of
Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Do not include unnecessary headers mtr0log.h and fut0lst.h in trx0sys.h
and include fsp0fsp.h just before it is needed. This is needed in order
to be able to use TRX_SYS_SPACE in mtr0log.ic.
------------------------------------------------------------------------
r5128 | vasil | 2009-05-26 17:26:37 +0300 (Tue, 26 May 2009) | 7 lines
branches/5.1:
Fix Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Do not write redo log for the pages in the doublewrite buffer. Also, do not
make a dummy change to the page because this is not needed.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5169 | marko | 2009-05-28 03:21:55 -0400 (Thu, 28 May 2009) | 1 line
branches/zip: mtr0mtr.h: Add Doxygen comments for the redo log entry types.
------------------------------------------------------------------------
r5176 | marko | 2009-05-28 07:14:02 -0400 (Thu, 28 May 2009) | 1 line
branches/zip: Correct a debug assertion that was added in r5125.
------------------------------------------------------------------------
r5201 | marko | 2009-06-01 06:35:25 -0400 (Mon, 01 Jun 2009) | 2 lines
branches/zip: Clean up some comments.
Make the rec parameter of mlog_open_and_write_index() const.
------------------------------------------------------------------------
r5234 | marko | 2009-06-03 08:26:41 -0400 (Wed, 03 Jun 2009) | 44 lines
branches/zip: Merge revisions 5148:5233 from branches/5.1:
------------------------------------------------------------------------
r5150 | vasil | 2009-05-27 18:56:03 +0300 (Wed, 27 May 2009) | 4 lines
branches/5.1:
Whitespace fixup.
------------------------------------------------------------------------
r5191 | vasil | 2009-05-30 17:46:05 +0300 (Sat, 30 May 2009) | 19 lines
branches/5.1:
Merge a change from MySQL (this fixes the failing innodb_mysql test):
------------------------------------------------------------
revno: 1810.3894.10
committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
branch nick: mysql-5.0-bugteam
timestamp: Tue 2009-05-19 11:32:21 +0500
message:
Bug#39793 Foreign keys not constructed when column has a '#' in a comment or default value
Internal InnoDN FK parser does not recognize '\'' as quotation symbol.
Suggested fix is to add '\'' symbol check for quotation condition
(dict_strip_comments() function).
modified:
innobase/dict/dict0dict.c
mysql-test/r/innodb_mysql.result
mysql-test/t/innodb_mysql.test
------------------------------------------------------------------------
r5233 | marko | 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) | 11 lines
branches/5.1: Merge the test case from r5232 from branches/5.0:
------------------------------------------------------------------------
r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines
branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565
(Update Query Results in "1 Row Affected" But Should Be "Zero Rows").
Also, add a test case for Bug #40565.
rb://128 approved by Heikki Tuuri
------------------------------------------------------------------------
------------------------------------------------------------------------
------------------------------------------------------------------------
r5250 | marko | 2009-06-04 02:58:23 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Add Doxygen comments to the rest of buf0*.
------------------------------------------------------------------------
r5251 | marko | 2009-06-04 02:59:51 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Replace <= in a function comment.
------------------------------------------------------------------------
r5253 | marko | 2009-06-04 06:37:35 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Add missing Doxygen comments for page0zip.
------------------------------------------------------------------------
r5261 | vasil | 2009-06-05 11:13:31 -0400 (Fri, 05 Jun 2009) | 15 lines
branches/zip:
Fix Mantis Issue#244 fix bug in linear read ahead (no check on access pattern)
The changes are:
1) Take into account access pattern when deciding whether or not to do linear
read ahead.
2) Expose a knob innodb_read_ahead_factor = [0-64] default (8), dynamic,
global to control linear read ahead behvior
3) Disable random read ahead. Keep the code for now.
Submitted by: Inaam (rb://122)
Approved by: Heikki (rb://122)
------------------------------------------------------------------------
r5262 | vasil | 2009-06-05 12:04:25 -0400 (Fri, 05 Jun 2009) | 22 lines
branches/zip:
Enable functionality to have multiple background io helper threads.
This patch is based on percona contributions.
More details about this patch will be written at:
https://svn.innodb.com/innobase/MultipleBackgroundThreads
The patch essentially does the following:
expose following knobs:
innodb_read_io_threads = [1 - 64] default 1
innodb_write_io_threads = [1 - 64] default 1
deprecate innodb_file_io_threads (this parameter was relevant only on windows)
Internally it allows multiple segments for read and write IO request arrays
where one thread works on one segement.
Submitted by: Inaam (rb://124)
Approved by: Heikki (rb://124)
------------------------------------------------------------------------
r5263 | vasil | 2009-06-05 12:19:37 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Whitespace cleanup.
------------------------------------------------------------------------
r5264 | vasil | 2009-06-05 12:26:58 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5261.
------------------------------------------------------------------------
r5265 | vasil | 2009-06-05 12:34:11 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5262.
------------------------------------------------------------------------
r5268 | inaam | 2009-06-08 12:18:21 -0400 (Mon, 08 Jun 2009) | 7 lines
branches/zip
Non functional change:
Added legal notices acknowledging percona contribution to the multiple
IO helper threads patch i.e.: r5262
------------------------------------------------------------------------
r5283 | inaam | 2009-06-09 13:46:29 -0400 (Tue, 09 Jun 2009) | 9 lines
branches/zip
rb://130
Enable Group Commit functionality that was broken in 5.0 when
distributed transactions were introduced.
Reviewed by: Heikki
------------------------------------------------------------------------
r5319 | marko | 2009-06-11 04:40:33 -0400 (Thu, 11 Jun 2009) | 3 lines
branches/zip: Declare os_thread_id_t as unsigned long,
because ulint is wrong on Win64.
Pointed out by Vladislav Vaintroub <wlad@sun.com>.
------------------------------------------------------------------------
r5320 | inaam | 2009-06-11 09:15:41 -0400 (Thu, 11 Jun 2009) | 14 lines
branches/zip rb://131
This patch changes the following defaults:
max_dirty_pages_pct: default from 90 to 75. max allowed from 100 to 99
additional_mem_pool_size: default from 1 to 8 MB
buffer_pool_size: default from 8 to 128 MB
log_buffer_size: default from 1 to 8 MB
read_io_threads/write_io_threads: default from 1 to 4
The log file sizes are untouched because of upgrade issues
Reviewed by: Heikki
------------------------------------------------------------------------
r5330 | marko | 2009-06-16 04:08:59 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: buf_page_get_gen(): Reduce mutex holding time by adjusting
buf_pool->n_pend_unzip while only holding buf_pool_mutex.
------------------------------------------------------------------------
r5331 | marko | 2009-06-16 05:00:48 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: buf_page_get_zip(): Eliminate a buf_page_get_mutex() call.
The function must switch on the block state anyway.
------------------------------------------------------------------------
r5332 | vasil | 2009-06-16 05:03:27 -0400 (Tue, 16 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entries for r5283 and r5320.
------------------------------------------------------------------------
r5333 | marko | 2009-06-16 05:27:46 -0400 (Tue, 16 Jun 2009) | 1 line
branches/zip: buf_page_io_query(): Remove unused function.
------------------------------------------------------------------------
r5335 | marko | 2009-06-16 09:23:10 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: innodb.test: Adjust the tolerance of
innodb_buffer_pool_pages_total for r5320.
------------------------------------------------------------------------
r5342 | marko | 2009-06-17 06:15:32 -0400 (Wed, 17 Jun 2009) | 60 lines
branches/zip: Merge revisions 5233:5341 from branches/5.1:
------------------------------------------------------------------------
r5233 | marko | 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) | 11 lines
branches/5.1: Merge the test case from r5232 from branches/5.0:
------------------------------------------------------------------------
r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines
branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565
(Update Query Results in "1 Row Affected" But Should Be "Zero Rows").
Also, add a test case for Bug #40565.
rb://128 approved by Heikki Tuuri
------------------------------------------------------------------------
------------------------------------------------------------------------
r5243 | sunny | 2009-06-04 03:17:14 +0300 (Thu, 04 Jun 2009) | 14 lines
branches/5.1: When the InnoDB and MySQL data dictionaries go out of sync, before
the bug fix we would assert on missing autoinc columns. With this fix we allow
MySQL to open the table but set the next autoinc value for the column to the
MAX value. This effectively disables the next value generation. INSERTs will
fail with a generic AUTOINC failure. However, the user should be able to
read/dump the table, set the column values explicitly, use ALTER TABLE to
set the next autoinc value and/or sync the two data dictionaries to resume
normal operations.
Fix Bug#44030 Error: (1500) Couldn't read the MAX(ID) autoinc value from the
index (PRIMARY)
rb://118
------------------------------------------------------------------------
r5252 | sunny | 2009-06-04 10:16:24 +0300 (Thu, 04 Jun 2009) | 2 lines
branches/5.1: The version of the result file checked in was broken in r5243.
------------------------------------------------------------------------
r5259 | vasil | 2009-06-05 10:29:16 +0300 (Fri, 05 Jun 2009) | 7 lines
branches/5.1:
Remove the word "Error" from the printout because the mysqltest suite
interprets it as an error and thus the innodb-autoinc test fails.
Approved by: Sunny (via IM)
------------------------------------------------------------------------
r5339 | marko | 2009-06-17 11:01:37 +0300 (Wed, 17 Jun 2009) | 2 lines
branches/5.1: Add missing #include "mtr0log.h" so that the code compiles
with -DUNIV_MUST_NOT_INLINE.
(null merge; this had already been committed in branches/zip)
------------------------------------------------------------------------
r5340 | marko | 2009-06-17 12:11:49 +0300 (Wed, 17 Jun 2009) | 4 lines
branches/5.1: row_unlock_for_mysql(): When the clustered index is unknown,
refuse to unlock the record.
(Bug #45357, caused by the fix of Bug #39320).
rb://132 approved by Sunny Bains.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5343 | vasil | 2009-06-17 08:56:12 -0400 (Wed, 17 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5342.
------------------------------------------------------------------------
r5344 | marko | 2009-06-17 09:03:45 -0400 (Wed, 17 Jun 2009) | 1 line
branches/zip: row_merge_read_rec(): Fix a UNIV_DEBUG bug (Bug #45426)
------------------------------------------------------------------------
r5391 | marko | 2009-06-22 05:31:35 -0400 (Mon, 22 Jun 2009) | 2 lines
branches/zip: buf_page_get_zip(): Fix a bogus warning about
block_mutex being possibly uninitialized.
------------------------------------------------------------------------
r5392 | marko | 2009-06-22 07:58:20 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: ha_innobase::check_if_incompatible_data(): When
ROW_FORMAT=DEFAULT, do not compare to get_row_type().
Without this change, fast index creation will be disabled
in recent versions of MySQL 5.1.
------------------------------------------------------------------------
r5393 | pekka | 2009-06-22 09:27:55 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: Minor changes for Hot Backup to build correctly. (The
code bracketed between #ifdef UNIV_HOTBACKUP and #endif /* UNIV_HOTBACKUP */).
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r5394 | pekka | 2009-06-22 09:46:34 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: Add functions for checking the format of tablespaces
for Hot Backup build (UNIV_HOTBACKUP defined).
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r5397 | calvin | 2009-06-23 16:59:42 -0400 (Tue, 23 Jun 2009) | 7 lines
branches/zip: change the header file path.
Change the header file path from ../storage/innobase/include/
to ../include/. In the planned 5.1 + plugin release, the source
directory of the plugin will not be in storage/innobase.
Approved by: Heikki (IM)
------------------------------------------------------------------------
r5407 | calvin | 2009-06-24 09:51:08 -0400 (Wed, 24 Jun 2009) | 4 lines
branches/zip: remove relative path of header files.
Suggested by Marko.
------------------------------------------------------------------------
r5412 | marko | 2009-06-25 06:27:08 -0400 (Thu, 25 Jun 2009) | 1 line
branches/zip: Replace a DBUG_ASSERT with ut_a to track down Issue #290.
------------------------------------------------------------------------
r5415 | marko | 2009-06-25 06:45:57 -0400 (Thu, 25 Jun 2009) | 3 lines
branches/zip: dict_index_find_cols(): Print diagnostic on name mismatch.
This addresses Bug #44571 but does not fix it.
rb://135 approved by Sunny Bains.
------------------------------------------------------------------------
r5417 | marko | 2009-06-25 08:20:56 -0400 (Thu, 25 Jun 2009) | 1 line
branches/zip: ha_innodb.cc: Move the misplaced Doxygen @file comment.
------------------------------------------------------------------------
r5418 | marko | 2009-06-25 08:55:52 -0400 (Thu, 25 Jun 2009) | 5 lines
branches/zip: Fix a race condition caused by
SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749)
When innodb_commit_concurrency is initially set nonzero,
DEFAULT would change it back to 0, triggering Bug #42101.
rb://139 approved by Heikki Tuuri.
------------------------------------------------------------------------
r5423 | calvin | 2009-06-26 16:52:52 -0400 (Fri, 26 Jun 2009) | 2 lines
branches/zip: Fix typos.
------------------------------------------------------------------------
r5425 | marko | 2009-06-29 04:52:30 -0400 (Mon, 29 Jun 2009) | 4 lines
branches/zip: ha_innobase::add_index(), ha_innobase::final_drop_index():
Start prebuilt->trx before locking the table. This should fix Issue #293
and could fix Issue #229.
Approved by Sunny (over IM).
------------------------------------------------------------------------
r5426 | marko | 2009-06-29 05:24:27 -0400 (Mon, 29 Jun 2009) | 3 lines
branches/zip: buf_page_get_gen(): Fix a race condition when reading
buf_fix_count. This could explain Issue #156.
Tested by Michael.
------------------------------------------------------------------------
r5427 | marko | 2009-06-29 05:54:53 -0400 (Mon, 29 Jun 2009) | 5 lines
branches/zip: lock_print_info_all_transactions(), buf_read_recv_pages():
Tolerate missing tablespaces (zip_size==ULINT_UNDEFINED).
buf_page_get_gen(): Add ut_ad(ut_is_2pow(zip_size)).
Issue #289, rb://136 approved by Sunny Bains
------------------------------------------------------------------------
r5428 | marko | 2009-06-29 07:06:29 -0400 (Mon, 29 Jun 2009) | 2 lines
branches/zip: row_sel_store_mysql_rec(): Add missing pointer cast.
Do not do arithmetics on void pointers.
------------------------------------------------------------------------
r5429 | marko | 2009-06-29 09:49:54 -0400 (Mon, 29 Jun 2009) | 13 lines
branches/zip: Do not crash on SET GLOBAL innodb_file_format=DEFAULT
or SET GLOBAL innodb_file_format_check=DEFAULT.
innodb_file_format.test: New test for innodb_file_format and
innodb_file_format_check.
innodb_file_format_name_validate(): Store the string in *save.
innodb_file_format_name_update(): Check the string again.
innodb_file_format_check_validate(): Store the string in *save.
innodb_file_format_check_update(): Check the string again.
Issue #282, rb://140 approved by Heikki Tuuri
------------------------------------------------------------------------
r5430 | marko | 2009-06-29 09:58:07 -0400 (Mon, 29 Jun 2009) | 2 lines
branches/zip: lock_rec_validate_page(): Add another assertion
to track down Issue #289.
------------------------------------------------------------------------
r5431 | marko | 2009-06-29 09:58:40 -0400 (Mon, 29 Jun 2009) | 1 line
branches/zip: Revert an accidentally made change in r5430 to univ.i.
------------------------------------------------------------------------
r5437 | marko | 2009-06-30 05:10:01 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: ibuf_dummy_index_free(): Beautify the comment.
------------------------------------------------------------------------
r5438 | marko | 2009-06-30 05:10:32 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: fseg_free(): Remove this unused function.
------------------------------------------------------------------------
r5439 | marko | 2009-06-30 05:15:22 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: fseg_validate(): Enclose in #ifdef UNIV_DEBUG.
This function is unused, but it could turn out to be a useful debugging aid.
------------------------------------------------------------------------
r5441 | marko | 2009-06-30 06:30:14 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: ha_delete(): Remove this unused function that was
very similar to ha_search_and_delete_if_found().
------------------------------------------------------------------------
r5442 | marko | 2009-06-30 06:45:41 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: lock_is_on_table(), lock_table_unlock(): Unused, remove.
------------------------------------------------------------------------
r5443 | marko | 2009-06-30 07:03:00 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_event_create_auto(): Unused, remove.
------------------------------------------------------------------------
r5444 | marko | 2009-06-30 07:19:49 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: que_graph_try_free(): Unused, remove.
------------------------------------------------------------------------
r5445 | marko | 2009-06-30 07:28:11 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: row_build_row_ref_from_row(): Unused, remove.
------------------------------------------------------------------------
r5446 | marko | 2009-06-30 07:35:45 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: srv_que_round_robin(), srv_que_task_enqueue(): Unused, remove.
------------------------------------------------------------------------
r5447 | marko | 2009-06-30 07:37:58 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: srv_que_task_queue_check(): Unused, remove.
------------------------------------------------------------------------
r5448 | marko | 2009-06-30 07:56:36 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: mem_heap_cat(): Unused, remove.
------------------------------------------------------------------------
r5449 | marko | 2009-06-30 08:00:50 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: innobase_start_or_create_for_mysql():
Invoke os_get_os_version() at most once.
------------------------------------------------------------------------
r5450 | marko | 2009-06-30 08:02:20 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_file_close_no_error_handling(): Unused, remove.
------------------------------------------------------------------------
r5451 | marko | 2009-06-30 08:09:49 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: page_set_max_trx_id(): Make the code compile
with UNIV_HOTBACKUP.
------------------------------------------------------------------------
r5452 | marko | 2009-06-30 08:10:26 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: os_file_close_no_error_handling(): Restore,
as this function is used within InnoDB Hot Backup.
------------------------------------------------------------------------
r5453 | marko | 2009-06-30 08:14:01 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_process_set_priority_boost(): Unused, remove.
------------------------------------------------------------------------
r5454 | marko | 2009-06-30 08:42:52 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: Replace a non-ASCII character
(ISO 8859-1 encoded U+00AD SOFT HYPHEN) with a cheap ASCII substitute.
------------------------------------------------------------------------
r5456 | inaam | 2009-06-30 14:21:09 -0400 (Tue, 30 Jun 2009) | 4 lines
branches/zip
Non functional change. s/Percona/Percona Inc./
------------------------------------------------------------------------
r5470 | vasil | 2009-07-02 09:12:36 -0400 (Thu, 02 Jul 2009) | 16 lines
branches/zip:
Use PAUSE instruction inside spinloop if it is available.
The patch was originally developed by Mikael Ronstrom <mikael@mysql.com>
and can be found here:
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2768
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2771
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2772
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2774
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2777
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2799
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2800
Approved by: Heikki (rb://137)
------------------------------------------------------------------------
r5481 | vasil | 2009-07-06 13:16:32 -0400 (Mon, 06 Jul 2009) | 4 lines
branches/zip:
Remove unnecessary quotes and simplify plug.in.
------------------------------------------------------------------------
r5482 | calvin | 2009-07-06 18:36:35 -0400 (Mon, 06 Jul 2009) | 5 lines
branches/zip: add COPYING files for Percona and Sun Micro.
1.0.4 contains patches based on contributions from Percona
and Sun Microsystems.
------------------------------------------------------------------------
r5483 | calvin | 2009-07-07 05:36:43 -0400 (Tue, 07 Jul 2009) | 3 lines
branches/zip: add IB_HAVE_PAUSE_INSTRUCTION to CMake.
Windows will support PAUSE instruction by default.
------------------------------------------------------------------------
r5484 | inaam | 2009-07-07 18:57:14 -0400 (Tue, 07 Jul 2009) | 13 lines
branches/zip rb://126
Based on contribution from Google Inc.
This patch introduces a new parameter innodb_io_capacity to control the
rate at which master threads performs various tasks. The default value
is 200 and higher values imply more aggressive flushing and ibuf merges
from within the master thread.
This patch also changes the ibuf merge from synchronous to asynchronous.
Another minor change is not to force the master thread to wait for a
log flush to complete every second.
Approved by: Heikki
------------------------------------------------------------------------
r5485 | inaam | 2009-07-07 19:00:49 -0400 (Tue, 07 Jul 2009) | 18 lines
branches/zip rb://138
The current implementation is to try to flush the neighbors of every
page that we flush. This patch makes the following distinction:
1) If the flush is from flush_list AND
2) If the flush is intended to move the oldest_modification LSN ahead
(this happens when a user thread sees little space in the log file and
attempts to flush pages from the buffer pool so that a checkpoint can
be made)
THEN
Do not try to flush the neighbors. Just focus on flushing dirty pages at
the end of flush_list
Approved by: Heikki
------------------------------------------------------------------------
r5486 | inaam | 2009-07-08 12:11:40 -0400 (Wed, 08 Jul 2009) | 29 lines
branches/zip rb://133
This patch introduces heuristics based flushing rate of dirty pages to
avoid IO bursts at checkpoint.
1) log_capacity / log_generated per second gives us number of seconds
in which ALL dirty pages need to be flushed. Based on this rough
assumption we can say that
n_dirty_pages / (log_capacity / log_generation_rate) = desired_flush_rate
2) We use weighted averages (hard coded to 20 seconds) of
log_generation_rate to avoid resonance.
3) From the desired_flush_rate we subtract the number of pages that have
been flushed due to LRU flushing. That gives us pages that we should
flush as part of flush_list cleanup. And that is the number (capped by
maximum io_capacity) that we try to flush from the master thread.
Knobs:
======
innodb_adaptive_flushing: boolean, global, dynamic, default TRUE.
Since this heuristic is very experimental and has the potential to
dramatically change the IO pattern I think it is a good idea to leave a
knob to turn it off.
Approved by: Heikki
------------------------------------------------------------------------
r5487 | calvin | 2009-07-08 12:42:28 -0400 (Wed, 08 Jul 2009) | 7 lines
branches/zip: fix PAUSE instruction patch on Windows
The original PAUSE instruction patch (r5470) does not
compile on Windows. Also, there is an elegant way of
doing it on Windows - YieldProcessor().
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r5489 | vasil | 2009-07-10 05:02:22 -0400 (Fri, 10 Jul 2009) | 9 lines
branches/zip:
Change the defaults for
innodb_sync_spin_loops: 20 -> 30
innodb_spin_wait_delay: 5 -> 6
This change was proposed by Sun/MySQL based on their performance testing,
see https://svn.innodb.com/innobase/Release_tasks_for_InnoDB_Plugin_V1.0.4
------------------------------------------------------------------------
r5490 | vasil | 2009-07-10 05:04:20 -0400 (Fri, 10 Jul 2009) | 4 lines
branches/zip:
Add ChangeLog entry for 5489.
------------------------------------------------------------------------
r5491 | calvin | 2009-07-10 12:19:17 -0400 (Fri, 10 Jul 2009) | 6 lines
branches/zip: add copyright info to files related to PAUSE
instruction patch, contributed by Sun Microsystems.
------------------------------------------------------------------------
r5492 | calvin | 2009-07-10 17:47:34 -0400 (Fri, 10 Jul 2009) | 5 lines
branches/zip: add ChangeLog entries for r5484-r5486.
------------------------------------------------------------------------
r5494 | vasil | 2009-07-13 03:37:35 -0400 (Mon, 13 Jul 2009) | 6 lines
branches/zip:
Restore the original value of innodb_sync_spin_loops at the end, previously
the test assumed that setting it to 20 will do this, but now the default is
30 and MTR's internal check failed.
------------------------------------------------------------------------
r5495 | inaam | 2009-07-13 11:48:45 -0400 (Mon, 13 Jul 2009) | 5 lines
branches/zip rb://138 (REVERT)
Revert the flush neighbors patch as it shows regression in
the benchmarks run by Michael.
------------------------------------------------------------------------
r5496 | inaam | 2009-07-13 14:04:57 -0400 (Mon, 13 Jul 2009) | 4 lines
branches/zip
Fixed warnings on windows where ulint != ib_uint64_t
------------------------------------------------------------------------
r5497 | calvin | 2009-07-13 15:01:00 -0400 (Mon, 13 Jul 2009) | 9 lines
branches/zip: fix run-time symbols clash on Solaris.
This patch is from Sergey Vojtovich of Sun Microsystems,
to fix run-time symbols clash on Solaris with older C++
compiler:
- when finding out a way to hide symbols, make decision basing
on compiler, not operating system.
- Sun Studio supports __hidden declaration specifier for this
purpose.
------------------------------------------------------------------------
r5498 | vasil | 2009-07-14 03:16:18 -0400 (Tue, 14 Jul 2009) | 92 lines
branches/zip: Merge r5341:5497 from branches/5.1, skipping:
c5419 because it is merge from branches/zip into branches/5.1
c5466 because the source code has been adjusted to match the MySQL
behavior and the innodb-autoinc test does not fail in branches/zip,
if c5466 is merged, then innodb-autoinc starts failing, Sunny suggested
not to merge c5466.
and resolving conflicts in c5410, c5440, c5488:
------------------------------------------------------------------------
r5410 | marko | 2009-06-24 22:26:34 +0300 (Wed, 24 Jun 2009) | 2 lines
Changed paths:
M /branches/5.1/include/trx0sys.ic
M /branches/5.1/trx/trx0purge.c
M /branches/5.1/trx/trx0sys.c
M /branches/5.1/trx/trx0undo.c
branches/5.1: Add missing #include "mtr0log.h" to avoid warnings
when compiling with -DUNIV_MUST_NOT_INLINE.
------------------------------------------------------------------------
r5419 | marko | 2009-06-25 16:11:57 +0300 (Thu, 25 Jun 2009) | 18 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb_bug42101-nonzero.result
M /branches/5.1/mysql-test/innodb_bug42101-nonzero.test
M /branches/5.1/mysql-test/innodb_bug42101.result
M /branches/5.1/mysql-test/innodb_bug42101.test
branches/5.1: Merge r5418 from branches/zip:
------------------------------------------------------------------------
r5418 | marko | 2009-06-25 15:55:52 +0300 (Thu, 25 Jun 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
M /branches/zip/mysql-test/innodb_bug42101.result
M /branches/zip/mysql-test/innodb_bug42101.test
branches/zip: Fix a race condition caused by
SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749)
When innodb_commit_concurrency is initially set nonzero,
DEFAULT would change it back to 0, triggering Bug #42101.
rb://139 approved by Heikki Tuuri.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5440 | vasil | 2009-06-30 13:04:29 +0300 (Tue, 30 Jun 2009) | 8 lines
Changed paths:
M /branches/5.1/fil/fil0fil.c
branches/5.1:
Fix Bug#45814 URL reference in InnoDB server errors needs adjusting to match documentation
by changing the URL from
http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting.html to
http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting-datadict.html
------------------------------------------------------------------------
r5466 | vasil | 2009-07-02 10:46:45 +0300 (Thu, 02 Jul 2009) | 6 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1:
Adjust the failing innodb-autoinc test to conform to the latest behavior
of the MySQL code. The idea and the comment in innodb-autoinc.test come
from Sunny.
------------------------------------------------------------------------
r5488 | vasil | 2009-07-09 19:16:44 +0300 (Thu, 09 Jul 2009) | 13 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug21704.result
A /branches/5.1/mysql-test/innodb_bug21704.test
branches/5.1:
Fix Bug#21704 Renaming column does not update FK definition
by checking whether a column that participates in a FK definition is being
renamed and denying the ALTER in this case.
The patch was originally developed by Davi Arnaut <Davi.Arnaut@Sun.COM>:
http://lists.mysql.com/commits/77714
and was later adjusted to conform to InnoDB coding style by me (Vasil),
I also added some more comments and moved the bug specific mysql-test to
a separate file to make it more manageable and flexible.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5499 | calvin | 2009-07-14 12:55:10 -0400 (Tue, 14 Jul 2009) | 3 lines
branches/zip: add a missing file in Makefile.am
This change was suggested by MySQL.
------------------------------------------------------------------------
r5500 | calvin | 2009-07-14 13:03:26 -0400 (Tue, 14 Jul 2009) | 3 lines
branches/zip: minor change
Remove an extra "with".
------------------------------------------------------------------------
r5501 | vasil | 2009-07-14 13:58:15 -0400 (Tue, 14 Jul 2009) | 5 lines
branches/zip:
Add @ZLIB_INCLUDES@ so that the InnoDB Plugin picks up the same zlib.h
header file that is eventually used by mysqld.
------------------------------------------------------------------------
r5502 | vasil | 2009-07-14 13:59:59 -0400 (Tue, 14 Jul 2009) | 4 lines
branches/zip:
Add include/ut0auxconf.h to noinst_HEADERS
------------------------------------------------------------------------
r5503 | vasil | 2009-07-14 14:16:11 -0400 (Tue, 14 Jul 2009) | 8 lines
branches/zip:
Non-functional change:
put files in noinst_HEADERS and libinnobase_a_SOURCES one per line and sort
alphabetically, so it is easier to find if a file is there or not and
also diffs show exactly the added or removed file instead of surrounding
lines too.
------------------------------------------------------------------------
r5504 | calvin | 2009-07-15 04:58:44 -0400 (Wed, 15 Jul 2009) | 6 lines
branches/zip: fix compile errors on Win64
Both srv_read_ahead_factor and srv_io_capacity should
be defined as ulong.
Approved by: Sunny
------------------------------------------------------------------------
r5508 | calvin | 2009-07-16 09:40:47 -0400 (Thu, 16 Jul 2009) | 16 lines
branches/zip: Support inlining of functions and prefetch with
Sun Studio
Those changes are contributed by Sun/MySQL. Two sets of changes
in this patch when Sun Studio is used:
- Explicit inlining of functions
- Prefetch Support
This patch has been tested by Sunny with the plugin statically
built in. Since we've never built the plugin as a dynamically
loaded module on Solaris, it is a separate task to change
plug.in.
rb://142
Approved by: Heikki
------------------------------------------------------------------------
r5509 | calvin | 2009-07-16 09:45:28 -0400 (Thu, 16 Jul 2009) | 2 lines
branches/zip: add ChangeLog entry for r5508.
------------------------------------------------------------------------
r5512 | sunny | 2009-07-19 19:52:48 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Remove unused extern ref to timed_mutexes.
------------------------------------------------------------------------
r5513 | sunny | 2009-07-19 19:58:43 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Undo r5512
------------------------------------------------------------------------
r5514 | sunny | 2009-07-19 20:08:49 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Only use my_bool when UNIV_HOTBACKUP is not defined.
------------------------------------------------------------------------
r5515 | sunny | 2009-07-20 03:29:14 -0400 (Mon, 20 Jul 2009) | 2 lines
branches/zip: The dict_table_t::autoinc_mutex field is not used in HotBackup.
------------------------------------------------------------------------
r5516 | sunny | 2009-07-20 03:46:05 -0400 (Mon, 20 Jul 2009) | 4 lines
branches/zip: Make this file usable from within HotBackup. A new file has
been introduced called hb_univ.i. This file should have all the HotBackup
specific configuration.
------------------------------------------------------------------------
r5517 | sunny | 2009-07-20 03:55:11 -0400 (Mon, 20 Jul 2009) | 2 lines
Add /* UNIV_HOTBACK */
------------------------------------------------------------------------
r5519 | vasil | 2009-07-20 04:45:18 -0400 (Mon, 20 Jul 2009) | 31 lines
branches/zip: Merge r5497:5518 from branches/5.1:
------------------------------------------------------------------------
r5518 | vasil | 2009-07-20 11:29:47 +0300 (Mon, 20 Jul 2009) | 22 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Merge a change from MySQL:
------------------------------------------------------------
revno: 2874.2.1
committer: Anurag Shekhar <anurag.shekhar@sun.com>
branch nick: mysql-5.1-bugteam-windows-warning
timestamp: Wed 2009-05-13 15:41:24 +0530
message:
Bug #39802 On Windows, 32-bit time_t should be enforced
This patch fixes compilation warning, "conversion from 'time_t' to 'ulong',
possible loss of data".
The fix is to typecast time_t to ulong before assigning it to ulong.
Backported this from 6.0-bugteam tree.
modified:
storage/archive/ha_archive.cc
storage/federated/ha_federated.cc
storage/innobase/handler/ha_innodb.cc
storage/myisam/ha_myisam.cc
------------------------------------------------------------------------
------------------------------------------------------------------------
r5520 | vasil | 2009-07-20 04:51:47 -0400 (Mon, 20 Jul 2009) | 4 lines
branches/zip:
Add ChangeLog entries for r5498 and r5519.
------------------------------------------------------------------------
r5524 | inaam | 2009-07-20 12:23:15 -0400 (Mon, 20 Jul 2009) | 9 lines
branches/zip
Change the read ahead parameter name to innodb_read_ahead_threshold.
Change the meaning of this parameter to signify the number of pages
that must be sequentially accessed for InnoDB to trigger a readahead
request.
Suggested by: Ken
------------------------------------------------------------------------
2009-07-21 02:09:29 +02:00
|
|
|
/* No need of a mutex. Only reading constant fields */
|
2016-08-12 10:17:45 +02:00
|
|
|
ulint slots_per_seg;
|
|
|
|
|
|
|
|
ut_ad(type.validate());
|
|
|
|
|
|
|
|
slots_per_seg = slots_per_segment();
|
branches/innodb+: Merge revisions 5144:5524 from branches/zip
------------------------------------------------------------------------
r5147 | marko | 2009-05-27 06:55:14 -0400 (Wed, 27 May 2009) | 1 line
branches/zip: ibuf0ibuf.c: Improve a comment.
------------------------------------------------------------------------
r5149 | marko | 2009-05-27 07:46:42 -0400 (Wed, 27 May 2009) | 34 lines
branches/zip: Merge revisions 4994:5148 from branches/5.1:
------------------------------------------------------------------------
r5126 | vasil | 2009-05-26 16:57:12 +0300 (Tue, 26 May 2009) | 9 lines
branches/5.1:
Preparation for the fix of
Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Non-functional change: move FSP_* macros from fsp0fsp.h to a new file
fsp0types.h. This is needed in order to be able to use FSP_EXTENT_SIZE
in mtr0log.ic.
------------------------------------------------------------------------
r5127 | vasil | 2009-05-26 17:05:43 +0300 (Tue, 26 May 2009) | 9 lines
branches/5.1:
Preparation for the fix of
Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Do not include unnecessary headers mtr0log.h and fut0lst.h in trx0sys.h
and include fsp0fsp.h just before it is needed. This is needed in order
to be able to use TRX_SYS_SPACE in mtr0log.ic.
------------------------------------------------------------------------
r5128 | vasil | 2009-05-26 17:26:37 +0300 (Tue, 26 May 2009) | 7 lines
branches/5.1:
Fix Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Do not write redo log for the pages in the doublewrite buffer. Also, do not
make a dummy change to the page because this is not needed.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5169 | marko | 2009-05-28 03:21:55 -0400 (Thu, 28 May 2009) | 1 line
branches/zip: mtr0mtr.h: Add Doxygen comments for the redo log entry types.
------------------------------------------------------------------------
r5176 | marko | 2009-05-28 07:14:02 -0400 (Thu, 28 May 2009) | 1 line
branches/zip: Correct a debug assertion that was added in r5125.
------------------------------------------------------------------------
r5201 | marko | 2009-06-01 06:35:25 -0400 (Mon, 01 Jun 2009) | 2 lines
branches/zip: Clean up some comments.
Make the rec parameter of mlog_open_and_write_index() const.
------------------------------------------------------------------------
r5234 | marko | 2009-06-03 08:26:41 -0400 (Wed, 03 Jun 2009) | 44 lines
branches/zip: Merge revisions 5148:5233 from branches/5.1:
------------------------------------------------------------------------
r5150 | vasil | 2009-05-27 18:56:03 +0300 (Wed, 27 May 2009) | 4 lines
branches/5.1:
Whitespace fixup.
------------------------------------------------------------------------
r5191 | vasil | 2009-05-30 17:46:05 +0300 (Sat, 30 May 2009) | 19 lines
branches/5.1:
Merge a change from MySQL (this fixes the failing innodb_mysql test):
------------------------------------------------------------
revno: 1810.3894.10
committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
branch nick: mysql-5.0-bugteam
timestamp: Tue 2009-05-19 11:32:21 +0500
message:
Bug#39793 Foreign keys not constructed when column has a '#' in a comment or default value
Internal InnoDN FK parser does not recognize '\'' as quotation symbol.
Suggested fix is to add '\'' symbol check for quotation condition
(dict_strip_comments() function).
modified:
innobase/dict/dict0dict.c
mysql-test/r/innodb_mysql.result
mysql-test/t/innodb_mysql.test
------------------------------------------------------------------------
r5233 | marko | 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) | 11 lines
branches/5.1: Merge the test case from r5232 from branches/5.0:
------------------------------------------------------------------------
r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines
branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565
(Update Query Results in "1 Row Affected" But Should Be "Zero Rows").
Also, add a test case for Bug #40565.
rb://128 approved by Heikki Tuuri
------------------------------------------------------------------------
------------------------------------------------------------------------
------------------------------------------------------------------------
r5250 | marko | 2009-06-04 02:58:23 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Add Doxygen comments to the rest of buf0*.
------------------------------------------------------------------------
r5251 | marko | 2009-06-04 02:59:51 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Replace <= in a function comment.
------------------------------------------------------------------------
r5253 | marko | 2009-06-04 06:37:35 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Add missing Doxygen comments for page0zip.
------------------------------------------------------------------------
r5261 | vasil | 2009-06-05 11:13:31 -0400 (Fri, 05 Jun 2009) | 15 lines
branches/zip:
Fix Mantis Issue#244 fix bug in linear read ahead (no check on access pattern)
The changes are:
1) Take into account access pattern when deciding whether or not to do linear
read ahead.
2) Expose a knob innodb_read_ahead_factor = [0-64] default (8), dynamic,
global to control linear read ahead behvior
3) Disable random read ahead. Keep the code for now.
Submitted by: Inaam (rb://122)
Approved by: Heikki (rb://122)
------------------------------------------------------------------------
r5262 | vasil | 2009-06-05 12:04:25 -0400 (Fri, 05 Jun 2009) | 22 lines
branches/zip:
Enable functionality to have multiple background io helper threads.
This patch is based on percona contributions.
More details about this patch will be written at:
https://svn.innodb.com/innobase/MultipleBackgroundThreads
The patch essentially does the following:
expose following knobs:
innodb_read_io_threads = [1 - 64] default 1
innodb_write_io_threads = [1 - 64] default 1
deprecate innodb_file_io_threads (this parameter was relevant only on windows)
Internally it allows multiple segments for read and write IO request arrays
where one thread works on one segement.
Submitted by: Inaam (rb://124)
Approved by: Heikki (rb://124)
------------------------------------------------------------------------
r5263 | vasil | 2009-06-05 12:19:37 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Whitespace cleanup.
------------------------------------------------------------------------
r5264 | vasil | 2009-06-05 12:26:58 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5261.
------------------------------------------------------------------------
r5265 | vasil | 2009-06-05 12:34:11 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5262.
------------------------------------------------------------------------
r5268 | inaam | 2009-06-08 12:18:21 -0400 (Mon, 08 Jun 2009) | 7 lines
branches/zip
Non functional change:
Added legal notices acknowledging percona contribution to the multiple
IO helper threads patch i.e.: r5262
------------------------------------------------------------------------
r5283 | inaam | 2009-06-09 13:46:29 -0400 (Tue, 09 Jun 2009) | 9 lines
branches/zip
rb://130
Enable Group Commit functionality that was broken in 5.0 when
distributed transactions were introduced.
Reviewed by: Heikki
------------------------------------------------------------------------
r5319 | marko | 2009-06-11 04:40:33 -0400 (Thu, 11 Jun 2009) | 3 lines
branches/zip: Declare os_thread_id_t as unsigned long,
because ulint is wrong on Win64.
Pointed out by Vladislav Vaintroub <wlad@sun.com>.
------------------------------------------------------------------------
r5320 | inaam | 2009-06-11 09:15:41 -0400 (Thu, 11 Jun 2009) | 14 lines
branches/zip rb://131
This patch changes the following defaults:
max_dirty_pages_pct: default from 90 to 75. max allowed from 100 to 99
additional_mem_pool_size: default from 1 to 8 MB
buffer_pool_size: default from 8 to 128 MB
log_buffer_size: default from 1 to 8 MB
read_io_threads/write_io_threads: default from 1 to 4
The log file sizes are untouched because of upgrade issues
Reviewed by: Heikki
------------------------------------------------------------------------
r5330 | marko | 2009-06-16 04:08:59 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: buf_page_get_gen(): Reduce mutex holding time by adjusting
buf_pool->n_pend_unzip while only holding buf_pool_mutex.
------------------------------------------------------------------------
r5331 | marko | 2009-06-16 05:00:48 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: buf_page_get_zip(): Eliminate a buf_page_get_mutex() call.
The function must switch on the block state anyway.
------------------------------------------------------------------------
r5332 | vasil | 2009-06-16 05:03:27 -0400 (Tue, 16 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entries for r5283 and r5320.
------------------------------------------------------------------------
r5333 | marko | 2009-06-16 05:27:46 -0400 (Tue, 16 Jun 2009) | 1 line
branches/zip: buf_page_io_query(): Remove unused function.
------------------------------------------------------------------------
r5335 | marko | 2009-06-16 09:23:10 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: innodb.test: Adjust the tolerance of
innodb_buffer_pool_pages_total for r5320.
------------------------------------------------------------------------
r5342 | marko | 2009-06-17 06:15:32 -0400 (Wed, 17 Jun 2009) | 60 lines
branches/zip: Merge revisions 5233:5341 from branches/5.1:
------------------------------------------------------------------------
r5233 | marko | 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) | 11 lines
branches/5.1: Merge the test case from r5232 from branches/5.0:
------------------------------------------------------------------------
r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines
branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565
(Update Query Results in "1 Row Affected" But Should Be "Zero Rows").
Also, add a test case for Bug #40565.
rb://128 approved by Heikki Tuuri
------------------------------------------------------------------------
------------------------------------------------------------------------
r5243 | sunny | 2009-06-04 03:17:14 +0300 (Thu, 04 Jun 2009) | 14 lines
branches/5.1: When the InnoDB and MySQL data dictionaries go out of sync, before
the bug fix we would assert on missing autoinc columns. With this fix we allow
MySQL to open the table but set the next autoinc value for the column to the
MAX value. This effectively disables the next value generation. INSERTs will
fail with a generic AUTOINC failure. However, the user should be able to
read/dump the table, set the column values explicitly, use ALTER TABLE to
set the next autoinc value and/or sync the two data dictionaries to resume
normal operations.
Fix Bug#44030 Error: (1500) Couldn't read the MAX(ID) autoinc value from the
index (PRIMARY)
rb://118
------------------------------------------------------------------------
r5252 | sunny | 2009-06-04 10:16:24 +0300 (Thu, 04 Jun 2009) | 2 lines
branches/5.1: The version of the result file checked in was broken in r5243.
------------------------------------------------------------------------
r5259 | vasil | 2009-06-05 10:29:16 +0300 (Fri, 05 Jun 2009) | 7 lines
branches/5.1:
Remove the word "Error" from the printout because the mysqltest suite
interprets it as an error and thus the innodb-autoinc test fails.
Approved by: Sunny (via IM)
------------------------------------------------------------------------
r5339 | marko | 2009-06-17 11:01:37 +0300 (Wed, 17 Jun 2009) | 2 lines
branches/5.1: Add missing #include "mtr0log.h" so that the code compiles
with -DUNIV_MUST_NOT_INLINE.
(null merge; this had already been committed in branches/zip)
------------------------------------------------------------------------
r5340 | marko | 2009-06-17 12:11:49 +0300 (Wed, 17 Jun 2009) | 4 lines
branches/5.1: row_unlock_for_mysql(): When the clustered index is unknown,
refuse to unlock the record.
(Bug #45357, caused by the fix of Bug #39320).
rb://132 approved by Sunny Bains.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5343 | vasil | 2009-06-17 08:56:12 -0400 (Wed, 17 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5342.
------------------------------------------------------------------------
r5344 | marko | 2009-06-17 09:03:45 -0400 (Wed, 17 Jun 2009) | 1 line
branches/zip: row_merge_read_rec(): Fix a UNIV_DEBUG bug (Bug #45426)
------------------------------------------------------------------------
r5391 | marko | 2009-06-22 05:31:35 -0400 (Mon, 22 Jun 2009) | 2 lines
branches/zip: buf_page_get_zip(): Fix a bogus warning about
block_mutex being possibly uninitialized.
------------------------------------------------------------------------
r5392 | marko | 2009-06-22 07:58:20 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: ha_innobase::check_if_incompatible_data(): When
ROW_FORMAT=DEFAULT, do not compare to get_row_type().
Without this change, fast index creation will be disabled
in recent versions of MySQL 5.1.
------------------------------------------------------------------------
r5393 | pekka | 2009-06-22 09:27:55 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: Minor changes for Hot Backup to build correctly. (The
code bracketed between #ifdef UNIV_HOTBACKUP and #endif /* UNIV_HOTBACKUP */).
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r5394 | pekka | 2009-06-22 09:46:34 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: Add functions for checking the format of tablespaces
for Hot Backup build (UNIV_HOTBACKUP defined).
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r5397 | calvin | 2009-06-23 16:59:42 -0400 (Tue, 23 Jun 2009) | 7 lines
branches/zip: change the header file path.
Change the header file path from ../storage/innobase/include/
to ../include/. In the planned 5.1 + plugin release, the source
directory of the plugin will not be in storage/innobase.
Approved by: Heikki (IM)
------------------------------------------------------------------------
r5407 | calvin | 2009-06-24 09:51:08 -0400 (Wed, 24 Jun 2009) | 4 lines
branches/zip: remove relative path of header files.
Suggested by Marko.
------------------------------------------------------------------------
r5412 | marko | 2009-06-25 06:27:08 -0400 (Thu, 25 Jun 2009) | 1 line
branches/zip: Replace a DBUG_ASSERT with ut_a to track down Issue #290.
------------------------------------------------------------------------
r5415 | marko | 2009-06-25 06:45:57 -0400 (Thu, 25 Jun 2009) | 3 lines
branches/zip: dict_index_find_cols(): Print diagnostic on name mismatch.
This addresses Bug #44571 but does not fix it.
rb://135 approved by Sunny Bains.
------------------------------------------------------------------------
r5417 | marko | 2009-06-25 08:20:56 -0400 (Thu, 25 Jun 2009) | 1 line
branches/zip: ha_innodb.cc: Move the misplaced Doxygen @file comment.
------------------------------------------------------------------------
r5418 | marko | 2009-06-25 08:55:52 -0400 (Thu, 25 Jun 2009) | 5 lines
branches/zip: Fix a race condition caused by
SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749)
When innodb_commit_concurrency is initially set nonzero,
DEFAULT would change it back to 0, triggering Bug #42101.
rb://139 approved by Heikki Tuuri.
------------------------------------------------------------------------
r5423 | calvin | 2009-06-26 16:52:52 -0400 (Fri, 26 Jun 2009) | 2 lines
branches/zip: Fix typos.
------------------------------------------------------------------------
r5425 | marko | 2009-06-29 04:52:30 -0400 (Mon, 29 Jun 2009) | 4 lines
branches/zip: ha_innobase::add_index(), ha_innobase::final_drop_index():
Start prebuilt->trx before locking the table. This should fix Issue #293
and could fix Issue #229.
Approved by Sunny (over IM).
------------------------------------------------------------------------
r5426 | marko | 2009-06-29 05:24:27 -0400 (Mon, 29 Jun 2009) | 3 lines
branches/zip: buf_page_get_gen(): Fix a race condition when reading
buf_fix_count. This could explain Issue #156.
Tested by Michael.
------------------------------------------------------------------------
r5427 | marko | 2009-06-29 05:54:53 -0400 (Mon, 29 Jun 2009) | 5 lines
branches/zip: lock_print_info_all_transactions(), buf_read_recv_pages():
Tolerate missing tablespaces (zip_size==ULINT_UNDEFINED).
buf_page_get_gen(): Add ut_ad(ut_is_2pow(zip_size)).
Issue #289, rb://136 approved by Sunny Bains
------------------------------------------------------------------------
r5428 | marko | 2009-06-29 07:06:29 -0400 (Mon, 29 Jun 2009) | 2 lines
branches/zip: row_sel_store_mysql_rec(): Add missing pointer cast.
Do not do arithmetics on void pointers.
------------------------------------------------------------------------
r5429 | marko | 2009-06-29 09:49:54 -0400 (Mon, 29 Jun 2009) | 13 lines
branches/zip: Do not crash on SET GLOBAL innodb_file_format=DEFAULT
or SET GLOBAL innodb_file_format_check=DEFAULT.
innodb_file_format.test: New test for innodb_file_format and
innodb_file_format_check.
innodb_file_format_name_validate(): Store the string in *save.
innodb_file_format_name_update(): Check the string again.
innodb_file_format_check_validate(): Store the string in *save.
innodb_file_format_check_update(): Check the string again.
Issue #282, rb://140 approved by Heikki Tuuri
------------------------------------------------------------------------
r5430 | marko | 2009-06-29 09:58:07 -0400 (Mon, 29 Jun 2009) | 2 lines
branches/zip: lock_rec_validate_page(): Add another assertion
to track down Issue #289.
------------------------------------------------------------------------
r5431 | marko | 2009-06-29 09:58:40 -0400 (Mon, 29 Jun 2009) | 1 line
branches/zip: Revert an accidentally made change in r5430 to univ.i.
------------------------------------------------------------------------
r5437 | marko | 2009-06-30 05:10:01 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: ibuf_dummy_index_free(): Beautify the comment.
------------------------------------------------------------------------
r5438 | marko | 2009-06-30 05:10:32 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: fseg_free(): Remove this unused function.
------------------------------------------------------------------------
r5439 | marko | 2009-06-30 05:15:22 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: fseg_validate(): Enclose in #ifdef UNIV_DEBUG.
This function is unused, but it could turn out to be a useful debugging aid.
------------------------------------------------------------------------
r5441 | marko | 2009-06-30 06:30:14 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: ha_delete(): Remove this unused function that was
very similar to ha_search_and_delete_if_found().
------------------------------------------------------------------------
r5442 | marko | 2009-06-30 06:45:41 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: lock_is_on_table(), lock_table_unlock(): Unused, remove.
------------------------------------------------------------------------
r5443 | marko | 2009-06-30 07:03:00 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_event_create_auto(): Unused, remove.
------------------------------------------------------------------------
r5444 | marko | 2009-06-30 07:19:49 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: que_graph_try_free(): Unused, remove.
------------------------------------------------------------------------
r5445 | marko | 2009-06-30 07:28:11 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: row_build_row_ref_from_row(): Unused, remove.
------------------------------------------------------------------------
r5446 | marko | 2009-06-30 07:35:45 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: srv_que_round_robin(), srv_que_task_enqueue(): Unused, remove.
------------------------------------------------------------------------
r5447 | marko | 2009-06-30 07:37:58 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: srv_que_task_queue_check(): Unused, remove.
------------------------------------------------------------------------
r5448 | marko | 2009-06-30 07:56:36 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: mem_heap_cat(): Unused, remove.
------------------------------------------------------------------------
r5449 | marko | 2009-06-30 08:00:50 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: innobase_start_or_create_for_mysql():
Invoke os_get_os_version() at most once.
------------------------------------------------------------------------
r5450 | marko | 2009-06-30 08:02:20 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_file_close_no_error_handling(): Unused, remove.
------------------------------------------------------------------------
r5451 | marko | 2009-06-30 08:09:49 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: page_set_max_trx_id(): Make the code compile
with UNIV_HOTBACKUP.
------------------------------------------------------------------------
r5452 | marko | 2009-06-30 08:10:26 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: os_file_close_no_error_handling(): Restore,
as this function is used within InnoDB Hot Backup.
------------------------------------------------------------------------
r5453 | marko | 2009-06-30 08:14:01 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_process_set_priority_boost(): Unused, remove.
------------------------------------------------------------------------
r5454 | marko | 2009-06-30 08:42:52 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: Replace a non-ASCII character
(ISO 8859-1 encoded U+00AD SOFT HYPHEN) with a cheap ASCII substitute.
------------------------------------------------------------------------
r5456 | inaam | 2009-06-30 14:21:09 -0400 (Tue, 30 Jun 2009) | 4 lines
branches/zip
Non functional change. s/Percona/Percona Inc./
------------------------------------------------------------------------
r5470 | vasil | 2009-07-02 09:12:36 -0400 (Thu, 02 Jul 2009) | 16 lines
branches/zip:
Use PAUSE instruction inside spinloop if it is available.
The patch was originally developed by Mikael Ronstrom <mikael@mysql.com>
and can be found here:
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2768
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2771
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2772
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2774
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2777
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2799
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2800
Approved by: Heikki (rb://137)
------------------------------------------------------------------------
r5481 | vasil | 2009-07-06 13:16:32 -0400 (Mon, 06 Jul 2009) | 4 lines
branches/zip:
Remove unnecessary quotes and simplify plug.in.
------------------------------------------------------------------------
r5482 | calvin | 2009-07-06 18:36:35 -0400 (Mon, 06 Jul 2009) | 5 lines
branches/zip: add COPYING files for Percona and Sun Micro.
1.0.4 contains patches based on contributions from Percona
and Sun Microsystems.
------------------------------------------------------------------------
r5483 | calvin | 2009-07-07 05:36:43 -0400 (Tue, 07 Jul 2009) | 3 lines
branches/zip: add IB_HAVE_PAUSE_INSTRUCTION to CMake.
Windows will support PAUSE instruction by default.
------------------------------------------------------------------------
r5484 | inaam | 2009-07-07 18:57:14 -0400 (Tue, 07 Jul 2009) | 13 lines
branches/zip rb://126
Based on contribution from Google Inc.
This patch introduces a new parameter innodb_io_capacity to control the
rate at which master threads performs various tasks. The default value
is 200 and higher values imply more aggressive flushing and ibuf merges
from within the master thread.
This patch also changes the ibuf merge from synchronous to asynchronous.
Another minor change is not to force the master thread to wait for a
log flush to complete every second.
Approved by: Heikki
------------------------------------------------------------------------
r5485 | inaam | 2009-07-07 19:00:49 -0400 (Tue, 07 Jul 2009) | 18 lines
branches/zip rb://138
The current implementation is to try to flush the neighbors of every
page that we flush. This patch makes the following distinction:
1) If the flush is from flush_list AND
2) If the flush is intended to move the oldest_modification LSN ahead
(this happens when a user thread sees little space in the log file and
attempts to flush pages from the buffer pool so that a checkpoint can
be made)
THEN
Do not try to flush the neighbors. Just focus on flushing dirty pages at
the end of flush_list
Approved by: Heikki
------------------------------------------------------------------------
r5486 | inaam | 2009-07-08 12:11:40 -0400 (Wed, 08 Jul 2009) | 29 lines
branches/zip rb://133
This patch introduces heuristics based flushing rate of dirty pages to
avoid IO bursts at checkpoint.
1) log_capacity / log_generated per second gives us number of seconds
in which ALL dirty pages need to be flushed. Based on this rough
assumption we can say that
n_dirty_pages / (log_capacity / log_generation_rate) = desired_flush_rate
2) We use weighted averages (hard coded to 20 seconds) of
log_generation_rate to avoid resonance.
3) From the desired_flush_rate we subtract the number of pages that have
been flushed due to LRU flushing. That gives us pages that we should
flush as part of flush_list cleanup. And that is the number (capped by
maximum io_capacity) that we try to flush from the master thread.
Knobs:
======
innodb_adaptive_flushing: boolean, global, dynamic, default TRUE.
Since this heuristic is very experimental and has the potential to
dramatically change the IO pattern I think it is a good idea to leave a
knob to turn it off.
Approved by: Heikki
------------------------------------------------------------------------
r5487 | calvin | 2009-07-08 12:42:28 -0400 (Wed, 08 Jul 2009) | 7 lines
branches/zip: fix PAUSE instruction patch on Windows
The original PAUSE instruction patch (r5470) does not
compile on Windows. Also, there is an elegant way of
doing it on Windows - YieldProcessor().
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r5489 | vasil | 2009-07-10 05:02:22 -0400 (Fri, 10 Jul 2009) | 9 lines
branches/zip:
Change the defaults for
innodb_sync_spin_loops: 20 -> 30
innodb_spin_wait_delay: 5 -> 6
This change was proposed by Sun/MySQL based on their performance testing,
see https://svn.innodb.com/innobase/Release_tasks_for_InnoDB_Plugin_V1.0.4
------------------------------------------------------------------------
r5490 | vasil | 2009-07-10 05:04:20 -0400 (Fri, 10 Jul 2009) | 4 lines
branches/zip:
Add ChangeLog entry for 5489.
------------------------------------------------------------------------
r5491 | calvin | 2009-07-10 12:19:17 -0400 (Fri, 10 Jul 2009) | 6 lines
branches/zip: add copyright info to files related to PAUSE
instruction patch, contributed by Sun Microsystems.
------------------------------------------------------------------------
r5492 | calvin | 2009-07-10 17:47:34 -0400 (Fri, 10 Jul 2009) | 5 lines
branches/zip: add ChangeLog entries for r5484-r5486.
------------------------------------------------------------------------
r5494 | vasil | 2009-07-13 03:37:35 -0400 (Mon, 13 Jul 2009) | 6 lines
branches/zip:
Restore the original value of innodb_sync_spin_loops at the end, previously
the test assumed that setting it to 20 will do this, but now the default is
30 and MTR's internal check failed.
------------------------------------------------------------------------
r5495 | inaam | 2009-07-13 11:48:45 -0400 (Mon, 13 Jul 2009) | 5 lines
branches/zip rb://138 (REVERT)
Revert the flush neighbors patch as it shows regression in
the benchmarks run by Michael.
------------------------------------------------------------------------
r5496 | inaam | 2009-07-13 14:04:57 -0400 (Mon, 13 Jul 2009) | 4 lines
branches/zip
Fixed warnings on windows where ulint != ib_uint64_t
------------------------------------------------------------------------
r5497 | calvin | 2009-07-13 15:01:00 -0400 (Mon, 13 Jul 2009) | 9 lines
branches/zip: fix run-time symbols clash on Solaris.
This patch is from Sergey Vojtovich of Sun Microsystems,
to fix run-time symbols clash on Solaris with older C++
compiler:
- when finding out a way to hide symbols, make decision basing
on compiler, not operating system.
- Sun Studio supports __hidden declaration specifier for this
purpose.
------------------------------------------------------------------------
r5498 | vasil | 2009-07-14 03:16:18 -0400 (Tue, 14 Jul 2009) | 92 lines
branches/zip: Merge r5341:5497 from branches/5.1, skipping:
c5419 because it is merge from branches/zip into branches/5.1
c5466 because the source code has been adjusted to match the MySQL
behavior and the innodb-autoinc test does not fail in branches/zip,
if c5466 is merged, then innodb-autoinc starts failing, Sunny suggested
not to merge c5466.
and resolving conflicts in c5410, c5440, c5488:
------------------------------------------------------------------------
r5410 | marko | 2009-06-24 22:26:34 +0300 (Wed, 24 Jun 2009) | 2 lines
Changed paths:
M /branches/5.1/include/trx0sys.ic
M /branches/5.1/trx/trx0purge.c
M /branches/5.1/trx/trx0sys.c
M /branches/5.1/trx/trx0undo.c
branches/5.1: Add missing #include "mtr0log.h" to avoid warnings
when compiling with -DUNIV_MUST_NOT_INLINE.
------------------------------------------------------------------------
r5419 | marko | 2009-06-25 16:11:57 +0300 (Thu, 25 Jun 2009) | 18 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb_bug42101-nonzero.result
M /branches/5.1/mysql-test/innodb_bug42101-nonzero.test
M /branches/5.1/mysql-test/innodb_bug42101.result
M /branches/5.1/mysql-test/innodb_bug42101.test
branches/5.1: Merge r5418 from branches/zip:
------------------------------------------------------------------------
r5418 | marko | 2009-06-25 15:55:52 +0300 (Thu, 25 Jun 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
M /branches/zip/mysql-test/innodb_bug42101.result
M /branches/zip/mysql-test/innodb_bug42101.test
branches/zip: Fix a race condition caused by
SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749)
When innodb_commit_concurrency is initially set nonzero,
DEFAULT would change it back to 0, triggering Bug #42101.
rb://139 approved by Heikki Tuuri.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5440 | vasil | 2009-06-30 13:04:29 +0300 (Tue, 30 Jun 2009) | 8 lines
Changed paths:
M /branches/5.1/fil/fil0fil.c
branches/5.1:
Fix Bug#45814 URL reference in InnoDB server errors needs adjusting to match documentation
by changing the URL from
http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting.html to
http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting-datadict.html
------------------------------------------------------------------------
r5466 | vasil | 2009-07-02 10:46:45 +0300 (Thu, 02 Jul 2009) | 6 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1:
Adjust the failing innodb-autoinc test to conform to the latest behavior
of the MySQL code. The idea and the comment in innodb-autoinc.test come
from Sunny.
------------------------------------------------------------------------
r5488 | vasil | 2009-07-09 19:16:44 +0300 (Thu, 09 Jul 2009) | 13 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug21704.result
A /branches/5.1/mysql-test/innodb_bug21704.test
branches/5.1:
Fix Bug#21704 Renaming column does not update FK definition
by checking whether a column that participates in a FK definition is being
renamed and denying the ALTER in this case.
The patch was originally developed by Davi Arnaut <Davi.Arnaut@Sun.COM>:
http://lists.mysql.com/commits/77714
and was later adjusted to conform to InnoDB coding style by me (Vasil),
I also added some more comments and moved the bug specific mysql-test to
a separate file to make it more manageable and flexible.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5499 | calvin | 2009-07-14 12:55:10 -0400 (Tue, 14 Jul 2009) | 3 lines
branches/zip: add a missing file in Makefile.am
This change was suggested by MySQL.
------------------------------------------------------------------------
r5500 | calvin | 2009-07-14 13:03:26 -0400 (Tue, 14 Jul 2009) | 3 lines
branches/zip: minor change
Remove an extra "with".
------------------------------------------------------------------------
r5501 | vasil | 2009-07-14 13:58:15 -0400 (Tue, 14 Jul 2009) | 5 lines
branches/zip:
Add @ZLIB_INCLUDES@ so that the InnoDB Plugin picks up the same zlib.h
header file that is eventually used by mysqld.
------------------------------------------------------------------------
r5502 | vasil | 2009-07-14 13:59:59 -0400 (Tue, 14 Jul 2009) | 4 lines
branches/zip:
Add include/ut0auxconf.h to noinst_HEADERS
------------------------------------------------------------------------
r5503 | vasil | 2009-07-14 14:16:11 -0400 (Tue, 14 Jul 2009) | 8 lines
branches/zip:
Non-functional change:
put files in noinst_HEADERS and libinnobase_a_SOURCES one per line and sort
alphabetically, so it is easier to find if a file is there or not and
also diffs show exactly the added or removed file instead of surrounding
lines too.
------------------------------------------------------------------------
r5504 | calvin | 2009-07-15 04:58:44 -0400 (Wed, 15 Jul 2009) | 6 lines
branches/zip: fix compile errors on Win64
Both srv_read_ahead_factor and srv_io_capacity should
be defined as ulong.
Approved by: Sunny
------------------------------------------------------------------------
r5508 | calvin | 2009-07-16 09:40:47 -0400 (Thu, 16 Jul 2009) | 16 lines
branches/zip: Support inlining of functions and prefetch with
Sun Studio
Those changes are contributed by Sun/MySQL. Two sets of changes
in this patch when Sun Studio is used:
- Explicit inlining of functions
- Prefetch Support
This patch has been tested by Sunny with the plugin statically
built in. Since we've never built the plugin as a dynamically
loaded module on Solaris, it is a separate task to change
plug.in.
rb://142
Approved by: Heikki
------------------------------------------------------------------------
r5509 | calvin | 2009-07-16 09:45:28 -0400 (Thu, 16 Jul 2009) | 2 lines
branches/zip: add ChangeLog entry for r5508.
------------------------------------------------------------------------
r5512 | sunny | 2009-07-19 19:52:48 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Remove unused extern ref to timed_mutexes.
------------------------------------------------------------------------
r5513 | sunny | 2009-07-19 19:58:43 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Undo r5512
------------------------------------------------------------------------
r5514 | sunny | 2009-07-19 20:08:49 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Only use my_bool when UNIV_HOTBACKUP is not defined.
------------------------------------------------------------------------
r5515 | sunny | 2009-07-20 03:29:14 -0400 (Mon, 20 Jul 2009) | 2 lines
branches/zip: The dict_table_t::autoinc_mutex field is not used in HotBackup.
------------------------------------------------------------------------
r5516 | sunny | 2009-07-20 03:46:05 -0400 (Mon, 20 Jul 2009) | 4 lines
branches/zip: Make this file usable from within HotBackup. A new file has
been introduced called hb_univ.i. This file should have all the HotBackup
specific configuration.
------------------------------------------------------------------------
r5517 | sunny | 2009-07-20 03:55:11 -0400 (Mon, 20 Jul 2009) | 2 lines
Add /* UNIV_HOTBACK */
------------------------------------------------------------------------
r5519 | vasil | 2009-07-20 04:45:18 -0400 (Mon, 20 Jul 2009) | 31 lines
branches/zip: Merge r5497:5518 from branches/5.1:
------------------------------------------------------------------------
r5518 | vasil | 2009-07-20 11:29:47 +0300 (Mon, 20 Jul 2009) | 22 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Merge a change from MySQL:
------------------------------------------------------------
revno: 2874.2.1
committer: Anurag Shekhar <anurag.shekhar@sun.com>
branch nick: mysql-5.1-bugteam-windows-warning
timestamp: Wed 2009-05-13 15:41:24 +0530
message:
Bug #39802 On Windows, 32-bit time_t should be enforced
This patch fixes compilation warning, "conversion from 'time_t' to 'ulong',
possible loss of data".
The fix is to typecast time_t to ulong before assigning it to ulong.
Backported this from 6.0-bugteam tree.
modified:
storage/archive/ha_archive.cc
storage/federated/ha_federated.cc
storage/innobase/handler/ha_innodb.cc
storage/myisam/ha_myisam.cc
------------------------------------------------------------------------
------------------------------------------------------------------------
r5520 | vasil | 2009-07-20 04:51:47 -0400 (Mon, 20 Jul 2009) | 4 lines
branches/zip:
Add ChangeLog entries for r5498 and r5519.
------------------------------------------------------------------------
r5524 | inaam | 2009-07-20 12:23:15 -0400 (Mon, 20 Jul 2009) | 9 lines
branches/zip
Change the read ahead parameter name to innodb_read_ahead_threshold.
Change the meaning of this parameter to signify the number of pages
that must be sequentially accessed for InnoDB to trigger a readahead
request.
Suggested by: Ken
------------------------------------------------------------------------
2009-07-21 02:09:29 +02:00
|
|
|
|
|
|
|
/* We attempt to keep adjacent blocks in the same local
|
|
|
|
segment. This can help in merging IO requests when we are
|
|
|
|
doing simulated AIO */
|
2016-08-12 10:17:45 +02:00
|
|
|
ulint local_seg;
|
|
|
|
|
|
|
|
local_seg = (offset >> (UNIV_PAGE_SIZE_SHIFT + 6)) % m_n_segments;
|
|
|
|
|
|
|
|
for (;;) {
|
branches/innodb+: Merge revisions 5144:5524 from branches/zip
------------------------------------------------------------------------
r5147 | marko | 2009-05-27 06:55:14 -0400 (Wed, 27 May 2009) | 1 line
branches/zip: ibuf0ibuf.c: Improve a comment.
------------------------------------------------------------------------
r5149 | marko | 2009-05-27 07:46:42 -0400 (Wed, 27 May 2009) | 34 lines
branches/zip: Merge revisions 4994:5148 from branches/5.1:
------------------------------------------------------------------------
r5126 | vasil | 2009-05-26 16:57:12 +0300 (Tue, 26 May 2009) | 9 lines
branches/5.1:
Preparation for the fix of
Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Non-functional change: move FSP_* macros from fsp0fsp.h to a new file
fsp0types.h. This is needed in order to be able to use FSP_EXTENT_SIZE
in mtr0log.ic.
------------------------------------------------------------------------
r5127 | vasil | 2009-05-26 17:05:43 +0300 (Tue, 26 May 2009) | 9 lines
branches/5.1:
Preparation for the fix of
Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Do not include unnecessary headers mtr0log.h and fut0lst.h in trx0sys.h
and include fsp0fsp.h just before it is needed. This is needed in order
to be able to use TRX_SYS_SPACE in mtr0log.ic.
------------------------------------------------------------------------
r5128 | vasil | 2009-05-26 17:26:37 +0300 (Tue, 26 May 2009) | 7 lines
branches/5.1:
Fix Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Do not write redo log for the pages in the doublewrite buffer. Also, do not
make a dummy change to the page because this is not needed.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5169 | marko | 2009-05-28 03:21:55 -0400 (Thu, 28 May 2009) | 1 line
branches/zip: mtr0mtr.h: Add Doxygen comments for the redo log entry types.
------------------------------------------------------------------------
r5176 | marko | 2009-05-28 07:14:02 -0400 (Thu, 28 May 2009) | 1 line
branches/zip: Correct a debug assertion that was added in r5125.
------------------------------------------------------------------------
r5201 | marko | 2009-06-01 06:35:25 -0400 (Mon, 01 Jun 2009) | 2 lines
branches/zip: Clean up some comments.
Make the rec parameter of mlog_open_and_write_index() const.
------------------------------------------------------------------------
r5234 | marko | 2009-06-03 08:26:41 -0400 (Wed, 03 Jun 2009) | 44 lines
branches/zip: Merge revisions 5148:5233 from branches/5.1:
------------------------------------------------------------------------
r5150 | vasil | 2009-05-27 18:56:03 +0300 (Wed, 27 May 2009) | 4 lines
branches/5.1:
Whitespace fixup.
------------------------------------------------------------------------
r5191 | vasil | 2009-05-30 17:46:05 +0300 (Sat, 30 May 2009) | 19 lines
branches/5.1:
Merge a change from MySQL (this fixes the failing innodb_mysql test):
------------------------------------------------------------
revno: 1810.3894.10
committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
branch nick: mysql-5.0-bugteam
timestamp: Tue 2009-05-19 11:32:21 +0500
message:
Bug#39793 Foreign keys not constructed when column has a '#' in a comment or default value
Internal InnoDN FK parser does not recognize '\'' as quotation symbol.
Suggested fix is to add '\'' symbol check for quotation condition
(dict_strip_comments() function).
modified:
innobase/dict/dict0dict.c
mysql-test/r/innodb_mysql.result
mysql-test/t/innodb_mysql.test
------------------------------------------------------------------------
r5233 | marko | 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) | 11 lines
branches/5.1: Merge the test case from r5232 from branches/5.0:
------------------------------------------------------------------------
r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines
branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565
(Update Query Results in "1 Row Affected" But Should Be "Zero Rows").
Also, add a test case for Bug #40565.
rb://128 approved by Heikki Tuuri
------------------------------------------------------------------------
------------------------------------------------------------------------
------------------------------------------------------------------------
r5250 | marko | 2009-06-04 02:58:23 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Add Doxygen comments to the rest of buf0*.
------------------------------------------------------------------------
r5251 | marko | 2009-06-04 02:59:51 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Replace <= in a function comment.
------------------------------------------------------------------------
r5253 | marko | 2009-06-04 06:37:35 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Add missing Doxygen comments for page0zip.
------------------------------------------------------------------------
r5261 | vasil | 2009-06-05 11:13:31 -0400 (Fri, 05 Jun 2009) | 15 lines
branches/zip:
Fix Mantis Issue#244 fix bug in linear read ahead (no check on access pattern)
The changes are:
1) Take into account access pattern when deciding whether or not to do linear
read ahead.
2) Expose a knob innodb_read_ahead_factor = [0-64] default (8), dynamic,
global to control linear read ahead behvior
3) Disable random read ahead. Keep the code for now.
Submitted by: Inaam (rb://122)
Approved by: Heikki (rb://122)
------------------------------------------------------------------------
r5262 | vasil | 2009-06-05 12:04:25 -0400 (Fri, 05 Jun 2009) | 22 lines
branches/zip:
Enable functionality to have multiple background io helper threads.
This patch is based on percona contributions.
More details about this patch will be written at:
https://svn.innodb.com/innobase/MultipleBackgroundThreads
The patch essentially does the following:
expose following knobs:
innodb_read_io_threads = [1 - 64] default 1
innodb_write_io_threads = [1 - 64] default 1
deprecate innodb_file_io_threads (this parameter was relevant only on windows)
Internally it allows multiple segments for read and write IO request arrays
where one thread works on one segement.
Submitted by: Inaam (rb://124)
Approved by: Heikki (rb://124)
------------------------------------------------------------------------
r5263 | vasil | 2009-06-05 12:19:37 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Whitespace cleanup.
------------------------------------------------------------------------
r5264 | vasil | 2009-06-05 12:26:58 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5261.
------------------------------------------------------------------------
r5265 | vasil | 2009-06-05 12:34:11 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5262.
------------------------------------------------------------------------
r5268 | inaam | 2009-06-08 12:18:21 -0400 (Mon, 08 Jun 2009) | 7 lines
branches/zip
Non functional change:
Added legal notices acknowledging percona contribution to the multiple
IO helper threads patch i.e.: r5262
------------------------------------------------------------------------
r5283 | inaam | 2009-06-09 13:46:29 -0400 (Tue, 09 Jun 2009) | 9 lines
branches/zip
rb://130
Enable Group Commit functionality that was broken in 5.0 when
distributed transactions were introduced.
Reviewed by: Heikki
------------------------------------------------------------------------
r5319 | marko | 2009-06-11 04:40:33 -0400 (Thu, 11 Jun 2009) | 3 lines
branches/zip: Declare os_thread_id_t as unsigned long,
because ulint is wrong on Win64.
Pointed out by Vladislav Vaintroub <wlad@sun.com>.
------------------------------------------------------------------------
r5320 | inaam | 2009-06-11 09:15:41 -0400 (Thu, 11 Jun 2009) | 14 lines
branches/zip rb://131
This patch changes the following defaults:
max_dirty_pages_pct: default from 90 to 75. max allowed from 100 to 99
additional_mem_pool_size: default from 1 to 8 MB
buffer_pool_size: default from 8 to 128 MB
log_buffer_size: default from 1 to 8 MB
read_io_threads/write_io_threads: default from 1 to 4
The log file sizes are untouched because of upgrade issues
Reviewed by: Heikki
------------------------------------------------------------------------
r5330 | marko | 2009-06-16 04:08:59 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: buf_page_get_gen(): Reduce mutex holding time by adjusting
buf_pool->n_pend_unzip while only holding buf_pool_mutex.
------------------------------------------------------------------------
r5331 | marko | 2009-06-16 05:00:48 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: buf_page_get_zip(): Eliminate a buf_page_get_mutex() call.
The function must switch on the block state anyway.
------------------------------------------------------------------------
r5332 | vasil | 2009-06-16 05:03:27 -0400 (Tue, 16 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entries for r5283 and r5320.
------------------------------------------------------------------------
r5333 | marko | 2009-06-16 05:27:46 -0400 (Tue, 16 Jun 2009) | 1 line
branches/zip: buf_page_io_query(): Remove unused function.
------------------------------------------------------------------------
r5335 | marko | 2009-06-16 09:23:10 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: innodb.test: Adjust the tolerance of
innodb_buffer_pool_pages_total for r5320.
------------------------------------------------------------------------
r5342 | marko | 2009-06-17 06:15:32 -0400 (Wed, 17 Jun 2009) | 60 lines
branches/zip: Merge revisions 5233:5341 from branches/5.1:
------------------------------------------------------------------------
r5233 | marko | 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) | 11 lines
branches/5.1: Merge the test case from r5232 from branches/5.0:
------------------------------------------------------------------------
r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines
branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565
(Update Query Results in "1 Row Affected" But Should Be "Zero Rows").
Also, add a test case for Bug #40565.
rb://128 approved by Heikki Tuuri
------------------------------------------------------------------------
------------------------------------------------------------------------
r5243 | sunny | 2009-06-04 03:17:14 +0300 (Thu, 04 Jun 2009) | 14 lines
branches/5.1: When the InnoDB and MySQL data dictionaries go out of sync, before
the bug fix we would assert on missing autoinc columns. With this fix we allow
MySQL to open the table but set the next autoinc value for the column to the
MAX value. This effectively disables the next value generation. INSERTs will
fail with a generic AUTOINC failure. However, the user should be able to
read/dump the table, set the column values explicitly, use ALTER TABLE to
set the next autoinc value and/or sync the two data dictionaries to resume
normal operations.
Fix Bug#44030 Error: (1500) Couldn't read the MAX(ID) autoinc value from the
index (PRIMARY)
rb://118
------------------------------------------------------------------------
r5252 | sunny | 2009-06-04 10:16:24 +0300 (Thu, 04 Jun 2009) | 2 lines
branches/5.1: The version of the result file checked in was broken in r5243.
------------------------------------------------------------------------
r5259 | vasil | 2009-06-05 10:29:16 +0300 (Fri, 05 Jun 2009) | 7 lines
branches/5.1:
Remove the word "Error" from the printout because the mysqltest suite
interprets it as an error and thus the innodb-autoinc test fails.
Approved by: Sunny (via IM)
------------------------------------------------------------------------
r5339 | marko | 2009-06-17 11:01:37 +0300 (Wed, 17 Jun 2009) | 2 lines
branches/5.1: Add missing #include "mtr0log.h" so that the code compiles
with -DUNIV_MUST_NOT_INLINE.
(null merge; this had already been committed in branches/zip)
------------------------------------------------------------------------
r5340 | marko | 2009-06-17 12:11:49 +0300 (Wed, 17 Jun 2009) | 4 lines
branches/5.1: row_unlock_for_mysql(): When the clustered index is unknown,
refuse to unlock the record.
(Bug #45357, caused by the fix of Bug #39320).
rb://132 approved by Sunny Bains.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5343 | vasil | 2009-06-17 08:56:12 -0400 (Wed, 17 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5342.
------------------------------------------------------------------------
r5344 | marko | 2009-06-17 09:03:45 -0400 (Wed, 17 Jun 2009) | 1 line
branches/zip: row_merge_read_rec(): Fix a UNIV_DEBUG bug (Bug #45426)
------------------------------------------------------------------------
r5391 | marko | 2009-06-22 05:31:35 -0400 (Mon, 22 Jun 2009) | 2 lines
branches/zip: buf_page_get_zip(): Fix a bogus warning about
block_mutex being possibly uninitialized.
------------------------------------------------------------------------
r5392 | marko | 2009-06-22 07:58:20 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: ha_innobase::check_if_incompatible_data(): When
ROW_FORMAT=DEFAULT, do not compare to get_row_type().
Without this change, fast index creation will be disabled
in recent versions of MySQL 5.1.
------------------------------------------------------------------------
r5393 | pekka | 2009-06-22 09:27:55 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: Minor changes for Hot Backup to build correctly. (The
code bracketed between #ifdef UNIV_HOTBACKUP and #endif /* UNIV_HOTBACKUP */).
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r5394 | pekka | 2009-06-22 09:46:34 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: Add functions for checking the format of tablespaces
for Hot Backup build (UNIV_HOTBACKUP defined).
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r5397 | calvin | 2009-06-23 16:59:42 -0400 (Tue, 23 Jun 2009) | 7 lines
branches/zip: change the header file path.
Change the header file path from ../storage/innobase/include/
to ../include/. In the planned 5.1 + plugin release, the source
directory of the plugin will not be in storage/innobase.
Approved by: Heikki (IM)
------------------------------------------------------------------------
r5407 | calvin | 2009-06-24 09:51:08 -0400 (Wed, 24 Jun 2009) | 4 lines
branches/zip: remove relative path of header files.
Suggested by Marko.
------------------------------------------------------------------------
r5412 | marko | 2009-06-25 06:27:08 -0400 (Thu, 25 Jun 2009) | 1 line
branches/zip: Replace a DBUG_ASSERT with ut_a to track down Issue #290.
------------------------------------------------------------------------
r5415 | marko | 2009-06-25 06:45:57 -0400 (Thu, 25 Jun 2009) | 3 lines
branches/zip: dict_index_find_cols(): Print diagnostic on name mismatch.
This addresses Bug #44571 but does not fix it.
rb://135 approved by Sunny Bains.
------------------------------------------------------------------------
r5417 | marko | 2009-06-25 08:20:56 -0400 (Thu, 25 Jun 2009) | 1 line
branches/zip: ha_innodb.cc: Move the misplaced Doxygen @file comment.
------------------------------------------------------------------------
r5418 | marko | 2009-06-25 08:55:52 -0400 (Thu, 25 Jun 2009) | 5 lines
branches/zip: Fix a race condition caused by
SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749)
When innodb_commit_concurrency is initially set nonzero,
DEFAULT would change it back to 0, triggering Bug #42101.
rb://139 approved by Heikki Tuuri.
------------------------------------------------------------------------
r5423 | calvin | 2009-06-26 16:52:52 -0400 (Fri, 26 Jun 2009) | 2 lines
branches/zip: Fix typos.
------------------------------------------------------------------------
r5425 | marko | 2009-06-29 04:52:30 -0400 (Mon, 29 Jun 2009) | 4 lines
branches/zip: ha_innobase::add_index(), ha_innobase::final_drop_index():
Start prebuilt->trx before locking the table. This should fix Issue #293
and could fix Issue #229.
Approved by Sunny (over IM).
------------------------------------------------------------------------
r5426 | marko | 2009-06-29 05:24:27 -0400 (Mon, 29 Jun 2009) | 3 lines
branches/zip: buf_page_get_gen(): Fix a race condition when reading
buf_fix_count. This could explain Issue #156.
Tested by Michael.
------------------------------------------------------------------------
r5427 | marko | 2009-06-29 05:54:53 -0400 (Mon, 29 Jun 2009) | 5 lines
branches/zip: lock_print_info_all_transactions(), buf_read_recv_pages():
Tolerate missing tablespaces (zip_size==ULINT_UNDEFINED).
buf_page_get_gen(): Add ut_ad(ut_is_2pow(zip_size)).
Issue #289, rb://136 approved by Sunny Bains
------------------------------------------------------------------------
r5428 | marko | 2009-06-29 07:06:29 -0400 (Mon, 29 Jun 2009) | 2 lines
branches/zip: row_sel_store_mysql_rec(): Add missing pointer cast.
Do not do arithmetics on void pointers.
------------------------------------------------------------------------
r5429 | marko | 2009-06-29 09:49:54 -0400 (Mon, 29 Jun 2009) | 13 lines
branches/zip: Do not crash on SET GLOBAL innodb_file_format=DEFAULT
or SET GLOBAL innodb_file_format_check=DEFAULT.
innodb_file_format.test: New test for innodb_file_format and
innodb_file_format_check.
innodb_file_format_name_validate(): Store the string in *save.
innodb_file_format_name_update(): Check the string again.
innodb_file_format_check_validate(): Store the string in *save.
innodb_file_format_check_update(): Check the string again.
Issue #282, rb://140 approved by Heikki Tuuri
------------------------------------------------------------------------
r5430 | marko | 2009-06-29 09:58:07 -0400 (Mon, 29 Jun 2009) | 2 lines
branches/zip: lock_rec_validate_page(): Add another assertion
to track down Issue #289.
------------------------------------------------------------------------
r5431 | marko | 2009-06-29 09:58:40 -0400 (Mon, 29 Jun 2009) | 1 line
branches/zip: Revert an accidentally made change in r5430 to univ.i.
------------------------------------------------------------------------
r5437 | marko | 2009-06-30 05:10:01 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: ibuf_dummy_index_free(): Beautify the comment.
------------------------------------------------------------------------
r5438 | marko | 2009-06-30 05:10:32 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: fseg_free(): Remove this unused function.
------------------------------------------------------------------------
r5439 | marko | 2009-06-30 05:15:22 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: fseg_validate(): Enclose in #ifdef UNIV_DEBUG.
This function is unused, but it could turn out to be a useful debugging aid.
------------------------------------------------------------------------
r5441 | marko | 2009-06-30 06:30:14 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: ha_delete(): Remove this unused function that was
very similar to ha_search_and_delete_if_found().
------------------------------------------------------------------------
r5442 | marko | 2009-06-30 06:45:41 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: lock_is_on_table(), lock_table_unlock(): Unused, remove.
------------------------------------------------------------------------
r5443 | marko | 2009-06-30 07:03:00 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_event_create_auto(): Unused, remove.
------------------------------------------------------------------------
r5444 | marko | 2009-06-30 07:19:49 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: que_graph_try_free(): Unused, remove.
------------------------------------------------------------------------
r5445 | marko | 2009-06-30 07:28:11 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: row_build_row_ref_from_row(): Unused, remove.
------------------------------------------------------------------------
r5446 | marko | 2009-06-30 07:35:45 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: srv_que_round_robin(), srv_que_task_enqueue(): Unused, remove.
------------------------------------------------------------------------
r5447 | marko | 2009-06-30 07:37:58 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: srv_que_task_queue_check(): Unused, remove.
------------------------------------------------------------------------
r5448 | marko | 2009-06-30 07:56:36 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: mem_heap_cat(): Unused, remove.
------------------------------------------------------------------------
r5449 | marko | 2009-06-30 08:00:50 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: innobase_start_or_create_for_mysql():
Invoke os_get_os_version() at most once.
------------------------------------------------------------------------
r5450 | marko | 2009-06-30 08:02:20 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_file_close_no_error_handling(): Unused, remove.
------------------------------------------------------------------------
r5451 | marko | 2009-06-30 08:09:49 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: page_set_max_trx_id(): Make the code compile
with UNIV_HOTBACKUP.
------------------------------------------------------------------------
r5452 | marko | 2009-06-30 08:10:26 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: os_file_close_no_error_handling(): Restore,
as this function is used within InnoDB Hot Backup.
------------------------------------------------------------------------
r5453 | marko | 2009-06-30 08:14:01 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_process_set_priority_boost(): Unused, remove.
------------------------------------------------------------------------
r5454 | marko | 2009-06-30 08:42:52 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: Replace a non-ASCII character
(ISO 8859-1 encoded U+00AD SOFT HYPHEN) with a cheap ASCII substitute.
------------------------------------------------------------------------
r5456 | inaam | 2009-06-30 14:21:09 -0400 (Tue, 30 Jun 2009) | 4 lines
branches/zip
Non functional change. s/Percona/Percona Inc./
------------------------------------------------------------------------
r5470 | vasil | 2009-07-02 09:12:36 -0400 (Thu, 02 Jul 2009) | 16 lines
branches/zip:
Use PAUSE instruction inside spinloop if it is available.
The patch was originally developed by Mikael Ronstrom <mikael@mysql.com>
and can be found here:
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2768
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2771
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2772
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2774
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2777
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2799
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2800
Approved by: Heikki (rb://137)
------------------------------------------------------------------------
r5481 | vasil | 2009-07-06 13:16:32 -0400 (Mon, 06 Jul 2009) | 4 lines
branches/zip:
Remove unnecessary quotes and simplify plug.in.
------------------------------------------------------------------------
r5482 | calvin | 2009-07-06 18:36:35 -0400 (Mon, 06 Jul 2009) | 5 lines
branches/zip: add COPYING files for Percona and Sun Micro.
1.0.4 contains patches based on contributions from Percona
and Sun Microsystems.
------------------------------------------------------------------------
r5483 | calvin | 2009-07-07 05:36:43 -0400 (Tue, 07 Jul 2009) | 3 lines
branches/zip: add IB_HAVE_PAUSE_INSTRUCTION to CMake.
Windows will support PAUSE instruction by default.
------------------------------------------------------------------------
r5484 | inaam | 2009-07-07 18:57:14 -0400 (Tue, 07 Jul 2009) | 13 lines
branches/zip rb://126
Based on contribution from Google Inc.
This patch introduces a new parameter innodb_io_capacity to control the
rate at which master threads performs various tasks. The default value
is 200 and higher values imply more aggressive flushing and ibuf merges
from within the master thread.
This patch also changes the ibuf merge from synchronous to asynchronous.
Another minor change is not to force the master thread to wait for a
log flush to complete every second.
Approved by: Heikki
------------------------------------------------------------------------
r5485 | inaam | 2009-07-07 19:00:49 -0400 (Tue, 07 Jul 2009) | 18 lines
branches/zip rb://138
The current implementation is to try to flush the neighbors of every
page that we flush. This patch makes the following distinction:
1) If the flush is from flush_list AND
2) If the flush is intended to move the oldest_modification LSN ahead
(this happens when a user thread sees little space in the log file and
attempts to flush pages from the buffer pool so that a checkpoint can
be made)
THEN
Do not try to flush the neighbors. Just focus on flushing dirty pages at
the end of flush_list
Approved by: Heikki
------------------------------------------------------------------------
r5486 | inaam | 2009-07-08 12:11:40 -0400 (Wed, 08 Jul 2009) | 29 lines
branches/zip rb://133
This patch introduces heuristics based flushing rate of dirty pages to
avoid IO bursts at checkpoint.
1) log_capacity / log_generated per second gives us number of seconds
in which ALL dirty pages need to be flushed. Based on this rough
assumption we can say that
n_dirty_pages / (log_capacity / log_generation_rate) = desired_flush_rate
2) We use weighted averages (hard coded to 20 seconds) of
log_generation_rate to avoid resonance.
3) From the desired_flush_rate we subtract the number of pages that have
been flushed due to LRU flushing. That gives us pages that we should
flush as part of flush_list cleanup. And that is the number (capped by
maximum io_capacity) that we try to flush from the master thread.
Knobs:
======
innodb_adaptive_flushing: boolean, global, dynamic, default TRUE.
Since this heuristic is very experimental and has the potential to
dramatically change the IO pattern I think it is a good idea to leave a
knob to turn it off.
Approved by: Heikki
------------------------------------------------------------------------
r5487 | calvin | 2009-07-08 12:42:28 -0400 (Wed, 08 Jul 2009) | 7 lines
branches/zip: fix PAUSE instruction patch on Windows
The original PAUSE instruction patch (r5470) does not
compile on Windows. Also, there is an elegant way of
doing it on Windows - YieldProcessor().
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r5489 | vasil | 2009-07-10 05:02:22 -0400 (Fri, 10 Jul 2009) | 9 lines
branches/zip:
Change the defaults for
innodb_sync_spin_loops: 20 -> 30
innodb_spin_wait_delay: 5 -> 6
This change was proposed by Sun/MySQL based on their performance testing,
see https://svn.innodb.com/innobase/Release_tasks_for_InnoDB_Plugin_V1.0.4
------------------------------------------------------------------------
r5490 | vasil | 2009-07-10 05:04:20 -0400 (Fri, 10 Jul 2009) | 4 lines
branches/zip:
Add ChangeLog entry for 5489.
------------------------------------------------------------------------
r5491 | calvin | 2009-07-10 12:19:17 -0400 (Fri, 10 Jul 2009) | 6 lines
branches/zip: add copyright info to files related to PAUSE
instruction patch, contributed by Sun Microsystems.
------------------------------------------------------------------------
r5492 | calvin | 2009-07-10 17:47:34 -0400 (Fri, 10 Jul 2009) | 5 lines
branches/zip: add ChangeLog entries for r5484-r5486.
------------------------------------------------------------------------
r5494 | vasil | 2009-07-13 03:37:35 -0400 (Mon, 13 Jul 2009) | 6 lines
branches/zip:
Restore the original value of innodb_sync_spin_loops at the end, previously
the test assumed that setting it to 20 will do this, but now the default is
30 and MTR's internal check failed.
------------------------------------------------------------------------
r5495 | inaam | 2009-07-13 11:48:45 -0400 (Mon, 13 Jul 2009) | 5 lines
branches/zip rb://138 (REVERT)
Revert the flush neighbors patch as it shows regression in
the benchmarks run by Michael.
------------------------------------------------------------------------
r5496 | inaam | 2009-07-13 14:04:57 -0400 (Mon, 13 Jul 2009) | 4 lines
branches/zip
Fixed warnings on windows where ulint != ib_uint64_t
------------------------------------------------------------------------
r5497 | calvin | 2009-07-13 15:01:00 -0400 (Mon, 13 Jul 2009) | 9 lines
branches/zip: fix run-time symbols clash on Solaris.
This patch is from Sergey Vojtovich of Sun Microsystems,
to fix run-time symbols clash on Solaris with older C++
compiler:
- when finding out a way to hide symbols, make decision basing
on compiler, not operating system.
- Sun Studio supports __hidden declaration specifier for this
purpose.
------------------------------------------------------------------------
r5498 | vasil | 2009-07-14 03:16:18 -0400 (Tue, 14 Jul 2009) | 92 lines
branches/zip: Merge r5341:5497 from branches/5.1, skipping:
c5419 because it is merge from branches/zip into branches/5.1
c5466 because the source code has been adjusted to match the MySQL
behavior and the innodb-autoinc test does not fail in branches/zip,
if c5466 is merged, then innodb-autoinc starts failing, Sunny suggested
not to merge c5466.
and resolving conflicts in c5410, c5440, c5488:
------------------------------------------------------------------------
r5410 | marko | 2009-06-24 22:26:34 +0300 (Wed, 24 Jun 2009) | 2 lines
Changed paths:
M /branches/5.1/include/trx0sys.ic
M /branches/5.1/trx/trx0purge.c
M /branches/5.1/trx/trx0sys.c
M /branches/5.1/trx/trx0undo.c
branches/5.1: Add missing #include "mtr0log.h" to avoid warnings
when compiling with -DUNIV_MUST_NOT_INLINE.
------------------------------------------------------------------------
r5419 | marko | 2009-06-25 16:11:57 +0300 (Thu, 25 Jun 2009) | 18 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb_bug42101-nonzero.result
M /branches/5.1/mysql-test/innodb_bug42101-nonzero.test
M /branches/5.1/mysql-test/innodb_bug42101.result
M /branches/5.1/mysql-test/innodb_bug42101.test
branches/5.1: Merge r5418 from branches/zip:
------------------------------------------------------------------------
r5418 | marko | 2009-06-25 15:55:52 +0300 (Thu, 25 Jun 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
M /branches/zip/mysql-test/innodb_bug42101.result
M /branches/zip/mysql-test/innodb_bug42101.test
branches/zip: Fix a race condition caused by
SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749)
When innodb_commit_concurrency is initially set nonzero,
DEFAULT would change it back to 0, triggering Bug #42101.
rb://139 approved by Heikki Tuuri.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5440 | vasil | 2009-06-30 13:04:29 +0300 (Tue, 30 Jun 2009) | 8 lines
Changed paths:
M /branches/5.1/fil/fil0fil.c
branches/5.1:
Fix Bug#45814 URL reference in InnoDB server errors needs adjusting to match documentation
by changing the URL from
http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting.html to
http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting-datadict.html
------------------------------------------------------------------------
r5466 | vasil | 2009-07-02 10:46:45 +0300 (Thu, 02 Jul 2009) | 6 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1:
Adjust the failing innodb-autoinc test to conform to the latest behavior
of the MySQL code. The idea and the comment in innodb-autoinc.test come
from Sunny.
------------------------------------------------------------------------
r5488 | vasil | 2009-07-09 19:16:44 +0300 (Thu, 09 Jul 2009) | 13 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug21704.result
A /branches/5.1/mysql-test/innodb_bug21704.test
branches/5.1:
Fix Bug#21704 Renaming column does not update FK definition
by checking whether a column that participates in a FK definition is being
renamed and denying the ALTER in this case.
The patch was originally developed by Davi Arnaut <Davi.Arnaut@Sun.COM>:
http://lists.mysql.com/commits/77714
and was later adjusted to conform to InnoDB coding style by me (Vasil),
I also added some more comments and moved the bug specific mysql-test to
a separate file to make it more manageable and flexible.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5499 | calvin | 2009-07-14 12:55:10 -0400 (Tue, 14 Jul 2009) | 3 lines
branches/zip: add a missing file in Makefile.am
This change was suggested by MySQL.
------------------------------------------------------------------------
r5500 | calvin | 2009-07-14 13:03:26 -0400 (Tue, 14 Jul 2009) | 3 lines
branches/zip: minor change
Remove an extra "with".
------------------------------------------------------------------------
r5501 | vasil | 2009-07-14 13:58:15 -0400 (Tue, 14 Jul 2009) | 5 lines
branches/zip:
Add @ZLIB_INCLUDES@ so that the InnoDB Plugin picks up the same zlib.h
header file that is eventually used by mysqld.
------------------------------------------------------------------------
r5502 | vasil | 2009-07-14 13:59:59 -0400 (Tue, 14 Jul 2009) | 4 lines
branches/zip:
Add include/ut0auxconf.h to noinst_HEADERS
------------------------------------------------------------------------
r5503 | vasil | 2009-07-14 14:16:11 -0400 (Tue, 14 Jul 2009) | 8 lines
branches/zip:
Non-functional change:
put files in noinst_HEADERS and libinnobase_a_SOURCES one per line and sort
alphabetically, so it is easier to find if a file is there or not and
also diffs show exactly the added or removed file instead of surrounding
lines too.
------------------------------------------------------------------------
r5504 | calvin | 2009-07-15 04:58:44 -0400 (Wed, 15 Jul 2009) | 6 lines
branches/zip: fix compile errors on Win64
Both srv_read_ahead_factor and srv_io_capacity should
be defined as ulong.
Approved by: Sunny
------------------------------------------------------------------------
r5508 | calvin | 2009-07-16 09:40:47 -0400 (Thu, 16 Jul 2009) | 16 lines
branches/zip: Support inlining of functions and prefetch with
Sun Studio
Those changes are contributed by Sun/MySQL. Two sets of changes
in this patch when Sun Studio is used:
- Explicit inlining of functions
- Prefetch Support
This patch has been tested by Sunny with the plugin statically
built in. Since we've never built the plugin as a dynamically
loaded module on Solaris, it is a separate task to change
plug.in.
rb://142
Approved by: Heikki
------------------------------------------------------------------------
r5509 | calvin | 2009-07-16 09:45:28 -0400 (Thu, 16 Jul 2009) | 2 lines
branches/zip: add ChangeLog entry for r5508.
------------------------------------------------------------------------
r5512 | sunny | 2009-07-19 19:52:48 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Remove unused extern ref to timed_mutexes.
------------------------------------------------------------------------
r5513 | sunny | 2009-07-19 19:58:43 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Undo r5512
------------------------------------------------------------------------
r5514 | sunny | 2009-07-19 20:08:49 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Only use my_bool when UNIV_HOTBACKUP is not defined.
------------------------------------------------------------------------
r5515 | sunny | 2009-07-20 03:29:14 -0400 (Mon, 20 Jul 2009) | 2 lines
branches/zip: The dict_table_t::autoinc_mutex field is not used in HotBackup.
------------------------------------------------------------------------
r5516 | sunny | 2009-07-20 03:46:05 -0400 (Mon, 20 Jul 2009) | 4 lines
branches/zip: Make this file usable from within HotBackup. A new file has
been introduced called hb_univ.i. This file should have all the HotBackup
specific configuration.
------------------------------------------------------------------------
r5517 | sunny | 2009-07-20 03:55:11 -0400 (Mon, 20 Jul 2009) | 2 lines
Add /* UNIV_HOTBACK */
------------------------------------------------------------------------
r5519 | vasil | 2009-07-20 04:45:18 -0400 (Mon, 20 Jul 2009) | 31 lines
branches/zip: Merge r5497:5518 from branches/5.1:
------------------------------------------------------------------------
r5518 | vasil | 2009-07-20 11:29:47 +0300 (Mon, 20 Jul 2009) | 22 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Merge a change from MySQL:
------------------------------------------------------------
revno: 2874.2.1
committer: Anurag Shekhar <anurag.shekhar@sun.com>
branch nick: mysql-5.1-bugteam-windows-warning
timestamp: Wed 2009-05-13 15:41:24 +0530
message:
Bug #39802 On Windows, 32-bit time_t should be enforced
This patch fixes compilation warning, "conversion from 'time_t' to 'ulong',
possible loss of data".
The fix is to typecast time_t to ulong before assigning it to ulong.
Backported this from 6.0-bugteam tree.
modified:
storage/archive/ha_archive.cc
storage/federated/ha_federated.cc
storage/innobase/handler/ha_innodb.cc
storage/myisam/ha_myisam.cc
------------------------------------------------------------------------
------------------------------------------------------------------------
r5520 | vasil | 2009-07-20 04:51:47 -0400 (Mon, 20 Jul 2009) | 4 lines
branches/zip:
Add ChangeLog entries for r5498 and r5519.
------------------------------------------------------------------------
r5524 | inaam | 2009-07-20 12:23:15 -0400 (Mon, 20 Jul 2009) | 9 lines
branches/zip
Change the read ahead parameter name to innodb_read_ahead_threshold.
Change the meaning of this parameter to signify the number of pages
that must be sequentially accessed for InnoDB to trigger a readahead
request.
Suggested by: Ken
------------------------------------------------------------------------
2009-07-21 02:09:29 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
acquire();
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (m_n_reserved != m_slots.size()) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
release();
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2009-01-13 19:20:49 +01:00
|
|
|
if (!srv_use_native_aio) {
|
2016-08-12 10:17:45 +02:00
|
|
|
/* If the handler threads are suspended,
|
|
|
|
wake them so that we get more slots */
|
2005-10-27 09:29:40 +02:00
|
|
|
|
|
|
|
os_aio_simulated_wake_handler_threads();
|
|
|
|
}
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
os_event_wait(m_not_full);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ulint counter = 0;
|
|
|
|
Slot* slot = NULL;
|
|
|
|
|
2009-07-31 16:30:26 +02:00
|
|
|
/* We start our search for an available slot from our preferred
|
|
|
|
local segment and do a full scan of the array. We are
|
|
|
|
guaranteed to find a slot in full scan. */
|
2016-08-12 10:17:45 +02:00
|
|
|
for (ulint i = local_seg * slots_per_seg;
|
|
|
|
counter < m_slots.size();
|
|
|
|
++i, ++counter) {
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
i %= m_slots.size();
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
slot = at(i);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (slot->is_reserved == false) {
|
|
|
|
break;
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-01-13 19:20:49 +01:00
|
|
|
/* We MUST always be able to get hold of a reserved slot. */
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_a(counter < m_slots.size());
|
|
|
|
|
|
|
|
ut_a(slot->is_reserved == false);
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
++m_n_reserved;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (m_n_reserved == 1) {
|
|
|
|
os_event_reset(m_is_empty);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (m_n_reserved == m_slots.size()) {
|
|
|
|
os_event_reset(m_not_full);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
slot->is_reserved = true;
|
2013-03-25 23:03:13 +01:00
|
|
|
slot->reservation_time = ut_time();
|
2016-08-12 10:17:45 +02:00
|
|
|
slot->m1 = m1;
|
|
|
|
slot->m2 = m2;
|
2005-10-27 09:29:40 +02:00
|
|
|
slot->file = file;
|
|
|
|
slot->name = name;
|
2016-08-12 10:17:45 +02:00
|
|
|
#ifdef _WIN32
|
|
|
|
slot->len = static_cast<DWORD>(len);
|
|
|
|
#else
|
|
|
|
slot->len = static_cast<ulint>(len);
|
|
|
|
#endif /* _WIN32 */
|
2005-10-27 09:29:40 +02:00
|
|
|
slot->type = type;
|
2016-08-12 10:17:45 +02:00
|
|
|
slot->buf = static_cast<byte*>(buf);
|
|
|
|
slot->ptr = slot->buf;
|
2005-10-27 09:29:40 +02:00
|
|
|
slot->offset = offset;
|
2016-08-12 10:17:45 +02:00
|
|
|
slot->err = DB_SUCCESS;
|
|
|
|
slot->original_len = static_cast<uint32>(len);
|
|
|
|
slot->io_already_done = false;
|
2015-01-09 11:30:59 +01:00
|
|
|
slot->buf = static_cast<byte*>(buf);
|
|
|
|
|
2006-02-23 20:25:29 +01:00
|
|
|
#ifdef WIN_ASYNC_IO
|
2016-08-12 10:17:45 +02:00
|
|
|
{
|
|
|
|
OVERLAPPED* control;
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
control = &slot->control;
|
|
|
|
control->Offset = (DWORD) offset & 0xFFFFFFFF;
|
|
|
|
control->OffsetHigh = (DWORD) (offset >> 32);
|
|
|
|
}
|
2009-01-13 19:20:49 +01:00
|
|
|
#elif defined(LINUX_NATIVE_AIO)
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* If we are not using native AIO skip this part. */
|
2009-01-13 19:20:49 +01:00
|
|
|
if (srv_use_native_aio) {
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
off_t aio_offset;
|
|
|
|
|
|
|
|
/* Check if we are dealing with 64 bit arch.
|
|
|
|
If not then make sure that offset fits in 32 bits. */
|
|
|
|
aio_offset = (off_t) offset;
|
|
|
|
|
|
|
|
ut_a(sizeof(aio_offset) >= sizeof(offset)
|
|
|
|
|| ((os_offset_t) aio_offset) == offset);
|
|
|
|
|
|
|
|
struct iocb* iocb = &slot->control;
|
|
|
|
|
|
|
|
if (type.is_read()) {
|
|
|
|
|
|
|
|
io_prep_pread(
|
|
|
|
iocb, file, slot->ptr, slot->len, aio_offset);
|
|
|
|
} else {
|
|
|
|
ut_ad(type.is_write());
|
|
|
|
|
|
|
|
io_prep_pwrite(
|
|
|
|
iocb, file, slot->ptr, slot->len, aio_offset);
|
|
|
|
}
|
|
|
|
|
|
|
|
iocb->data = slot;
|
|
|
|
|
2009-01-13 19:20:49 +01:00
|
|
|
slot->n_bytes = 0;
|
|
|
|
slot->ret = 0;
|
|
|
|
}
|
2016-08-12 10:17:45 +02:00
|
|
|
#endif /* LINUX_NATIVE_AIO */
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
release();
|
|
|
|
|
|
|
|
return(slot);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Wakes up a simulated aio i/o-handler thread if it has something to do.
|
|
|
|
@param[in] global_segment The number of the segment in the AIO arrays */
|
2005-10-27 09:29:40 +02:00
|
|
|
void
|
2016-08-12 10:17:45 +02:00
|
|
|
AIO::wake_simulated_handler_thread(ulint global_segment)
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
2009-01-13 19:20:49 +01:00
|
|
|
ut_ad(!srv_use_native_aio);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
AIO* array;
|
|
|
|
ulint segment = get_array_and_local_segment(&array, global_segment);
|
|
|
|
|
|
|
|
array->wake_simulated_handler_thread(global_segment, segment);
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Wakes up a simulated AIO I/O-handler thread if it has something to do
|
|
|
|
for a local segment in the AIO array.
|
|
|
|
@param[in] global_segment The number of the segment in the AIO arrays
|
|
|
|
@param[in] segment The local segment in the AIO array */
|
|
|
|
void
|
|
|
|
AIO::wake_simulated_handler_thread(ulint global_segment, ulint segment)
|
|
|
|
{
|
|
|
|
ut_ad(!srv_use_native_aio);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ulint n = slots_per_segment();
|
|
|
|
ulint offset = segment * n;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
|
|
|
/* Look through n slots after the segment * n'th slot */
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
acquire();
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
const Slot* slot = at(offset);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
for (ulint i = 0; i < n; ++i, ++slot) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (slot->is_reserved) {
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2005-10-27 09:29:40 +02:00
|
|
|
/* Found an i/o request */
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
release();
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
os_event_t event;
|
|
|
|
|
|
|
|
event = os_aio_segment_wait_events[global_segment];
|
|
|
|
|
|
|
|
os_event_set(event);
|
|
|
|
|
|
|
|
return;
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
release();
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Wakes up simulated aio i/o-handler threads if they have something to do. */
|
2005-10-27 09:29:40 +02:00
|
|
|
void
|
2016-08-12 10:17:45 +02:00
|
|
|
os_aio_simulated_wake_handler_threads()
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
2009-01-13 19:20:49 +01:00
|
|
|
if (srv_use_native_aio) {
|
2005-10-27 09:29:40 +02:00
|
|
|
/* We do not use simulated aio: do nothing */
|
|
|
|
|
|
|
|
return;
|
2006-02-23 20:25:29 +01:00
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
os_aio_recommend_sleep_for_read_threads = false;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
for (ulint i = 0; i < os_aio_n_segments; i++) {
|
2016-08-12 10:17:45 +02:00
|
|
|
AIO::wake_simulated_handler_thread(i);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Select the IO slot array
|
|
|
|
@param[in] type Type of IO, READ or WRITE
|
|
|
|
@param[in] read_only true if running in read-only mode
|
|
|
|
@param[in] mode IO mode
|
|
|
|
@return slot array or NULL if invalid mode specified */
|
|
|
|
AIO*
|
|
|
|
AIO::select_slot_array(IORequest& type, bool read_only, ulint mode)
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
2016-08-12 10:17:45 +02:00
|
|
|
AIO* array;
|
branches/innodb+: Merged revisions 5525:5971 from branches/zip
------------------------------------------------------------------------
r5971 | marko | 2009-09-23 09:03:51 -0400 (Wed, 23 Sep 2009) | 2 lines
branches/zip: os_file_pwrite(): Make the code compile in InnoDB Hot Backup
when the pwrite system call is not available.
------------------------------------------------------------------------
r5956 | calvin | 2009-09-22 19:30:10 -0400 (Tue, 22 Sep 2009) | 4 lines
branches/zip: remove handler0vars.h from Makefile.am
Left over from r5950.
------------------------------------------------------------------------
r5951 | calvin | 2009-09-22 11:17:01 -0400 (Tue, 22 Sep 2009) | 4 lines
branches/zip: adjust CMake file to work with old versions of MySQL
Tested with MySQL 5.1.38 and 5.1.30.
------------------------------------------------------------------------
r5950 | calvin | 2009-09-22 02:42:46 -0400 (Tue, 22 Sep 2009) | 17 lines
branches/zip: adjust Windows loading method for 5.1.38
Starting at 5.1.38, MySQL server exports symbols needed
for dynamic plugin on Windows. There is no need for
Windows specific loading. Also, the CMake files are
simplified in 5.1.38.
When WITH_INNOBASE_STORAGE_ENGINE is specified during
configuration (win\configure.js), InnoDB is built as
a static library. Otherwise, a dynamic InnoDB will be
built (ha_innodb.dll).
CMakeLists.txt requires minor changes in order to work
with MySQL prior to 5.1.38. The changes will be in a
separate patch.
This patch addresses Mantis issue#286.
------------------------------------------------------------------------
r5945 | calvin | 2009-09-21 10:53:22 -0400 (Mon, 21 Sep 2009) | 4 lines
branches/zip: fix a type in r5935
Should be innodb_open_files, spotted by Michael.
------------------------------------------------------------------------
r5940 | vasil | 2009-09-21 01:26:04 -0400 (Mon, 21 Sep 2009) | 4 lines
branches/zip:
Add ChangeLog entries for c5938.
------------------------------------------------------------------------
r5938 | calvin | 2009-09-19 03:14:25 -0400 (Sat, 19 Sep 2009) | 41 lines
branches/zip: Merge revisions 2584:2956 from branches/6.0,
except c2932.
Bug#37232 and bug#31183 were fixed in the 6.0 branch only.
They should be fixed in the plugin too, specially MySQL 6.0
is discontinued at this point.
------------------------------------------------------------------------
r2604 | inaam | 2008-08-21 09:37:06 -0500 (Thu, 21 Aug 2008) | 8 lines
branches/6.0 bug#37232
Relax locking behaviour for REPLACE INTO t SELECT ... FROM t1.
Now SELECT on t1 is performed as a consistent read when the isolation
level is set to READ COMMITTED.
Reviewed by: Heikki
------------------------------------------------------------------------
r2605 | inaam | 2008-08-21 09:59:33 -0500 (Thu, 21 Aug 2008) | 7 lines
branches/6.0
Added a comment to clarify why distinct calls to read MySQL binary
log file name and log position do not entail any race condition.
Suggested by: Heikki
------------------------------------------------------------------------
r2956 | inaam | 2008-11-04 04:47:30 -0600 (Tue, 04 Nov 2008) | 11 lines
branches/6.0 bug#31183
If the system tablespace runs out of space because 'autoextend' is
not specified with innodb_data_file_path there was no error message
printed to the error log. The client would get 'table full' error.
This patch prints an appropriate error message to the error log.
rb://43
Approved by: Marko
------------------------------------------------------------------------
------------------------------------------------------------------------
r5935 | calvin | 2009-09-18 17:08:02 -0400 (Fri, 18 Sep 2009) | 6 lines
branches/zip: fix bug#44338; minor non-functional changes
Bug#44338 innodb has message about non-existing option
innodb_max_files_open. Change the option to innodb_open_files.
The fix was committed into 6.0 branch.
------------------------------------------------------------------------
r5934 | vasil | 2009-09-18 13:06:46 -0400 (Fri, 18 Sep 2009) | 4 lines
branches/zip:
Fix typo.
------------------------------------------------------------------------
r5924 | vasil | 2009-09-18 00:59:30 -0400 (Fri, 18 Sep 2009) | 4 lines
branches/zip:
White space and formatting cleanup in the ChangeLog
------------------------------------------------------------------------
r5922 | marko | 2009-09-17 02:32:08 -0400 (Thu, 17 Sep 2009) | 4 lines
branches/zip: innodb-zip.test: Make the test work with zlib 1.2.3.3.
Apparently, the definition of compressBound() has slightly changed.
This has been filed as Mantis Issue #345.
------------------------------------------------------------------------
r5920 | vasil | 2009-09-16 14:47:22 -0400 (Wed, 16 Sep 2009) | 4 lines
branches/zip:
Add ChangeLog entries for r5916.
------------------------------------------------------------------------
r5919 | vasil | 2009-09-16 14:37:13 -0400 (Wed, 16 Sep 2009) | 4 lines
branches/zip:
Whitespace cleanup in the ChangeLog.
------------------------------------------------------------------------
r5917 | marko | 2009-09-16 05:56:23 -0400 (Wed, 16 Sep 2009) | 1 line
branches/zip: innobase_get_cset_width(): Cache the value of current_thd.
------------------------------------------------------------------------
r5916 | marko | 2009-09-16 05:54:43 -0400 (Wed, 16 Sep 2009) | 128 lines
branches/zip: Merge revisions 5622:5912 from branches/5.1, except r5700
(changes to CMakeLists.txt)
------------------------------------------------------------------------
r5622 | vasil | 2009-08-03 15:27:00 +0300 (Mon, 03 Aug 2009) | 20 lines
Changed paths:
M /branches/5.1/Makefile.am
branches/5.1:
Merge a change from MySQL:
------------------------------------------------------------
revno: 2988
committer: Satya B <satya.bn@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Wed 2009-07-01 11:06:05 +0530
message:
Fix build failure after applying Innodb snapshot 5.1-ss5282
After applying Innodb snapshot 5.1-ss5282, build was broken
because of missing header file.
Adding the header file to Makefile.am after informing the
innodb developers.
modified:
storage/innobase/Makefile.am
------------------------------------------------------------------------
r5740 | jyang | 2009-09-03 06:33:47 +0300 (Thu, 03 Sep 2009) | 5 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/db0err.h
A /branches/5.1/mysql-test/innodb_bug46000.result
A /branches/5.1/mysql-test/innodb_bug46000.test
branches/5.1: Disallow creating index with the name of
"GEN_CLUST_INDEX" which is reserved for the default system
primary index. (Bug #46000) rb://149 approved by Sunny Bains.
------------------------------------------------------------------------
r5741 | jyang | 2009-09-03 07:16:01 +0300 (Thu, 03 Sep 2009) | 5 lines
Changed paths:
M /branches/5.1/dict/dict0dict.c
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug44369.result
A /branches/5.1/mysql-test/innodb_bug44369.test
M /branches/5.1/row/row0mysql.c
branches/5.1: Block creating table with column name conflicting
with Innodb reserved key words. (Bug #44369) rb://151 approved
by Sunny Bains.
------------------------------------------------------------------------
r5757 | jyang | 2009-09-04 04:26:13 +0300 (Fri, 04 Sep 2009) | 3 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/db0err.h
D /branches/5.1/mysql-test/innodb_bug46000.result
D /branches/5.1/mysql-test/innodb_bug46000.test
branches/5.1: Revert change in 5740. Making the fix in a subsequent
check in.
------------------------------------------------------------------------
r5760 | jyang | 2009-09-04 07:07:34 +0300 (Fri, 04 Sep 2009) | 3 lines
Changed paths:
M /branches/5.1/dict/dict0dict.c
M /branches/5.1/handler/ha_innodb.cc
D /branches/5.1/mysql-test/innodb_bug44369.result
D /branches/5.1/mysql-test/innodb_bug44369.test
M /branches/5.1/row/row0mysql.c
branches/5.1: This is to revert change 5741. A return status for
create_table_def() needs to be fixed.
------------------------------------------------------------------------
r5797 | calvin | 2009-09-09 18:26:29 +0300 (Wed, 09 Sep 2009) | 3 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: merge change from 5.1.38
HA_ERR_TOO_MANY_CONCURRENT_TRXS is added in 5.1.38.
------------------------------------------------------------------------
r5799 | calvin | 2009-09-09 20:47:31 +0300 (Wed, 09 Sep 2009) | 10 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: fix bug#46256
Allow tables to be dropped even if the collation is not found,
but issue a warning.
Could not find an easy way to add mysql-test since it requires
changes to charsets and restarting the server. Tests were
executed manually.
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r5805 | vasil | 2009-09-10 08:41:48 +0300 (Thu, 10 Sep 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Fix a compilation warning caused by c5799:
handler/ha_innodb.cc: In function 'void innobase_get_cset_width(ulint, ulint*, ulint*)':
handler/ha_innodb.cc:830: warning: format '%d' expects type 'int', but argument 2 has type 'ulint'
------------------------------------------------------------------------
r5834 | jyang | 2009-09-11 00:43:05 +0300 (Fri, 11 Sep 2009) | 5 lines
Changed paths:
M /branches/5.1/dict/dict0dict.c
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug44369.result
A /branches/5.1/mysql-test/innodb_bug44369.test
M /branches/5.1/row/row0mysql.c
branches/5.1: Block creating table with column name conflicting
with Innodb reserved key words. (Bug #44369) rb://151 approved
by Sunny Bains.
------------------------------------------------------------------------
r5895 | jyang | 2009-09-15 03:39:21 +0300 (Tue, 15 Sep 2009) | 5 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug46000.result
A /branches/5.1/mysql-test/innodb_bug46000.test
branches/5.1: Disallow creating index with the name of
"GEN_CLUST_INDEX" which is reserved for the default system
primary index. (Bug #46000) rb://149 approved by Marko Makela.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5910 | marko | 2009-09-16 04:07:21 -0400 (Wed, 16 Sep 2009) | 9 lines
branches/zip: Introduce UNIV_LOG_LSN_DEBUG and MLOG_LSN for redo log
diagnostics. This was written in order to better track down
Issue #313 in InnoDB Hot Backup.
MLOG_LSN: A new redo log entry type, for recording the current log
sequence number (LSN). This will be checked in an assertion in
recv_parse_log_rec().
rb://161, discussed with Sunny and Vasil.
------------------------------------------------------------------------
r5899 | marko | 2009-09-15 07:26:01 -0400 (Tue, 15 Sep 2009) | 4 lines
branches/zip: ut0ut.h: Do not #include "os0sync.h" #ifdef UNIV_HOTBACKUP.
Since r5872, the InnoDB Hot Backup build was broken.
Fix it by not defining any thread synchronization primitives in ut0ut.h.
InnoDB Hot Backup is a single-threaded program.
------------------------------------------------------------------------
r5898 | marko | 2009-09-15 06:18:50 -0400 (Tue, 15 Sep 2009) | 2 lines
branches/zip: Add */.dirstamp to svn:ignore,
for https://svn.innodb.com/svn/hotbackup/branches/3.5
------------------------------------------------------------------------
r5897 | marko | 2009-09-15 04:29:00 -0400 (Tue, 15 Sep 2009) | 8 lines
branches/zip: Avoid bogus messages about latching order violations when
UNIV_SYNC_DEBUG is defined.
sync_thread_levels_g(): Add the parameter "warn". Do not print
anything unless it is set.
sync_thread_add_level(): Pass warn=TRUE to sync_thread_levels_g()
when the check is within an assertion; FALSE if it is not.
------------------------------------------------------------------------
r5893 | inaam | 2009-09-14 11:20:48 -0400 (Mon, 14 Sep 2009) | 10 lines
branches/zip rb://159
In case of pages that are not made young the counter is incremented
only when the page in question is 'old'. In case of pages that are
made young the counter is incremented in case of all pages. For apple
to apple comparison this patch changes the 'young-making' counter to
consider only 'old' blocks.
Approved by: Marko
------------------------------------------------------------------------
r5889 | vasil | 2009-09-14 05:17:18 -0400 (Mon, 14 Sep 2009) | 5 lines
branches/zip:
Add missing return statement in the test program that could have
caused a warning.
------------------------------------------------------------------------
r5888 | vasil | 2009-09-14 04:38:45 -0400 (Mon, 14 Sep 2009) | 40 lines
branches/zip:
Back-merge c5880 and c5881 from branches/embedded-1.0:
------------------------------------------------------------------------
r5880 | vasil | 2009-09-12 17:28:44 +0300 (Sat, 12 Sep 2009) | 18 lines
Changed paths:
M /branches/embedded-1.0/configure.in
M /branches/embedded-1.0/include/os0sync.h
M /branches/embedded-1.0/srv/srv0start.c
branches/embedded-1.0:
Clean up and simplify the code that surrounds the atomic ops:
* Simplify the code that prints what atomics are used:
Instead of repeating the same conditions on which each atomics are used
use just one printf that prints a variable defined by the code which
chooses what atomics to use.
* In os0sync.h pick up each atomic variant only if it has been selected
by autoconf (based on IB_ATOMIC_MODE_* macros). Define the startup message
to be printed.
* In configure.in: check what user has chosen and if he has chosen
something that is not available, emit an error. If nothing has been chosen
explicitly by the user, auto select an option according to the described
logic in configure.in.
------------------------------------------------------------------------
r5881 | vasil | 2009-09-12 20:08:27 +0300 (Sat, 12 Sep 2009) | 4 lines
Changed paths:
M /branches/embedded-1.0/configure.in
branches/embedded-1.0:
Fix syntax error in test program.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5875 | vasil | 2009-09-12 08:11:25 -0400 (Sat, 12 Sep 2009) | 4 lines
branches/zip:
Remove unnecessary macro.
------------------------------------------------------------------------
r5872 | vasil | 2009-09-12 05:35:17 -0400 (Sat, 12 Sep 2009) | 5 lines
branches/zip:
Explicitly include os0sync.h to the places where HAVE_ATOMIC_BUILTINS and
INNODB_RW_LOCKS_USE_ATOMICS are used to avoid potential problems.
------------------------------------------------------------------------
r5871 | vasil | 2009-09-12 05:25:44 -0400 (Sat, 12 Sep 2009) | 6 lines
branches/zip:
Rename HAVE_SOLARIS_ATOMICS to HAVE_IB_SOLARIS_ATOMICS and
IB_HAVE_PAUSE_INSTRUCTION to HAVE_IB_PAUSE_INSTRUCTION so they
all follow the same HAVE_IB_* convention.
------------------------------------------------------------------------
r5870 | vasil | 2009-09-12 05:13:44 -0400 (Sat, 12 Sep 2009) | 7 lines
branches/zip:
Define HAVE_ATOMIC_BUILTINS and INNODB_RW_LOCKS_USE_ATOMICS in os0sync.h
instead of in univ.i. The code expects os_*() macros to be present if
HAVE_ATOMIC_BUILTINS and INNODB_RW_LOCKS_USE_ATOMICS are defined. So define
them next to defining the os_*() macros.
------------------------------------------------------------------------
r5869 | vasil | 2009-09-12 04:33:11 -0400 (Sat, 12 Sep 2009) | 15 lines
branches/zip:
Include ut0auxconf.h only if none of the macros it would define is defined.
The check when to include this header was outdated from the time when there
was only one macro involved.
Move the atomics checks that are in univ.i outside of
#if windows ... #else ... #endif
This simplifies the code and removes some duplicates like defining
HAVE_ATOMIC_BUILTINS if HAVE_WINDOWS_ATOMICS is defined in both branches.
Do not define the same macro HAVE_ATOMIC_PTHREAD_T for different events.
Instead define HAVE_IB_ATOMIC_PTHREAD_T_GCC and
HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS.
------------------------------------------------------------------------
r5868 | vasil | 2009-09-12 04:01:17 -0400 (Sat, 12 Sep 2009) | 6 lines
branches/zip:
Move the check whether to include ut0auxconf.h before everything because
we are now even checking for GCC atomics, we relied on MySQL to define
this macro before.
------------------------------------------------------------------------
r5867 | vasil | 2009-09-12 03:43:45 -0400 (Sat, 12 Sep 2009) | 4 lines
branches/zip:
Update comment to reflect reality.
------------------------------------------------------------------------
r5866 | vasil | 2009-09-12 03:30:08 -0400 (Sat, 12 Sep 2009) | 5 lines
branches/zip:
Add the check for GCC atomics to ut0auxconf* (copied from plug.in) because
we no longer rely on MySQL's HAVE_GCC_ATOMIC_BUILTINS.
------------------------------------------------------------------------
r5865 | vasil | 2009-09-12 03:26:03 -0400 (Sat, 12 Sep 2009) | 10 lines
branches/zip:
Simplify the compile time checks by splittig them into 5 independent checks:
* Whether GCC atomics are available
* Whether pthread_t can be used by GCC atomics
* Whether Solaris libc atomics are available
* Whether pthread_t can be used by Solaris libs atomics
* Checking the size of pthread_t
------------------------------------------------------------------------
r5864 | vasil | 2009-09-12 03:22:55 -0400 (Sat, 12 Sep 2009) | 4 lines
branches/zip:
Include string.h which is needed for memset().
------------------------------------------------------------------------
r5863 | vasil | 2009-09-12 03:07:08 -0400 (Sat, 12 Sep 2009) | 10 lines
branches/zip:
Check that pthread_t can indeed be passed to Solaris atomic functions, instead
of assuming that it can be passed if 0 can be assigned to it. It could be that:
* 0 can be assigned, but pthread_t cannot be passed and
* 0 cannot be assigned but pthread_t can be passed
Better to check what we are interested in, not something else and make
assumptions.
------------------------------------------------------------------------
r5858 | vasil | 2009-09-11 13:46:47 -0400 (Fri, 11 Sep 2009) | 4 lines
branches/zip:
Fix the indentation of the closing bracket.
------------------------------------------------------------------------
r5826 | marko | 2009-09-10 07:29:46 -0400 (Thu, 10 Sep 2009) | 12 lines
branches/zip: Roll back recovered dictionary transactions before
dropping incomplete indexes (Issue #337).
trx_rollback_or_clean_recovered(ibool all): New function, split from
trx_rollback_or_clean_all_recovered(). all==FALSE will only roll back
dictionary transactions.
recv_recovery_from_checkpoint_finish(): Call
trx_rollback_or_clean_recovered(FALSE) before
row_merge_drop_temp_indexes().
rb://158 approved by Sunny Bains
------------------------------------------------------------------------
r5825 | marko | 2009-09-10 06:47:09 -0400 (Thu, 10 Sep 2009) | 20 lines
branches/zip: Reduce mutex contention that was introduced when
addressing Bug #45015 (Issue #316), in r5703.
buf_page_set_accessed_make_young(): New auxiliary function, called by
buf_page_get_zip(), buf_page_get_gen(),
buf_page_optimistic_get_func(). Call ut_time_ms() outside of
buf_pool_mutex. Use cached access_time.
buf_page_set_accessed(): Add the parameter time_ms, so that
ut_time_ms() need not be called while holding buf_pool_mutex.
buf_page_optimistic_get_func(), buf_page_get_known_nowait(): Read
buf_page_t::access_time without holding buf_pool_mutex. This should be
OK, because the field is only used for heuristic purposes.
buf_page_peek_if_too_old(): If buf_pool->freed_page_clock == 0, return
FALSE, so that we will not waste time moving blocks in the LRU list in
the warm-up phase or when the workload fits in the buffer pool.
rb://156 approved by Sunny Bains
------------------------------------------------------------------------
r5822 | marko | 2009-09-10 06:10:20 -0400 (Thu, 10 Sep 2009) | 1 line
branches/zip: buf_page_release(): De-stutter the function comment.
------------------------------------------------------------------------
r5804 | marko | 2009-09-10 01:29:31 -0400 (Thu, 10 Sep 2009) | 1 line
branches/zip: trx_cleanup_at_db_startup(): Fix a typo in comment.
------------------------------------------------------------------------
r5798 | calvin | 2009-09-09 11:28:10 -0400 (Wed, 09 Sep 2009) | 5 lines
branches/zip:
HA_ERR_TOO_MANY_CONCURRENT_TRXS is added in 5.1.38.
But the plugin should still work with previous versions
of MySQL.
------------------------------------------------------------------------
r5792 | vasil | 2009-09-09 09:35:58 -0400 (Wed, 09 Sep 2009) | 32 lines
branches/zip:
Fix a bug in manipulating the variable innodb_old_blocks_pct:
for any value assigned it got that value -1, except for 75. When
assigned 75, it got 75.
mysql> set global innodb_old_blocks_pct=15;
Query OK, 0 rows affected (0.00 sec)
mysql> show variables like 'innodb_old_blocks_pct';
+-----------------------+-------+
| Variable_name | Value |
+-----------------------+-------+
| innodb_old_blocks_pct | 14 |
+-----------------------+-------+
1 row in set (0.00 sec)
mysql> set global innodb_old_blocks_pct=75;
Query OK, 0 rows affected (0.00 sec)
mysql> show variables like 'innodb_old_blocks_pct';
+-----------------------+-------+
| Variable_name | Value |
+-----------------------+-------+
| innodb_old_blocks_pct | 75 |
+-----------------------+-------+
After the fix it gets exactly what was assigned.
Approved by: Marko (via IM)
------------------------------------------------------------------------
r5783 | marko | 2009-09-09 03:25:00 -0400 (Wed, 09 Sep 2009) | 1 line
branches/zip: buf_page_is_accessed(): Correct the function comment.
------------------------------------------------------------------------
r5782 | marko | 2009-09-09 03:00:59 -0400 (Wed, 09 Sep 2009) | 2 lines
branches/zip: buf_page_peek_if_too_old(): Silence a compiler warning
that was introduced in r5779 on 32-bit systems.
------------------------------------------------------------------------
r5780 | marko | 2009-09-09 02:50:50 -0400 (Wed, 09 Sep 2009) | 1 line
branches/zip: ut_time_ms(): Return ulint, not uint.
------------------------------------------------------------------------
r5779 | marko | 2009-09-09 02:17:19 -0400 (Wed, 09 Sep 2009) | 2 lines
branches/zip: buf_page_peek_if_too_old(): Make the bitmasking work when
buf_pool->freed_page_clock is wider than 32 bits.
------------------------------------------------------------------------
r5777 | marko | 2009-09-08 11:50:25 -0400 (Tue, 08 Sep 2009) | 2 lines
branches/zip: Remove BUF_LRU_INITIAL_RATIO, which should have been removed
together with buf_LRU_get_recent_limit().
------------------------------------------------------------------------
r5775 | calvin | 2009-09-07 17:15:05 -0400 (Mon, 07 Sep 2009) | 13 lines
branches/zip: Build InnoDB on Windows with UNIV_HOTBACKUP
The changes are non-functional changes for normal InnoDB,
but needed for building the Hot Backup on Windows (with
UNIV_HOTBACKUP defined).
- Define os_aio_use_native_aio for HB.
- Do not acquire seek mutexes for backup since HB is single threaded.
- Do not use srv_flush_log_at_trx_commit for HB build
rb://155
Approved by: Marko
------------------------------------------------------------------------
r5752 | marko | 2009-09-03 10:55:51 -0400 (Thu, 03 Sep 2009) | 10 lines
branches/zip: recv_recover_page_func(): Write the log sequence number
to the compressed page, if there is one. Previously, the function only
wrote the LSN to the uncompressed page.
It is not clear why recv_recover_page_func() is updating FIL_PAGE_LSN
in the buffer pool. The log sequence number will be stamped on the
page when it is flushed to disk, in buf_flush_init_for_writing().
I noticed this inconsistency when analyzing Issue #313, but this patch
does not fix it. That is no surprise, since FIL_PAGE_LSN should only
matter on disk files, not in the buffer pool.
------------------------------------------------------------------------
r5751 | marko | 2009-09-03 10:36:15 -0400 (Thu, 03 Sep 2009) | 7 lines
branches/zip: row_merge(): Remove a bogus debug assertion
that was triggered when creating an index on an empty table.
row_merge_sort(): Add debug assertions and comments that justify
the loop termination condition.
The bogus assertion ut_ad(ihalf > 0) was reported by Michael.
------------------------------------------------------------------------
r5748 | marko | 2009-09-03 07:05:44 -0400 (Thu, 03 Sep 2009) | 1 line
branches/zip: MLOG_MULTI_REC_END: Correct the comment.
------------------------------------------------------------------------
r5747 | marko | 2009-09-03 06:46:38 -0400 (Thu, 03 Sep 2009) | 2 lines
branches/zip: recv_scan_log_recs(): Replace while with do...while,
because the termination condition will always hold on the first iteration.
------------------------------------------------------------------------
r5746 | marko | 2009-09-03 04:55:36 -0400 (Thu, 03 Sep 2009) | 2 lines
branches/zip: log_reserve_and_write_fast(): Do not cache the log_sys pointer
in a local variable.
------------------------------------------------------------------------
r5745 | marko | 2009-09-03 04:38:22 -0400 (Thu, 03 Sep 2009) | 2 lines
branches/zip: log_check_log_recs(): Enclose in #ifdef UNIV_LOG_DEBUG.
Add const qualifiers.
------------------------------------------------------------------------
r5744 | marko | 2009-09-03 04:28:35 -0400 (Thu, 03 Sep 2009) | 1 line
branches/zip: ut_align(): Make ptr const, like in ut_align_down().
------------------------------------------------------------------------
r5743 | marko | 2009-09-03 02:36:12 -0400 (Thu, 03 Sep 2009) | 3 lines
branches/zip: log_reserve_and_write_fast(): Remove the redundant
output parameter "success".
Success is also indicated by a nonzero return value.
------------------------------------------------------------------------
r5736 | marko | 2009-09-02 03:53:19 -0400 (Wed, 02 Sep 2009) | 1 line
branches/zip: Enclose some timestamp functions in #ifndef UNIV_HOTBACKUP.
------------------------------------------------------------------------
r5735 | marko | 2009-09-02 03:43:09 -0400 (Wed, 02 Sep 2009) | 2 lines
branches/zip: univ.i: Do not undefine PACKAGE or VERSION.
InnoDB source code does not refer to these macros.
------------------------------------------------------------------------
r5734 | sunny | 2009-09-02 03:08:45 -0400 (Wed, 02 Sep 2009) | 2 lines
branches/zip: Update ChangeLog with r5733 changes.
------------------------------------------------------------------------
r5733 | sunny | 2009-09-02 03:05:15 -0400 (Wed, 02 Sep 2009) | 6 lines
branches/zip: Fix a regression introduced by the fix for bug#26316. We check
whether a transaction holds any AUTOINC locks before we acquire the kernel
mutex and release those locks.
Fix for rb://153. Approved by Marko.
------------------------------------------------------------------------
r5716 | vasil | 2009-08-31 03:47:49 -0400 (Mon, 31 Aug 2009) | 9 lines
branches/zip:
Fix Bug#46718 InnoDB plugin incompatible with gcc 4.1 (at least: on PPC): "Undefined symbol"
by implementing our own check in plug.in instead of using the result from
the check from MySQL because it is insufficient.
Approved by: Marko (rb://154)
------------------------------------------------------------------------
r5714 | marko | 2009-08-31 02:10:10 -0400 (Mon, 31 Aug 2009) | 5 lines
branches/zip: buf_chunk_not_freed(): Do not acquire block->mutex unless
block->page.state == BUF_BLOCK_FILE_PAGE. Check that block->page.state
makes sense.
Approved by Sunny Bains over the IM.
------------------------------------------------------------------------
r5709 | inaam | 2009-08-28 02:22:46 -0400 (Fri, 28 Aug 2009) | 5 lines
branches/zip rb://152
Disable display of deprecated parameter innodb_file_io_threads in
'show variables'.
------------------------------------------------------------------------
r5708 | inaam | 2009-08-27 18:43:32 -0400 (Thu, 27 Aug 2009) | 4 lines
branches/zip
Remove redundant TRUE : FALSE from the return statement
------------------------------------------------------------------------
r5707 | inaam | 2009-08-27 12:20:35 -0400 (Thu, 27 Aug 2009) | 6 lines
branches/zip
Remove unused macros as we erased the random readahead code in r5703.
Also fixed some comments.
------------------------------------------------------------------------
r5706 | inaam | 2009-08-27 12:00:27 -0400 (Thu, 27 Aug 2009) | 20 lines
branches/zip rb://147
Done away with following two status variables:
innodb_buffer_pool_read_ahead_rnd
innodb_buffer_pool_read_ahead_seq
Introduced two new status variables:
innodb_buffer_pool_read_ahead = number of pages read as part of
readahead since server startup
innodb_buffer_pool_read_ahead_evicted = number of pages that are read
in as readahead but were evicted before ever being accessed since
server startup i.e.: a measure of how badly our readahead is
performing
SHOW INNODB STATUS will show two extra numbers in buffer pool section:
pages read ahead/sec and pages evicted without access/sec
Approved by: Marko
------------------------------------------------------------------------
r5705 | marko | 2009-08-27 07:56:24 -0400 (Thu, 27 Aug 2009) | 11 lines
branches/zip: dict_index_find_cols(): On column name lookup failure,
return DB_CORRUPTION (HA_ERR_CRASHED) instead of abnormally
terminating the server. Also, disable the previously added diagnostic
output to the error log, because mysql-test-run does not like extra
output in the error log. (Bug #44571)
dict_index_add_to_cache(): Handle errors from dict_index_find_cols().
mysql-test/innodb_bug44571.test: A test case for triggering the bug.
rb://135 approved by Sunny Bains.
------------------------------------------------------------------------
r5704 | marko | 2009-08-27 04:31:17 -0400 (Thu, 27 Aug 2009) | 32 lines
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
------------------------------------------------------------------------
r5703 | marko | 2009-08-27 03:25:00 -0400 (Thu, 27 Aug 2009) | 41 lines
branches/zip: Replace the constant 3/8 ratio that controls the LRU_old
size with the settable global variable innodb_old_blocks_pct. The
minimum and maximum values are 5 and 95 per cent, respectively. The
default is 100*3/8, in line with the old behavior.
ut_time_ms(): New utility function, to return the current time in
milliseconds. TODO: Is there a more efficient timestamp function, such
as rdtsc divided by a power of two?
buf_LRU_old_threshold_ms: New variable, corresponding to
innodb_old_blocks_time. The value 0 is the default behaviour: no
timeout before making blocks 'new'.
bpage->accessed, bpage->LRU_position, buf_pool->ulint_clock: Remove.
bpage->access_time: New field, replacing bpage->accessed. Protected by
buf_pool_mutex instead of bpage->mutex. Updated when a page is created
or accessed the first time in the buffer pool.
buf_LRU_old_ratio, innobase_old_blocks_pct: New variables,
corresponding to innodb_old_blocks_pct
buf_LRU_old_ratio_update(), innobase_old_blocks_pct_update(): Update
functions for buf_LRU_old_ratio, innobase_old_blocks_pct.
buf_page_peek_if_too_old(): Compare ut_time_ms() to bpage->access_time
if buf_LRU_old_threshold_ms && bpage->old. Else observe
buf_LRU_old_ratio and bpage->freed_page_clock.
buf_pool_t: Add n_pages_made_young, n_pages_not_made_young,
n_pages_made_young_old, n_pages_not_made_young, for statistics.
buf_print(): Display buf_pool->n_pages_made_young,
buf_pool->n_pages_not_made_young. This function is only for crash
diagnostics.
buf_print_io(): Display buf_pool->LRU_old_len and quantities derived
from buf_pool->n_pages_made_young, buf_pool->n_pages_not_made_young.
This function is invoked by SHOW ENGINE INNODB STATUS.
rb://129 approved by Heikki Tuuri. This addresses Bug #45015.
------------------------------------------------------------------------
r5702 | marko | 2009-08-27 03:03:15 -0400 (Thu, 27 Aug 2009) | 1 line
branches/zip: Document also the files affected by r5698 in the ChangeLog.
------------------------------------------------------------------------
r5701 | marko | 2009-08-27 03:01:42 -0400 (Thu, 27 Aug 2009) | 1 line
branches/zip: Document r5698 in the ChangeLog.
------------------------------------------------------------------------
r5698 | inaam | 2009-08-26 10:34:35 -0400 (Wed, 26 Aug 2009) | 13 lines
branches/zip bug#42885 rb://148
The call to put IO threads to sleep was most probably meant for Windows
only as the comment in buf0rea.c suggests. However it was enabled on
all platforms. This patch restricts the sleep call to windows. This
approach of not putting threads to sleep makes even more sense because
now we have multiple threads working in the background and it probably
is not a good idea to put all of them to sleep because a user thread
wants to post a batch for readahead.
Approved by: Marko
------------------------------------------------------------------------
r5697 | vasil | 2009-08-26 09:44:40 -0400 (Wed, 26 Aug 2009) | 4 lines
branches/zip:
Fix typo.
------------------------------------------------------------------------
r5696 | vasil | 2009-08-26 09:15:59 -0400 (Wed, 26 Aug 2009) | 14 lines
branches/zip:
Merge a change from MySQL:
http://lists.mysql.com/commits/80832
2968 Jonathan Perkin 2009-08-14
Build fixes for Windows, AIX, HP/UX and Sun Studio11, from Timothy Smith.
modified:
CMakeLists.txt
cmd-line-utils/readline/util.c
storage/innodb_plugin/handler/i_s.cc
storage/innodb_plugin/include/univ.i
------------------------------------------------------------------------
r5695 | marko | 2009-08-26 09:14:59 -0400 (Wed, 26 Aug 2009) | 1 line
branches/zip: UNIV_DEBUG_LOCK_VALIDATE: Move the definition to univ.i.
------------------------------------------------------------------------
r5694 | marko | 2009-08-26 07:25:26 -0400 (Wed, 26 Aug 2009) | 2 lines
branches/zip: buf_page_t: Clarify that bpage->list may contain garbage.
This comment was provoked by Inaam.
------------------------------------------------------------------------
r5687 | vasil | 2009-08-20 05:20:22 -0400 (Thu, 20 Aug 2009) | 8 lines
branches/zip:
ChangeLog:
Follow the convention from the rest of the ChangeLog: for bugfixes from
bugs.mysql.com only the bug number and title goes in the ChangeLog. Detailed
explanation on what is the problem and how it was fixed is present in
the bugs database.
------------------------------------------------------------------------
r5686 | vasil | 2009-08-20 05:15:05 -0400 (Thu, 20 Aug 2009) | 4 lines
branches/zip:
White-space fixup.
------------------------------------------------------------------------
r5685 | sunny | 2009-08-20 04:18:29 -0400 (Thu, 20 Aug 2009) | 2 lines
branches/zip: Update the ChangeLog with r5684 change.
------------------------------------------------------------------------
r5684 | sunny | 2009-08-20 04:05:30 -0400 (Thu, 20 Aug 2009) | 10 lines
branches/zip: Fix bug# 46650: Innodb assertion autoinc_lock == lock in lock_table_remove_low on INSERT SELECT
We only store the autoinc locks that are granted in the transaction's autoinc
lock vector. A transacton, that has been rolled back due to a deadlock because
of an AUTOINC lock attempt, will not have added that lock to the vector. We
need to check for that when we remove that lock.
rb://145
Approved by Marko.
------------------------------------------------------------------------
r5681 | sunny | 2009-08-14 02:16:24 -0400 (Fri, 14 Aug 2009) | 3 lines
branches/zip: When building HotBackup srv_use_sys_malloc is #ifdef out. We
move access to the this variable within a !UNIV_HOTBACKUP block.
------------------------------------------------------------------------
r5671 | marko | 2009-08-13 04:46:33 -0400 (Thu, 13 Aug 2009) | 5 lines
branches/zip: ha_innobase::add_index(): Fix Bug #46557:
after a successful operation, read innodb_table->flags from
the newly created table object, not from the old one that was just freed.
Approved by Sunny.
------------------------------------------------------------------------
r5670 | marko | 2009-08-12 09:16:37 -0400 (Wed, 12 Aug 2009) | 2 lines
branches/zip: trx_undo_rec_copy(): Add const qualifier to undo_rec.
This is a non-functional change.
------------------------------------------------------------------------
r5663 | marko | 2009-08-11 07:42:37 -0400 (Tue, 11 Aug 2009) | 2 lines
branches/zip: trx_general_rollback_for_mysql(): Remove the redundant
parameter partial. If savept==NULL, partial==FALSE.
------------------------------------------------------------------------
r5662 | marko | 2009-08-11 05:54:16 -0400 (Tue, 11 Aug 2009) | 1 line
branches/zip: Bump the version number to 1.0.5 after releasing 1.0.4.
------------------------------------------------------------------------
r5642 | calvin | 2009-08-06 19:04:03 -0400 (Thu, 06 Aug 2009) | 2 lines
branches/zip: remove duplicate "the" in comments.
------------------------------------------------------------------------
r5639 | marko | 2009-08-06 06:39:34 -0400 (Thu, 06 Aug 2009) | 3 lines
branches/zip: mem_heap_block_free(): If innodb_use_sys_malloc is set,
do not tell Valgrind that the memory is free, to avoid
a bogus warning in Valgrind's built-in free() hook.
------------------------------------------------------------------------
r5636 | marko | 2009-08-05 08:27:30 -0400 (Wed, 05 Aug 2009) | 2 lines
branches/zip: lock_rec_validate_page(): Add the parameter zip_size.
This should help track down Mantis Issue #289.
------------------------------------------------------------------------
r5635 | marko | 2009-08-05 07:06:55 -0400 (Wed, 05 Aug 2009) | 2 lines
branches/zip: Replace <number> with NUMBER in some comments,
to avoid problems with Doxygen XML output.
------------------------------------------------------------------------
r5629 | marko | 2009-08-04 07:42:44 -0400 (Tue, 04 Aug 2009) | 1 line
branches/zip: mysql-test: Pass MTR's internal checks.
------------------------------------------------------------------------
r5626 | vasil | 2009-08-04 01:53:31 -0400 (Tue, 04 Aug 2009) | 4 lines
branches/zip:
Revert the dummy change from c5625.
------------------------------------------------------------------------
r5625 | vasil | 2009-08-04 01:52:48 -0400 (Tue, 04 Aug 2009) | 32 lines
branches/zip: Merge 5518:5622 from branches/5.1, resolving conflict in r5622
(after resolving the conflict Makefile.am was not changed so I have made
a dummy change so I can commit and thus record that branches/5.1 has been
merged in branches/zip up to 5622):
------------------------------------------------------------------------
r5622 | vasil | 2009-08-03 15:27:00 +0300 (Mon, 03 Aug 2009) | 20 lines
Changed paths:
M /branches/5.1/Makefile.am
branches/5.1:
Merge a change from MySQL:
------------------------------------------------------------
revno: 2988
committer: Satya B <satya.bn@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Wed 2009-07-01 11:06:05 +0530
message:
Fix build failure after applying Innodb snapshot 5.1-ss5282
After applying Innodb snapshot 5.1-ss5282, build was broken
because of missing header file.
Adding the header file to Makefile.am after informing the
innodb developers.
modified:
storage/innobase/Makefile.am
------------------------------------------------------------------------
------------------------------------------------------------------------
r5614 | vasil | 2009-07-31 11:09:07 -0400 (Fri, 31 Jul 2009) | 6 lines
branches/zip:
Add fsp0types.h to the list of noinst_HEADERS
Suggested by: Sergey Vojtovich <svoj@sun.com>
------------------------------------------------------------------------
r5539 | vasil | 2009-07-21 06:28:27 -0400 (Tue, 21 Jul 2009) | 4 lines
branches/zip:
Add a test program to check whether the PAUSE instruction is available.
------------------------------------------------------------------------
r5537 | vasil | 2009-07-21 05:31:26 -0400 (Tue, 21 Jul 2009) | 5 lines
branches/zip:
Fixups in ChangeLog: sort filenames alphabetically and wrap to 78 chars per
line.
------------------------------------------------------------------------
r5527 | sunny | 2009-07-20 17:56:30 -0400 (Mon, 20 Jul 2009) | 2 lines
branches/zip: For HotBackup builds we don't want to hide the symbols.
------------------------------------------------------------------------
r5525 | calvin | 2009-07-20 13:14:30 -0400 (Mon, 20 Jul 2009) | 2 lines
branches/zip: add ChangeLog entry for r5524.
------------------------------------------------------------------------
2009-09-28 19:34:23 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_ad(type.validate());
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
switch (mode) {
|
|
|
|
case OS_AIO_NORMAL:
|
branches/innodb+: Merged revisions 5525:5971 from branches/zip
------------------------------------------------------------------------
r5971 | marko | 2009-09-23 09:03:51 -0400 (Wed, 23 Sep 2009) | 2 lines
branches/zip: os_file_pwrite(): Make the code compile in InnoDB Hot Backup
when the pwrite system call is not available.
------------------------------------------------------------------------
r5956 | calvin | 2009-09-22 19:30:10 -0400 (Tue, 22 Sep 2009) | 4 lines
branches/zip: remove handler0vars.h from Makefile.am
Left over from r5950.
------------------------------------------------------------------------
r5951 | calvin | 2009-09-22 11:17:01 -0400 (Tue, 22 Sep 2009) | 4 lines
branches/zip: adjust CMake file to work with old versions of MySQL
Tested with MySQL 5.1.38 and 5.1.30.
------------------------------------------------------------------------
r5950 | calvin | 2009-09-22 02:42:46 -0400 (Tue, 22 Sep 2009) | 17 lines
branches/zip: adjust Windows loading method for 5.1.38
Starting at 5.1.38, MySQL server exports symbols needed
for dynamic plugin on Windows. There is no need for
Windows specific loading. Also, the CMake files are
simplified in 5.1.38.
When WITH_INNOBASE_STORAGE_ENGINE is specified during
configuration (win\configure.js), InnoDB is built as
a static library. Otherwise, a dynamic InnoDB will be
built (ha_innodb.dll).
CMakeLists.txt requires minor changes in order to work
with MySQL prior to 5.1.38. The changes will be in a
separate patch.
This patch addresses Mantis issue#286.
------------------------------------------------------------------------
r5945 | calvin | 2009-09-21 10:53:22 -0400 (Mon, 21 Sep 2009) | 4 lines
branches/zip: fix a type in r5935
Should be innodb_open_files, spotted by Michael.
------------------------------------------------------------------------
r5940 | vasil | 2009-09-21 01:26:04 -0400 (Mon, 21 Sep 2009) | 4 lines
branches/zip:
Add ChangeLog entries for c5938.
------------------------------------------------------------------------
r5938 | calvin | 2009-09-19 03:14:25 -0400 (Sat, 19 Sep 2009) | 41 lines
branches/zip: Merge revisions 2584:2956 from branches/6.0,
except c2932.
Bug#37232 and bug#31183 were fixed in the 6.0 branch only.
They should be fixed in the plugin too, specially MySQL 6.0
is discontinued at this point.
------------------------------------------------------------------------
r2604 | inaam | 2008-08-21 09:37:06 -0500 (Thu, 21 Aug 2008) | 8 lines
branches/6.0 bug#37232
Relax locking behaviour for REPLACE INTO t SELECT ... FROM t1.
Now SELECT on t1 is performed as a consistent read when the isolation
level is set to READ COMMITTED.
Reviewed by: Heikki
------------------------------------------------------------------------
r2605 | inaam | 2008-08-21 09:59:33 -0500 (Thu, 21 Aug 2008) | 7 lines
branches/6.0
Added a comment to clarify why distinct calls to read MySQL binary
log file name and log position do not entail any race condition.
Suggested by: Heikki
------------------------------------------------------------------------
r2956 | inaam | 2008-11-04 04:47:30 -0600 (Tue, 04 Nov 2008) | 11 lines
branches/6.0 bug#31183
If the system tablespace runs out of space because 'autoextend' is
not specified with innodb_data_file_path there was no error message
printed to the error log. The client would get 'table full' error.
This patch prints an appropriate error message to the error log.
rb://43
Approved by: Marko
------------------------------------------------------------------------
------------------------------------------------------------------------
r5935 | calvin | 2009-09-18 17:08:02 -0400 (Fri, 18 Sep 2009) | 6 lines
branches/zip: fix bug#44338; minor non-functional changes
Bug#44338 innodb has message about non-existing option
innodb_max_files_open. Change the option to innodb_open_files.
The fix was committed into 6.0 branch.
------------------------------------------------------------------------
r5934 | vasil | 2009-09-18 13:06:46 -0400 (Fri, 18 Sep 2009) | 4 lines
branches/zip:
Fix typo.
------------------------------------------------------------------------
r5924 | vasil | 2009-09-18 00:59:30 -0400 (Fri, 18 Sep 2009) | 4 lines
branches/zip:
White space and formatting cleanup in the ChangeLog
------------------------------------------------------------------------
r5922 | marko | 2009-09-17 02:32:08 -0400 (Thu, 17 Sep 2009) | 4 lines
branches/zip: innodb-zip.test: Make the test work with zlib 1.2.3.3.
Apparently, the definition of compressBound() has slightly changed.
This has been filed as Mantis Issue #345.
------------------------------------------------------------------------
r5920 | vasil | 2009-09-16 14:47:22 -0400 (Wed, 16 Sep 2009) | 4 lines
branches/zip:
Add ChangeLog entries for r5916.
------------------------------------------------------------------------
r5919 | vasil | 2009-09-16 14:37:13 -0400 (Wed, 16 Sep 2009) | 4 lines
branches/zip:
Whitespace cleanup in the ChangeLog.
------------------------------------------------------------------------
r5917 | marko | 2009-09-16 05:56:23 -0400 (Wed, 16 Sep 2009) | 1 line
branches/zip: innobase_get_cset_width(): Cache the value of current_thd.
------------------------------------------------------------------------
r5916 | marko | 2009-09-16 05:54:43 -0400 (Wed, 16 Sep 2009) | 128 lines
branches/zip: Merge revisions 5622:5912 from branches/5.1, except r5700
(changes to CMakeLists.txt)
------------------------------------------------------------------------
r5622 | vasil | 2009-08-03 15:27:00 +0300 (Mon, 03 Aug 2009) | 20 lines
Changed paths:
M /branches/5.1/Makefile.am
branches/5.1:
Merge a change from MySQL:
------------------------------------------------------------
revno: 2988
committer: Satya B <satya.bn@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Wed 2009-07-01 11:06:05 +0530
message:
Fix build failure after applying Innodb snapshot 5.1-ss5282
After applying Innodb snapshot 5.1-ss5282, build was broken
because of missing header file.
Adding the header file to Makefile.am after informing the
innodb developers.
modified:
storage/innobase/Makefile.am
------------------------------------------------------------------------
r5740 | jyang | 2009-09-03 06:33:47 +0300 (Thu, 03 Sep 2009) | 5 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/db0err.h
A /branches/5.1/mysql-test/innodb_bug46000.result
A /branches/5.1/mysql-test/innodb_bug46000.test
branches/5.1: Disallow creating index with the name of
"GEN_CLUST_INDEX" which is reserved for the default system
primary index. (Bug #46000) rb://149 approved by Sunny Bains.
------------------------------------------------------------------------
r5741 | jyang | 2009-09-03 07:16:01 +0300 (Thu, 03 Sep 2009) | 5 lines
Changed paths:
M /branches/5.1/dict/dict0dict.c
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug44369.result
A /branches/5.1/mysql-test/innodb_bug44369.test
M /branches/5.1/row/row0mysql.c
branches/5.1: Block creating table with column name conflicting
with Innodb reserved key words. (Bug #44369) rb://151 approved
by Sunny Bains.
------------------------------------------------------------------------
r5757 | jyang | 2009-09-04 04:26:13 +0300 (Fri, 04 Sep 2009) | 3 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/db0err.h
D /branches/5.1/mysql-test/innodb_bug46000.result
D /branches/5.1/mysql-test/innodb_bug46000.test
branches/5.1: Revert change in 5740. Making the fix in a subsequent
check in.
------------------------------------------------------------------------
r5760 | jyang | 2009-09-04 07:07:34 +0300 (Fri, 04 Sep 2009) | 3 lines
Changed paths:
M /branches/5.1/dict/dict0dict.c
M /branches/5.1/handler/ha_innodb.cc
D /branches/5.1/mysql-test/innodb_bug44369.result
D /branches/5.1/mysql-test/innodb_bug44369.test
M /branches/5.1/row/row0mysql.c
branches/5.1: This is to revert change 5741. A return status for
create_table_def() needs to be fixed.
------------------------------------------------------------------------
r5797 | calvin | 2009-09-09 18:26:29 +0300 (Wed, 09 Sep 2009) | 3 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: merge change from 5.1.38
HA_ERR_TOO_MANY_CONCURRENT_TRXS is added in 5.1.38.
------------------------------------------------------------------------
r5799 | calvin | 2009-09-09 20:47:31 +0300 (Wed, 09 Sep 2009) | 10 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: fix bug#46256
Allow tables to be dropped even if the collation is not found,
but issue a warning.
Could not find an easy way to add mysql-test since it requires
changes to charsets and restarting the server. Tests were
executed manually.
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r5805 | vasil | 2009-09-10 08:41:48 +0300 (Thu, 10 Sep 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Fix a compilation warning caused by c5799:
handler/ha_innodb.cc: In function 'void innobase_get_cset_width(ulint, ulint*, ulint*)':
handler/ha_innodb.cc:830: warning: format '%d' expects type 'int', but argument 2 has type 'ulint'
------------------------------------------------------------------------
r5834 | jyang | 2009-09-11 00:43:05 +0300 (Fri, 11 Sep 2009) | 5 lines
Changed paths:
M /branches/5.1/dict/dict0dict.c
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug44369.result
A /branches/5.1/mysql-test/innodb_bug44369.test
M /branches/5.1/row/row0mysql.c
branches/5.1: Block creating table with column name conflicting
with Innodb reserved key words. (Bug #44369) rb://151 approved
by Sunny Bains.
------------------------------------------------------------------------
r5895 | jyang | 2009-09-15 03:39:21 +0300 (Tue, 15 Sep 2009) | 5 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug46000.result
A /branches/5.1/mysql-test/innodb_bug46000.test
branches/5.1: Disallow creating index with the name of
"GEN_CLUST_INDEX" which is reserved for the default system
primary index. (Bug #46000) rb://149 approved by Marko Makela.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5910 | marko | 2009-09-16 04:07:21 -0400 (Wed, 16 Sep 2009) | 9 lines
branches/zip: Introduce UNIV_LOG_LSN_DEBUG and MLOG_LSN for redo log
diagnostics. This was written in order to better track down
Issue #313 in InnoDB Hot Backup.
MLOG_LSN: A new redo log entry type, for recording the current log
sequence number (LSN). This will be checked in an assertion in
recv_parse_log_rec().
rb://161, discussed with Sunny and Vasil.
------------------------------------------------------------------------
r5899 | marko | 2009-09-15 07:26:01 -0400 (Tue, 15 Sep 2009) | 4 lines
branches/zip: ut0ut.h: Do not #include "os0sync.h" #ifdef UNIV_HOTBACKUP.
Since r5872, the InnoDB Hot Backup build was broken.
Fix it by not defining any thread synchronization primitives in ut0ut.h.
InnoDB Hot Backup is a single-threaded program.
------------------------------------------------------------------------
r5898 | marko | 2009-09-15 06:18:50 -0400 (Tue, 15 Sep 2009) | 2 lines
branches/zip: Add */.dirstamp to svn:ignore,
for https://svn.innodb.com/svn/hotbackup/branches/3.5
------------------------------------------------------------------------
r5897 | marko | 2009-09-15 04:29:00 -0400 (Tue, 15 Sep 2009) | 8 lines
branches/zip: Avoid bogus messages about latching order violations when
UNIV_SYNC_DEBUG is defined.
sync_thread_levels_g(): Add the parameter "warn". Do not print
anything unless it is set.
sync_thread_add_level(): Pass warn=TRUE to sync_thread_levels_g()
when the check is within an assertion; FALSE if it is not.
------------------------------------------------------------------------
r5893 | inaam | 2009-09-14 11:20:48 -0400 (Mon, 14 Sep 2009) | 10 lines
branches/zip rb://159
In case of pages that are not made young the counter is incremented
only when the page in question is 'old'. In case of pages that are
made young the counter is incremented in case of all pages. For apple
to apple comparison this patch changes the 'young-making' counter to
consider only 'old' blocks.
Approved by: Marko
------------------------------------------------------------------------
r5889 | vasil | 2009-09-14 05:17:18 -0400 (Mon, 14 Sep 2009) | 5 lines
branches/zip:
Add missing return statement in the test program that could have
caused a warning.
------------------------------------------------------------------------
r5888 | vasil | 2009-09-14 04:38:45 -0400 (Mon, 14 Sep 2009) | 40 lines
branches/zip:
Back-merge c5880 and c5881 from branches/embedded-1.0:
------------------------------------------------------------------------
r5880 | vasil | 2009-09-12 17:28:44 +0300 (Sat, 12 Sep 2009) | 18 lines
Changed paths:
M /branches/embedded-1.0/configure.in
M /branches/embedded-1.0/include/os0sync.h
M /branches/embedded-1.0/srv/srv0start.c
branches/embedded-1.0:
Clean up and simplify the code that surrounds the atomic ops:
* Simplify the code that prints what atomics are used:
Instead of repeating the same conditions on which each atomics are used
use just one printf that prints a variable defined by the code which
chooses what atomics to use.
* In os0sync.h pick up each atomic variant only if it has been selected
by autoconf (based on IB_ATOMIC_MODE_* macros). Define the startup message
to be printed.
* In configure.in: check what user has chosen and if he has chosen
something that is not available, emit an error. If nothing has been chosen
explicitly by the user, auto select an option according to the described
logic in configure.in.
------------------------------------------------------------------------
r5881 | vasil | 2009-09-12 20:08:27 +0300 (Sat, 12 Sep 2009) | 4 lines
Changed paths:
M /branches/embedded-1.0/configure.in
branches/embedded-1.0:
Fix syntax error in test program.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5875 | vasil | 2009-09-12 08:11:25 -0400 (Sat, 12 Sep 2009) | 4 lines
branches/zip:
Remove unnecessary macro.
------------------------------------------------------------------------
r5872 | vasil | 2009-09-12 05:35:17 -0400 (Sat, 12 Sep 2009) | 5 lines
branches/zip:
Explicitly include os0sync.h to the places where HAVE_ATOMIC_BUILTINS and
INNODB_RW_LOCKS_USE_ATOMICS are used to avoid potential problems.
------------------------------------------------------------------------
r5871 | vasil | 2009-09-12 05:25:44 -0400 (Sat, 12 Sep 2009) | 6 lines
branches/zip:
Rename HAVE_SOLARIS_ATOMICS to HAVE_IB_SOLARIS_ATOMICS and
IB_HAVE_PAUSE_INSTRUCTION to HAVE_IB_PAUSE_INSTRUCTION so they
all follow the same HAVE_IB_* convention.
------------------------------------------------------------------------
r5870 | vasil | 2009-09-12 05:13:44 -0400 (Sat, 12 Sep 2009) | 7 lines
branches/zip:
Define HAVE_ATOMIC_BUILTINS and INNODB_RW_LOCKS_USE_ATOMICS in os0sync.h
instead of in univ.i. The code expects os_*() macros to be present if
HAVE_ATOMIC_BUILTINS and INNODB_RW_LOCKS_USE_ATOMICS are defined. So define
them next to defining the os_*() macros.
------------------------------------------------------------------------
r5869 | vasil | 2009-09-12 04:33:11 -0400 (Sat, 12 Sep 2009) | 15 lines
branches/zip:
Include ut0auxconf.h only if none of the macros it would define is defined.
The check when to include this header was outdated from the time when there
was only one macro involved.
Move the atomics checks that are in univ.i outside of
#if windows ... #else ... #endif
This simplifies the code and removes some duplicates like defining
HAVE_ATOMIC_BUILTINS if HAVE_WINDOWS_ATOMICS is defined in both branches.
Do not define the same macro HAVE_ATOMIC_PTHREAD_T for different events.
Instead define HAVE_IB_ATOMIC_PTHREAD_T_GCC and
HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS.
------------------------------------------------------------------------
r5868 | vasil | 2009-09-12 04:01:17 -0400 (Sat, 12 Sep 2009) | 6 lines
branches/zip:
Move the check whether to include ut0auxconf.h before everything because
we are now even checking for GCC atomics, we relied on MySQL to define
this macro before.
------------------------------------------------------------------------
r5867 | vasil | 2009-09-12 03:43:45 -0400 (Sat, 12 Sep 2009) | 4 lines
branches/zip:
Update comment to reflect reality.
------------------------------------------------------------------------
r5866 | vasil | 2009-09-12 03:30:08 -0400 (Sat, 12 Sep 2009) | 5 lines
branches/zip:
Add the check for GCC atomics to ut0auxconf* (copied from plug.in) because
we no longer rely on MySQL's HAVE_GCC_ATOMIC_BUILTINS.
------------------------------------------------------------------------
r5865 | vasil | 2009-09-12 03:26:03 -0400 (Sat, 12 Sep 2009) | 10 lines
branches/zip:
Simplify the compile time checks by splittig them into 5 independent checks:
* Whether GCC atomics are available
* Whether pthread_t can be used by GCC atomics
* Whether Solaris libc atomics are available
* Whether pthread_t can be used by Solaris libs atomics
* Checking the size of pthread_t
------------------------------------------------------------------------
r5864 | vasil | 2009-09-12 03:22:55 -0400 (Sat, 12 Sep 2009) | 4 lines
branches/zip:
Include string.h which is needed for memset().
------------------------------------------------------------------------
r5863 | vasil | 2009-09-12 03:07:08 -0400 (Sat, 12 Sep 2009) | 10 lines
branches/zip:
Check that pthread_t can indeed be passed to Solaris atomic functions, instead
of assuming that it can be passed if 0 can be assigned to it. It could be that:
* 0 can be assigned, but pthread_t cannot be passed and
* 0 cannot be assigned but pthread_t can be passed
Better to check what we are interested in, not something else and make
assumptions.
------------------------------------------------------------------------
r5858 | vasil | 2009-09-11 13:46:47 -0400 (Fri, 11 Sep 2009) | 4 lines
branches/zip:
Fix the indentation of the closing bracket.
------------------------------------------------------------------------
r5826 | marko | 2009-09-10 07:29:46 -0400 (Thu, 10 Sep 2009) | 12 lines
branches/zip: Roll back recovered dictionary transactions before
dropping incomplete indexes (Issue #337).
trx_rollback_or_clean_recovered(ibool all): New function, split from
trx_rollback_or_clean_all_recovered(). all==FALSE will only roll back
dictionary transactions.
recv_recovery_from_checkpoint_finish(): Call
trx_rollback_or_clean_recovered(FALSE) before
row_merge_drop_temp_indexes().
rb://158 approved by Sunny Bains
------------------------------------------------------------------------
r5825 | marko | 2009-09-10 06:47:09 -0400 (Thu, 10 Sep 2009) | 20 lines
branches/zip: Reduce mutex contention that was introduced when
addressing Bug #45015 (Issue #316), in r5703.
buf_page_set_accessed_make_young(): New auxiliary function, called by
buf_page_get_zip(), buf_page_get_gen(),
buf_page_optimistic_get_func(). Call ut_time_ms() outside of
buf_pool_mutex. Use cached access_time.
buf_page_set_accessed(): Add the parameter time_ms, so that
ut_time_ms() need not be called while holding buf_pool_mutex.
buf_page_optimistic_get_func(), buf_page_get_known_nowait(): Read
buf_page_t::access_time without holding buf_pool_mutex. This should be
OK, because the field is only used for heuristic purposes.
buf_page_peek_if_too_old(): If buf_pool->freed_page_clock == 0, return
FALSE, so that we will not waste time moving blocks in the LRU list in
the warm-up phase or when the workload fits in the buffer pool.
rb://156 approved by Sunny Bains
------------------------------------------------------------------------
r5822 | marko | 2009-09-10 06:10:20 -0400 (Thu, 10 Sep 2009) | 1 line
branches/zip: buf_page_release(): De-stutter the function comment.
------------------------------------------------------------------------
r5804 | marko | 2009-09-10 01:29:31 -0400 (Thu, 10 Sep 2009) | 1 line
branches/zip: trx_cleanup_at_db_startup(): Fix a typo in comment.
------------------------------------------------------------------------
r5798 | calvin | 2009-09-09 11:28:10 -0400 (Wed, 09 Sep 2009) | 5 lines
branches/zip:
HA_ERR_TOO_MANY_CONCURRENT_TRXS is added in 5.1.38.
But the plugin should still work with previous versions
of MySQL.
------------------------------------------------------------------------
r5792 | vasil | 2009-09-09 09:35:58 -0400 (Wed, 09 Sep 2009) | 32 lines
branches/zip:
Fix a bug in manipulating the variable innodb_old_blocks_pct:
for any value assigned it got that value -1, except for 75. When
assigned 75, it got 75.
mysql> set global innodb_old_blocks_pct=15;
Query OK, 0 rows affected (0.00 sec)
mysql> show variables like 'innodb_old_blocks_pct';
+-----------------------+-------+
| Variable_name | Value |
+-----------------------+-------+
| innodb_old_blocks_pct | 14 |
+-----------------------+-------+
1 row in set (0.00 sec)
mysql> set global innodb_old_blocks_pct=75;
Query OK, 0 rows affected (0.00 sec)
mysql> show variables like 'innodb_old_blocks_pct';
+-----------------------+-------+
| Variable_name | Value |
+-----------------------+-------+
| innodb_old_blocks_pct | 75 |
+-----------------------+-------+
After the fix it gets exactly what was assigned.
Approved by: Marko (via IM)
------------------------------------------------------------------------
r5783 | marko | 2009-09-09 03:25:00 -0400 (Wed, 09 Sep 2009) | 1 line
branches/zip: buf_page_is_accessed(): Correct the function comment.
------------------------------------------------------------------------
r5782 | marko | 2009-09-09 03:00:59 -0400 (Wed, 09 Sep 2009) | 2 lines
branches/zip: buf_page_peek_if_too_old(): Silence a compiler warning
that was introduced in r5779 on 32-bit systems.
------------------------------------------------------------------------
r5780 | marko | 2009-09-09 02:50:50 -0400 (Wed, 09 Sep 2009) | 1 line
branches/zip: ut_time_ms(): Return ulint, not uint.
------------------------------------------------------------------------
r5779 | marko | 2009-09-09 02:17:19 -0400 (Wed, 09 Sep 2009) | 2 lines
branches/zip: buf_page_peek_if_too_old(): Make the bitmasking work when
buf_pool->freed_page_clock is wider than 32 bits.
------------------------------------------------------------------------
r5777 | marko | 2009-09-08 11:50:25 -0400 (Tue, 08 Sep 2009) | 2 lines
branches/zip: Remove BUF_LRU_INITIAL_RATIO, which should have been removed
together with buf_LRU_get_recent_limit().
------------------------------------------------------------------------
r5775 | calvin | 2009-09-07 17:15:05 -0400 (Mon, 07 Sep 2009) | 13 lines
branches/zip: Build InnoDB on Windows with UNIV_HOTBACKUP
The changes are non-functional changes for normal InnoDB,
but needed for building the Hot Backup on Windows (with
UNIV_HOTBACKUP defined).
- Define os_aio_use_native_aio for HB.
- Do not acquire seek mutexes for backup since HB is single threaded.
- Do not use srv_flush_log_at_trx_commit for HB build
rb://155
Approved by: Marko
------------------------------------------------------------------------
r5752 | marko | 2009-09-03 10:55:51 -0400 (Thu, 03 Sep 2009) | 10 lines
branches/zip: recv_recover_page_func(): Write the log sequence number
to the compressed page, if there is one. Previously, the function only
wrote the LSN to the uncompressed page.
It is not clear why recv_recover_page_func() is updating FIL_PAGE_LSN
in the buffer pool. The log sequence number will be stamped on the
page when it is flushed to disk, in buf_flush_init_for_writing().
I noticed this inconsistency when analyzing Issue #313, but this patch
does not fix it. That is no surprise, since FIL_PAGE_LSN should only
matter on disk files, not in the buffer pool.
------------------------------------------------------------------------
r5751 | marko | 2009-09-03 10:36:15 -0400 (Thu, 03 Sep 2009) | 7 lines
branches/zip: row_merge(): Remove a bogus debug assertion
that was triggered when creating an index on an empty table.
row_merge_sort(): Add debug assertions and comments that justify
the loop termination condition.
The bogus assertion ut_ad(ihalf > 0) was reported by Michael.
------------------------------------------------------------------------
r5748 | marko | 2009-09-03 07:05:44 -0400 (Thu, 03 Sep 2009) | 1 line
branches/zip: MLOG_MULTI_REC_END: Correct the comment.
------------------------------------------------------------------------
r5747 | marko | 2009-09-03 06:46:38 -0400 (Thu, 03 Sep 2009) | 2 lines
branches/zip: recv_scan_log_recs(): Replace while with do...while,
because the termination condition will always hold on the first iteration.
------------------------------------------------------------------------
r5746 | marko | 2009-09-03 04:55:36 -0400 (Thu, 03 Sep 2009) | 2 lines
branches/zip: log_reserve_and_write_fast(): Do not cache the log_sys pointer
in a local variable.
------------------------------------------------------------------------
r5745 | marko | 2009-09-03 04:38:22 -0400 (Thu, 03 Sep 2009) | 2 lines
branches/zip: log_check_log_recs(): Enclose in #ifdef UNIV_LOG_DEBUG.
Add const qualifiers.
------------------------------------------------------------------------
r5744 | marko | 2009-09-03 04:28:35 -0400 (Thu, 03 Sep 2009) | 1 line
branches/zip: ut_align(): Make ptr const, like in ut_align_down().
------------------------------------------------------------------------
r5743 | marko | 2009-09-03 02:36:12 -0400 (Thu, 03 Sep 2009) | 3 lines
branches/zip: log_reserve_and_write_fast(): Remove the redundant
output parameter "success".
Success is also indicated by a nonzero return value.
------------------------------------------------------------------------
r5736 | marko | 2009-09-02 03:53:19 -0400 (Wed, 02 Sep 2009) | 1 line
branches/zip: Enclose some timestamp functions in #ifndef UNIV_HOTBACKUP.
------------------------------------------------------------------------
r5735 | marko | 2009-09-02 03:43:09 -0400 (Wed, 02 Sep 2009) | 2 lines
branches/zip: univ.i: Do not undefine PACKAGE or VERSION.
InnoDB source code does not refer to these macros.
------------------------------------------------------------------------
r5734 | sunny | 2009-09-02 03:08:45 -0400 (Wed, 02 Sep 2009) | 2 lines
branches/zip: Update ChangeLog with r5733 changes.
------------------------------------------------------------------------
r5733 | sunny | 2009-09-02 03:05:15 -0400 (Wed, 02 Sep 2009) | 6 lines
branches/zip: Fix a regression introduced by the fix for bug#26316. We check
whether a transaction holds any AUTOINC locks before we acquire the kernel
mutex and release those locks.
Fix for rb://153. Approved by Marko.
------------------------------------------------------------------------
r5716 | vasil | 2009-08-31 03:47:49 -0400 (Mon, 31 Aug 2009) | 9 lines
branches/zip:
Fix Bug#46718 InnoDB plugin incompatible with gcc 4.1 (at least: on PPC): "Undefined symbol"
by implementing our own check in plug.in instead of using the result from
the check from MySQL because it is insufficient.
Approved by: Marko (rb://154)
------------------------------------------------------------------------
r5714 | marko | 2009-08-31 02:10:10 -0400 (Mon, 31 Aug 2009) | 5 lines
branches/zip: buf_chunk_not_freed(): Do not acquire block->mutex unless
block->page.state == BUF_BLOCK_FILE_PAGE. Check that block->page.state
makes sense.
Approved by Sunny Bains over the IM.
------------------------------------------------------------------------
r5709 | inaam | 2009-08-28 02:22:46 -0400 (Fri, 28 Aug 2009) | 5 lines
branches/zip rb://152
Disable display of deprecated parameter innodb_file_io_threads in
'show variables'.
------------------------------------------------------------------------
r5708 | inaam | 2009-08-27 18:43:32 -0400 (Thu, 27 Aug 2009) | 4 lines
branches/zip
Remove redundant TRUE : FALSE from the return statement
------------------------------------------------------------------------
r5707 | inaam | 2009-08-27 12:20:35 -0400 (Thu, 27 Aug 2009) | 6 lines
branches/zip
Remove unused macros as we erased the random readahead code in r5703.
Also fixed some comments.
------------------------------------------------------------------------
r5706 | inaam | 2009-08-27 12:00:27 -0400 (Thu, 27 Aug 2009) | 20 lines
branches/zip rb://147
Done away with following two status variables:
innodb_buffer_pool_read_ahead_rnd
innodb_buffer_pool_read_ahead_seq
Introduced two new status variables:
innodb_buffer_pool_read_ahead = number of pages read as part of
readahead since server startup
innodb_buffer_pool_read_ahead_evicted = number of pages that are read
in as readahead but were evicted before ever being accessed since
server startup i.e.: a measure of how badly our readahead is
performing
SHOW INNODB STATUS will show two extra numbers in buffer pool section:
pages read ahead/sec and pages evicted without access/sec
Approved by: Marko
------------------------------------------------------------------------
r5705 | marko | 2009-08-27 07:56:24 -0400 (Thu, 27 Aug 2009) | 11 lines
branches/zip: dict_index_find_cols(): On column name lookup failure,
return DB_CORRUPTION (HA_ERR_CRASHED) instead of abnormally
terminating the server. Also, disable the previously added diagnostic
output to the error log, because mysql-test-run does not like extra
output in the error log. (Bug #44571)
dict_index_add_to_cache(): Handle errors from dict_index_find_cols().
mysql-test/innodb_bug44571.test: A test case for triggering the bug.
rb://135 approved by Sunny Bains.
------------------------------------------------------------------------
r5704 | marko | 2009-08-27 04:31:17 -0400 (Thu, 27 Aug 2009) | 32 lines
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
------------------------------------------------------------------------
r5703 | marko | 2009-08-27 03:25:00 -0400 (Thu, 27 Aug 2009) | 41 lines
branches/zip: Replace the constant 3/8 ratio that controls the LRU_old
size with the settable global variable innodb_old_blocks_pct. The
minimum and maximum values are 5 and 95 per cent, respectively. The
default is 100*3/8, in line with the old behavior.
ut_time_ms(): New utility function, to return the current time in
milliseconds. TODO: Is there a more efficient timestamp function, such
as rdtsc divided by a power of two?
buf_LRU_old_threshold_ms: New variable, corresponding to
innodb_old_blocks_time. The value 0 is the default behaviour: no
timeout before making blocks 'new'.
bpage->accessed, bpage->LRU_position, buf_pool->ulint_clock: Remove.
bpage->access_time: New field, replacing bpage->accessed. Protected by
buf_pool_mutex instead of bpage->mutex. Updated when a page is created
or accessed the first time in the buffer pool.
buf_LRU_old_ratio, innobase_old_blocks_pct: New variables,
corresponding to innodb_old_blocks_pct
buf_LRU_old_ratio_update(), innobase_old_blocks_pct_update(): Update
functions for buf_LRU_old_ratio, innobase_old_blocks_pct.
buf_page_peek_if_too_old(): Compare ut_time_ms() to bpage->access_time
if buf_LRU_old_threshold_ms && bpage->old. Else observe
buf_LRU_old_ratio and bpage->freed_page_clock.
buf_pool_t: Add n_pages_made_young, n_pages_not_made_young,
n_pages_made_young_old, n_pages_not_made_young, for statistics.
buf_print(): Display buf_pool->n_pages_made_young,
buf_pool->n_pages_not_made_young. This function is only for crash
diagnostics.
buf_print_io(): Display buf_pool->LRU_old_len and quantities derived
from buf_pool->n_pages_made_young, buf_pool->n_pages_not_made_young.
This function is invoked by SHOW ENGINE INNODB STATUS.
rb://129 approved by Heikki Tuuri. This addresses Bug #45015.
------------------------------------------------------------------------
r5702 | marko | 2009-08-27 03:03:15 -0400 (Thu, 27 Aug 2009) | 1 line
branches/zip: Document also the files affected by r5698 in the ChangeLog.
------------------------------------------------------------------------
r5701 | marko | 2009-08-27 03:01:42 -0400 (Thu, 27 Aug 2009) | 1 line
branches/zip: Document r5698 in the ChangeLog.
------------------------------------------------------------------------
r5698 | inaam | 2009-08-26 10:34:35 -0400 (Wed, 26 Aug 2009) | 13 lines
branches/zip bug#42885 rb://148
The call to put IO threads to sleep was most probably meant for Windows
only as the comment in buf0rea.c suggests. However it was enabled on
all platforms. This patch restricts the sleep call to windows. This
approach of not putting threads to sleep makes even more sense because
now we have multiple threads working in the background and it probably
is not a good idea to put all of them to sleep because a user thread
wants to post a batch for readahead.
Approved by: Marko
------------------------------------------------------------------------
r5697 | vasil | 2009-08-26 09:44:40 -0400 (Wed, 26 Aug 2009) | 4 lines
branches/zip:
Fix typo.
------------------------------------------------------------------------
r5696 | vasil | 2009-08-26 09:15:59 -0400 (Wed, 26 Aug 2009) | 14 lines
branches/zip:
Merge a change from MySQL:
http://lists.mysql.com/commits/80832
2968 Jonathan Perkin 2009-08-14
Build fixes for Windows, AIX, HP/UX and Sun Studio11, from Timothy Smith.
modified:
CMakeLists.txt
cmd-line-utils/readline/util.c
storage/innodb_plugin/handler/i_s.cc
storage/innodb_plugin/include/univ.i
------------------------------------------------------------------------
r5695 | marko | 2009-08-26 09:14:59 -0400 (Wed, 26 Aug 2009) | 1 line
branches/zip: UNIV_DEBUG_LOCK_VALIDATE: Move the definition to univ.i.
------------------------------------------------------------------------
r5694 | marko | 2009-08-26 07:25:26 -0400 (Wed, 26 Aug 2009) | 2 lines
branches/zip: buf_page_t: Clarify that bpage->list may contain garbage.
This comment was provoked by Inaam.
------------------------------------------------------------------------
r5687 | vasil | 2009-08-20 05:20:22 -0400 (Thu, 20 Aug 2009) | 8 lines
branches/zip:
ChangeLog:
Follow the convention from the rest of the ChangeLog: for bugfixes from
bugs.mysql.com only the bug number and title goes in the ChangeLog. Detailed
explanation on what is the problem and how it was fixed is present in
the bugs database.
------------------------------------------------------------------------
r5686 | vasil | 2009-08-20 05:15:05 -0400 (Thu, 20 Aug 2009) | 4 lines
branches/zip:
White-space fixup.
------------------------------------------------------------------------
r5685 | sunny | 2009-08-20 04:18:29 -0400 (Thu, 20 Aug 2009) | 2 lines
branches/zip: Update the ChangeLog with r5684 change.
------------------------------------------------------------------------
r5684 | sunny | 2009-08-20 04:05:30 -0400 (Thu, 20 Aug 2009) | 10 lines
branches/zip: Fix bug# 46650: Innodb assertion autoinc_lock == lock in lock_table_remove_low on INSERT SELECT
We only store the autoinc locks that are granted in the transaction's autoinc
lock vector. A transacton, that has been rolled back due to a deadlock because
of an AUTOINC lock attempt, will not have added that lock to the vector. We
need to check for that when we remove that lock.
rb://145
Approved by Marko.
------------------------------------------------------------------------
r5681 | sunny | 2009-08-14 02:16:24 -0400 (Fri, 14 Aug 2009) | 3 lines
branches/zip: When building HotBackup srv_use_sys_malloc is #ifdef out. We
move access to the this variable within a !UNIV_HOTBACKUP block.
------------------------------------------------------------------------
r5671 | marko | 2009-08-13 04:46:33 -0400 (Thu, 13 Aug 2009) | 5 lines
branches/zip: ha_innobase::add_index(): Fix Bug #46557:
after a successful operation, read innodb_table->flags from
the newly created table object, not from the old one that was just freed.
Approved by Sunny.
------------------------------------------------------------------------
r5670 | marko | 2009-08-12 09:16:37 -0400 (Wed, 12 Aug 2009) | 2 lines
branches/zip: trx_undo_rec_copy(): Add const qualifier to undo_rec.
This is a non-functional change.
------------------------------------------------------------------------
r5663 | marko | 2009-08-11 07:42:37 -0400 (Tue, 11 Aug 2009) | 2 lines
branches/zip: trx_general_rollback_for_mysql(): Remove the redundant
parameter partial. If savept==NULL, partial==FALSE.
------------------------------------------------------------------------
r5662 | marko | 2009-08-11 05:54:16 -0400 (Tue, 11 Aug 2009) | 1 line
branches/zip: Bump the version number to 1.0.5 after releasing 1.0.4.
------------------------------------------------------------------------
r5642 | calvin | 2009-08-06 19:04:03 -0400 (Thu, 06 Aug 2009) | 2 lines
branches/zip: remove duplicate "the" in comments.
------------------------------------------------------------------------
r5639 | marko | 2009-08-06 06:39:34 -0400 (Thu, 06 Aug 2009) | 3 lines
branches/zip: mem_heap_block_free(): If innodb_use_sys_malloc is set,
do not tell Valgrind that the memory is free, to avoid
a bogus warning in Valgrind's built-in free() hook.
------------------------------------------------------------------------
r5636 | marko | 2009-08-05 08:27:30 -0400 (Wed, 05 Aug 2009) | 2 lines
branches/zip: lock_rec_validate_page(): Add the parameter zip_size.
This should help track down Mantis Issue #289.
------------------------------------------------------------------------
r5635 | marko | 2009-08-05 07:06:55 -0400 (Wed, 05 Aug 2009) | 2 lines
branches/zip: Replace <number> with NUMBER in some comments,
to avoid problems with Doxygen XML output.
------------------------------------------------------------------------
r5629 | marko | 2009-08-04 07:42:44 -0400 (Tue, 04 Aug 2009) | 1 line
branches/zip: mysql-test: Pass MTR's internal checks.
------------------------------------------------------------------------
r5626 | vasil | 2009-08-04 01:53:31 -0400 (Tue, 04 Aug 2009) | 4 lines
branches/zip:
Revert the dummy change from c5625.
------------------------------------------------------------------------
r5625 | vasil | 2009-08-04 01:52:48 -0400 (Tue, 04 Aug 2009) | 32 lines
branches/zip: Merge 5518:5622 from branches/5.1, resolving conflict in r5622
(after resolving the conflict Makefile.am was not changed so I have made
a dummy change so I can commit and thus record that branches/5.1 has been
merged in branches/zip up to 5622):
------------------------------------------------------------------------
r5622 | vasil | 2009-08-03 15:27:00 +0300 (Mon, 03 Aug 2009) | 20 lines
Changed paths:
M /branches/5.1/Makefile.am
branches/5.1:
Merge a change from MySQL:
------------------------------------------------------------
revno: 2988
committer: Satya B <satya.bn@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Wed 2009-07-01 11:06:05 +0530
message:
Fix build failure after applying Innodb snapshot 5.1-ss5282
After applying Innodb snapshot 5.1-ss5282, build was broken
because of missing header file.
Adding the header file to Makefile.am after informing the
innodb developers.
modified:
storage/innobase/Makefile.am
------------------------------------------------------------------------
------------------------------------------------------------------------
r5614 | vasil | 2009-07-31 11:09:07 -0400 (Fri, 31 Jul 2009) | 6 lines
branches/zip:
Add fsp0types.h to the list of noinst_HEADERS
Suggested by: Sergey Vojtovich <svoj@sun.com>
------------------------------------------------------------------------
r5539 | vasil | 2009-07-21 06:28:27 -0400 (Tue, 21 Jul 2009) | 4 lines
branches/zip:
Add a test program to check whether the PAUSE instruction is available.
------------------------------------------------------------------------
r5537 | vasil | 2009-07-21 05:31:26 -0400 (Tue, 21 Jul 2009) | 5 lines
branches/zip:
Fixups in ChangeLog: sort filenames alphabetically and wrap to 78 chars per
line.
------------------------------------------------------------------------
r5527 | sunny | 2009-07-20 17:56:30 -0400 (Mon, 20 Jul 2009) | 2 lines
branches/zip: For HotBackup builds we don't want to hide the symbols.
------------------------------------------------------------------------
r5525 | calvin | 2009-07-20 13:14:30 -0400 (Mon, 20 Jul 2009) | 2 lines
branches/zip: add ChangeLog entry for r5524.
------------------------------------------------------------------------
2009-09-28 19:34:23 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
array = type.is_read() ? AIO::s_reads : AIO::s_writes;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case OS_AIO_IBUF:
|
|
|
|
ut_ad(type.is_read());
|
|
|
|
|
|
|
|
/* Reduce probability of deadlock bugs in connection with ibuf:
|
|
|
|
do not let the ibuf i/o handler sleep */
|
|
|
|
|
|
|
|
type.clear_do_not_wake();
|
|
|
|
|
|
|
|
array = read_only ? AIO::s_reads : AIO::s_ibuf;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case OS_AIO_LOG:
|
|
|
|
|
|
|
|
array = read_only ? AIO::s_reads : AIO::s_log;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case OS_AIO_SYNC:
|
|
|
|
|
|
|
|
array = AIO::s_sync;
|
|
|
|
#if defined(LINUX_NATIVE_AIO)
|
|
|
|
/* In Linux native AIO we don't use sync IO array. */
|
|
|
|
ut_a(!srv_use_native_aio);
|
|
|
|
#endif /* LINUX_NATIVE_AIO */
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
ut_error;
|
|
|
|
array = NULL; /* Eliminate compiler warning */
|
branches/innodb+: Merged revisions 5525:5971 from branches/zip
------------------------------------------------------------------------
r5971 | marko | 2009-09-23 09:03:51 -0400 (Wed, 23 Sep 2009) | 2 lines
branches/zip: os_file_pwrite(): Make the code compile in InnoDB Hot Backup
when the pwrite system call is not available.
------------------------------------------------------------------------
r5956 | calvin | 2009-09-22 19:30:10 -0400 (Tue, 22 Sep 2009) | 4 lines
branches/zip: remove handler0vars.h from Makefile.am
Left over from r5950.
------------------------------------------------------------------------
r5951 | calvin | 2009-09-22 11:17:01 -0400 (Tue, 22 Sep 2009) | 4 lines
branches/zip: adjust CMake file to work with old versions of MySQL
Tested with MySQL 5.1.38 and 5.1.30.
------------------------------------------------------------------------
r5950 | calvin | 2009-09-22 02:42:46 -0400 (Tue, 22 Sep 2009) | 17 lines
branches/zip: adjust Windows loading method for 5.1.38
Starting at 5.1.38, MySQL server exports symbols needed
for dynamic plugin on Windows. There is no need for
Windows specific loading. Also, the CMake files are
simplified in 5.1.38.
When WITH_INNOBASE_STORAGE_ENGINE is specified during
configuration (win\configure.js), InnoDB is built as
a static library. Otherwise, a dynamic InnoDB will be
built (ha_innodb.dll).
CMakeLists.txt requires minor changes in order to work
with MySQL prior to 5.1.38. The changes will be in a
separate patch.
This patch addresses Mantis issue#286.
------------------------------------------------------------------------
r5945 | calvin | 2009-09-21 10:53:22 -0400 (Mon, 21 Sep 2009) | 4 lines
branches/zip: fix a type in r5935
Should be innodb_open_files, spotted by Michael.
------------------------------------------------------------------------
r5940 | vasil | 2009-09-21 01:26:04 -0400 (Mon, 21 Sep 2009) | 4 lines
branches/zip:
Add ChangeLog entries for c5938.
------------------------------------------------------------------------
r5938 | calvin | 2009-09-19 03:14:25 -0400 (Sat, 19 Sep 2009) | 41 lines
branches/zip: Merge revisions 2584:2956 from branches/6.0,
except c2932.
Bug#37232 and bug#31183 were fixed in the 6.0 branch only.
They should be fixed in the plugin too, specially MySQL 6.0
is discontinued at this point.
------------------------------------------------------------------------
r2604 | inaam | 2008-08-21 09:37:06 -0500 (Thu, 21 Aug 2008) | 8 lines
branches/6.0 bug#37232
Relax locking behaviour for REPLACE INTO t SELECT ... FROM t1.
Now SELECT on t1 is performed as a consistent read when the isolation
level is set to READ COMMITTED.
Reviewed by: Heikki
------------------------------------------------------------------------
r2605 | inaam | 2008-08-21 09:59:33 -0500 (Thu, 21 Aug 2008) | 7 lines
branches/6.0
Added a comment to clarify why distinct calls to read MySQL binary
log file name and log position do not entail any race condition.
Suggested by: Heikki
------------------------------------------------------------------------
r2956 | inaam | 2008-11-04 04:47:30 -0600 (Tue, 04 Nov 2008) | 11 lines
branches/6.0 bug#31183
If the system tablespace runs out of space because 'autoextend' is
not specified with innodb_data_file_path there was no error message
printed to the error log. The client would get 'table full' error.
This patch prints an appropriate error message to the error log.
rb://43
Approved by: Marko
------------------------------------------------------------------------
------------------------------------------------------------------------
r5935 | calvin | 2009-09-18 17:08:02 -0400 (Fri, 18 Sep 2009) | 6 lines
branches/zip: fix bug#44338; minor non-functional changes
Bug#44338 innodb has message about non-existing option
innodb_max_files_open. Change the option to innodb_open_files.
The fix was committed into 6.0 branch.
------------------------------------------------------------------------
r5934 | vasil | 2009-09-18 13:06:46 -0400 (Fri, 18 Sep 2009) | 4 lines
branches/zip:
Fix typo.
------------------------------------------------------------------------
r5924 | vasil | 2009-09-18 00:59:30 -0400 (Fri, 18 Sep 2009) | 4 lines
branches/zip:
White space and formatting cleanup in the ChangeLog
------------------------------------------------------------------------
r5922 | marko | 2009-09-17 02:32:08 -0400 (Thu, 17 Sep 2009) | 4 lines
branches/zip: innodb-zip.test: Make the test work with zlib 1.2.3.3.
Apparently, the definition of compressBound() has slightly changed.
This has been filed as Mantis Issue #345.
------------------------------------------------------------------------
r5920 | vasil | 2009-09-16 14:47:22 -0400 (Wed, 16 Sep 2009) | 4 lines
branches/zip:
Add ChangeLog entries for r5916.
------------------------------------------------------------------------
r5919 | vasil | 2009-09-16 14:37:13 -0400 (Wed, 16 Sep 2009) | 4 lines
branches/zip:
Whitespace cleanup in the ChangeLog.
------------------------------------------------------------------------
r5917 | marko | 2009-09-16 05:56:23 -0400 (Wed, 16 Sep 2009) | 1 line
branches/zip: innobase_get_cset_width(): Cache the value of current_thd.
------------------------------------------------------------------------
r5916 | marko | 2009-09-16 05:54:43 -0400 (Wed, 16 Sep 2009) | 128 lines
branches/zip: Merge revisions 5622:5912 from branches/5.1, except r5700
(changes to CMakeLists.txt)
------------------------------------------------------------------------
r5622 | vasil | 2009-08-03 15:27:00 +0300 (Mon, 03 Aug 2009) | 20 lines
Changed paths:
M /branches/5.1/Makefile.am
branches/5.1:
Merge a change from MySQL:
------------------------------------------------------------
revno: 2988
committer: Satya B <satya.bn@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Wed 2009-07-01 11:06:05 +0530
message:
Fix build failure after applying Innodb snapshot 5.1-ss5282
After applying Innodb snapshot 5.1-ss5282, build was broken
because of missing header file.
Adding the header file to Makefile.am after informing the
innodb developers.
modified:
storage/innobase/Makefile.am
------------------------------------------------------------------------
r5740 | jyang | 2009-09-03 06:33:47 +0300 (Thu, 03 Sep 2009) | 5 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/db0err.h
A /branches/5.1/mysql-test/innodb_bug46000.result
A /branches/5.1/mysql-test/innodb_bug46000.test
branches/5.1: Disallow creating index with the name of
"GEN_CLUST_INDEX" which is reserved for the default system
primary index. (Bug #46000) rb://149 approved by Sunny Bains.
------------------------------------------------------------------------
r5741 | jyang | 2009-09-03 07:16:01 +0300 (Thu, 03 Sep 2009) | 5 lines
Changed paths:
M /branches/5.1/dict/dict0dict.c
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug44369.result
A /branches/5.1/mysql-test/innodb_bug44369.test
M /branches/5.1/row/row0mysql.c
branches/5.1: Block creating table with column name conflicting
with Innodb reserved key words. (Bug #44369) rb://151 approved
by Sunny Bains.
------------------------------------------------------------------------
r5757 | jyang | 2009-09-04 04:26:13 +0300 (Fri, 04 Sep 2009) | 3 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/db0err.h
D /branches/5.1/mysql-test/innodb_bug46000.result
D /branches/5.1/mysql-test/innodb_bug46000.test
branches/5.1: Revert change in 5740. Making the fix in a subsequent
check in.
------------------------------------------------------------------------
r5760 | jyang | 2009-09-04 07:07:34 +0300 (Fri, 04 Sep 2009) | 3 lines
Changed paths:
M /branches/5.1/dict/dict0dict.c
M /branches/5.1/handler/ha_innodb.cc
D /branches/5.1/mysql-test/innodb_bug44369.result
D /branches/5.1/mysql-test/innodb_bug44369.test
M /branches/5.1/row/row0mysql.c
branches/5.1: This is to revert change 5741. A return status for
create_table_def() needs to be fixed.
------------------------------------------------------------------------
r5797 | calvin | 2009-09-09 18:26:29 +0300 (Wed, 09 Sep 2009) | 3 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: merge change from 5.1.38
HA_ERR_TOO_MANY_CONCURRENT_TRXS is added in 5.1.38.
------------------------------------------------------------------------
r5799 | calvin | 2009-09-09 20:47:31 +0300 (Wed, 09 Sep 2009) | 10 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: fix bug#46256
Allow tables to be dropped even if the collation is not found,
but issue a warning.
Could not find an easy way to add mysql-test since it requires
changes to charsets and restarting the server. Tests were
executed manually.
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r5805 | vasil | 2009-09-10 08:41:48 +0300 (Thu, 10 Sep 2009) | 7 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Fix a compilation warning caused by c5799:
handler/ha_innodb.cc: In function 'void innobase_get_cset_width(ulint, ulint*, ulint*)':
handler/ha_innodb.cc:830: warning: format '%d' expects type 'int', but argument 2 has type 'ulint'
------------------------------------------------------------------------
r5834 | jyang | 2009-09-11 00:43:05 +0300 (Fri, 11 Sep 2009) | 5 lines
Changed paths:
M /branches/5.1/dict/dict0dict.c
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug44369.result
A /branches/5.1/mysql-test/innodb_bug44369.test
M /branches/5.1/row/row0mysql.c
branches/5.1: Block creating table with column name conflicting
with Innodb reserved key words. (Bug #44369) rb://151 approved
by Sunny Bains.
------------------------------------------------------------------------
r5895 | jyang | 2009-09-15 03:39:21 +0300 (Tue, 15 Sep 2009) | 5 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug46000.result
A /branches/5.1/mysql-test/innodb_bug46000.test
branches/5.1: Disallow creating index with the name of
"GEN_CLUST_INDEX" which is reserved for the default system
primary index. (Bug #46000) rb://149 approved by Marko Makela.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5910 | marko | 2009-09-16 04:07:21 -0400 (Wed, 16 Sep 2009) | 9 lines
branches/zip: Introduce UNIV_LOG_LSN_DEBUG and MLOG_LSN for redo log
diagnostics. This was written in order to better track down
Issue #313 in InnoDB Hot Backup.
MLOG_LSN: A new redo log entry type, for recording the current log
sequence number (LSN). This will be checked in an assertion in
recv_parse_log_rec().
rb://161, discussed with Sunny and Vasil.
------------------------------------------------------------------------
r5899 | marko | 2009-09-15 07:26:01 -0400 (Tue, 15 Sep 2009) | 4 lines
branches/zip: ut0ut.h: Do not #include "os0sync.h" #ifdef UNIV_HOTBACKUP.
Since r5872, the InnoDB Hot Backup build was broken.
Fix it by not defining any thread synchronization primitives in ut0ut.h.
InnoDB Hot Backup is a single-threaded program.
------------------------------------------------------------------------
r5898 | marko | 2009-09-15 06:18:50 -0400 (Tue, 15 Sep 2009) | 2 lines
branches/zip: Add */.dirstamp to svn:ignore,
for https://svn.innodb.com/svn/hotbackup/branches/3.5
------------------------------------------------------------------------
r5897 | marko | 2009-09-15 04:29:00 -0400 (Tue, 15 Sep 2009) | 8 lines
branches/zip: Avoid bogus messages about latching order violations when
UNIV_SYNC_DEBUG is defined.
sync_thread_levels_g(): Add the parameter "warn". Do not print
anything unless it is set.
sync_thread_add_level(): Pass warn=TRUE to sync_thread_levels_g()
when the check is within an assertion; FALSE if it is not.
------------------------------------------------------------------------
r5893 | inaam | 2009-09-14 11:20:48 -0400 (Mon, 14 Sep 2009) | 10 lines
branches/zip rb://159
In case of pages that are not made young the counter is incremented
only when the page in question is 'old'. In case of pages that are
made young the counter is incremented in case of all pages. For apple
to apple comparison this patch changes the 'young-making' counter to
consider only 'old' blocks.
Approved by: Marko
------------------------------------------------------------------------
r5889 | vasil | 2009-09-14 05:17:18 -0400 (Mon, 14 Sep 2009) | 5 lines
branches/zip:
Add missing return statement in the test program that could have
caused a warning.
------------------------------------------------------------------------
r5888 | vasil | 2009-09-14 04:38:45 -0400 (Mon, 14 Sep 2009) | 40 lines
branches/zip:
Back-merge c5880 and c5881 from branches/embedded-1.0:
------------------------------------------------------------------------
r5880 | vasil | 2009-09-12 17:28:44 +0300 (Sat, 12 Sep 2009) | 18 lines
Changed paths:
M /branches/embedded-1.0/configure.in
M /branches/embedded-1.0/include/os0sync.h
M /branches/embedded-1.0/srv/srv0start.c
branches/embedded-1.0:
Clean up and simplify the code that surrounds the atomic ops:
* Simplify the code that prints what atomics are used:
Instead of repeating the same conditions on which each atomics are used
use just one printf that prints a variable defined by the code which
chooses what atomics to use.
* In os0sync.h pick up each atomic variant only if it has been selected
by autoconf (based on IB_ATOMIC_MODE_* macros). Define the startup message
to be printed.
* In configure.in: check what user has chosen and if he has chosen
something that is not available, emit an error. If nothing has been chosen
explicitly by the user, auto select an option according to the described
logic in configure.in.
------------------------------------------------------------------------
r5881 | vasil | 2009-09-12 20:08:27 +0300 (Sat, 12 Sep 2009) | 4 lines
Changed paths:
M /branches/embedded-1.0/configure.in
branches/embedded-1.0:
Fix syntax error in test program.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5875 | vasil | 2009-09-12 08:11:25 -0400 (Sat, 12 Sep 2009) | 4 lines
branches/zip:
Remove unnecessary macro.
------------------------------------------------------------------------
r5872 | vasil | 2009-09-12 05:35:17 -0400 (Sat, 12 Sep 2009) | 5 lines
branches/zip:
Explicitly include os0sync.h to the places where HAVE_ATOMIC_BUILTINS and
INNODB_RW_LOCKS_USE_ATOMICS are used to avoid potential problems.
------------------------------------------------------------------------
r5871 | vasil | 2009-09-12 05:25:44 -0400 (Sat, 12 Sep 2009) | 6 lines
branches/zip:
Rename HAVE_SOLARIS_ATOMICS to HAVE_IB_SOLARIS_ATOMICS and
IB_HAVE_PAUSE_INSTRUCTION to HAVE_IB_PAUSE_INSTRUCTION so they
all follow the same HAVE_IB_* convention.
------------------------------------------------------------------------
r5870 | vasil | 2009-09-12 05:13:44 -0400 (Sat, 12 Sep 2009) | 7 lines
branches/zip:
Define HAVE_ATOMIC_BUILTINS and INNODB_RW_LOCKS_USE_ATOMICS in os0sync.h
instead of in univ.i. The code expects os_*() macros to be present if
HAVE_ATOMIC_BUILTINS and INNODB_RW_LOCKS_USE_ATOMICS are defined. So define
them next to defining the os_*() macros.
------------------------------------------------------------------------
r5869 | vasil | 2009-09-12 04:33:11 -0400 (Sat, 12 Sep 2009) | 15 lines
branches/zip:
Include ut0auxconf.h only if none of the macros it would define is defined.
The check when to include this header was outdated from the time when there
was only one macro involved.
Move the atomics checks that are in univ.i outside of
#if windows ... #else ... #endif
This simplifies the code and removes some duplicates like defining
HAVE_ATOMIC_BUILTINS if HAVE_WINDOWS_ATOMICS is defined in both branches.
Do not define the same macro HAVE_ATOMIC_PTHREAD_T for different events.
Instead define HAVE_IB_ATOMIC_PTHREAD_T_GCC and
HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS.
------------------------------------------------------------------------
r5868 | vasil | 2009-09-12 04:01:17 -0400 (Sat, 12 Sep 2009) | 6 lines
branches/zip:
Move the check whether to include ut0auxconf.h before everything because
we are now even checking for GCC atomics, we relied on MySQL to define
this macro before.
------------------------------------------------------------------------
r5867 | vasil | 2009-09-12 03:43:45 -0400 (Sat, 12 Sep 2009) | 4 lines
branches/zip:
Update comment to reflect reality.
------------------------------------------------------------------------
r5866 | vasil | 2009-09-12 03:30:08 -0400 (Sat, 12 Sep 2009) | 5 lines
branches/zip:
Add the check for GCC atomics to ut0auxconf* (copied from plug.in) because
we no longer rely on MySQL's HAVE_GCC_ATOMIC_BUILTINS.
------------------------------------------------------------------------
r5865 | vasil | 2009-09-12 03:26:03 -0400 (Sat, 12 Sep 2009) | 10 lines
branches/zip:
Simplify the compile time checks by splittig them into 5 independent checks:
* Whether GCC atomics are available
* Whether pthread_t can be used by GCC atomics
* Whether Solaris libc atomics are available
* Whether pthread_t can be used by Solaris libs atomics
* Checking the size of pthread_t
------------------------------------------------------------------------
r5864 | vasil | 2009-09-12 03:22:55 -0400 (Sat, 12 Sep 2009) | 4 lines
branches/zip:
Include string.h which is needed for memset().
------------------------------------------------------------------------
r5863 | vasil | 2009-09-12 03:07:08 -0400 (Sat, 12 Sep 2009) | 10 lines
branches/zip:
Check that pthread_t can indeed be passed to Solaris atomic functions, instead
of assuming that it can be passed if 0 can be assigned to it. It could be that:
* 0 can be assigned, but pthread_t cannot be passed and
* 0 cannot be assigned but pthread_t can be passed
Better to check what we are interested in, not something else and make
assumptions.
------------------------------------------------------------------------
r5858 | vasil | 2009-09-11 13:46:47 -0400 (Fri, 11 Sep 2009) | 4 lines
branches/zip:
Fix the indentation of the closing bracket.
------------------------------------------------------------------------
r5826 | marko | 2009-09-10 07:29:46 -0400 (Thu, 10 Sep 2009) | 12 lines
branches/zip: Roll back recovered dictionary transactions before
dropping incomplete indexes (Issue #337).
trx_rollback_or_clean_recovered(ibool all): New function, split from
trx_rollback_or_clean_all_recovered(). all==FALSE will only roll back
dictionary transactions.
recv_recovery_from_checkpoint_finish(): Call
trx_rollback_or_clean_recovered(FALSE) before
row_merge_drop_temp_indexes().
rb://158 approved by Sunny Bains
------------------------------------------------------------------------
r5825 | marko | 2009-09-10 06:47:09 -0400 (Thu, 10 Sep 2009) | 20 lines
branches/zip: Reduce mutex contention that was introduced when
addressing Bug #45015 (Issue #316), in r5703.
buf_page_set_accessed_make_young(): New auxiliary function, called by
buf_page_get_zip(), buf_page_get_gen(),
buf_page_optimistic_get_func(). Call ut_time_ms() outside of
buf_pool_mutex. Use cached access_time.
buf_page_set_accessed(): Add the parameter time_ms, so that
ut_time_ms() need not be called while holding buf_pool_mutex.
buf_page_optimistic_get_func(), buf_page_get_known_nowait(): Read
buf_page_t::access_time without holding buf_pool_mutex. This should be
OK, because the field is only used for heuristic purposes.
buf_page_peek_if_too_old(): If buf_pool->freed_page_clock == 0, return
FALSE, so that we will not waste time moving blocks in the LRU list in
the warm-up phase or when the workload fits in the buffer pool.
rb://156 approved by Sunny Bains
------------------------------------------------------------------------
r5822 | marko | 2009-09-10 06:10:20 -0400 (Thu, 10 Sep 2009) | 1 line
branches/zip: buf_page_release(): De-stutter the function comment.
------------------------------------------------------------------------
r5804 | marko | 2009-09-10 01:29:31 -0400 (Thu, 10 Sep 2009) | 1 line
branches/zip: trx_cleanup_at_db_startup(): Fix a typo in comment.
------------------------------------------------------------------------
r5798 | calvin | 2009-09-09 11:28:10 -0400 (Wed, 09 Sep 2009) | 5 lines
branches/zip:
HA_ERR_TOO_MANY_CONCURRENT_TRXS is added in 5.1.38.
But the plugin should still work with previous versions
of MySQL.
------------------------------------------------------------------------
r5792 | vasil | 2009-09-09 09:35:58 -0400 (Wed, 09 Sep 2009) | 32 lines
branches/zip:
Fix a bug in manipulating the variable innodb_old_blocks_pct:
for any value assigned it got that value -1, except for 75. When
assigned 75, it got 75.
mysql> set global innodb_old_blocks_pct=15;
Query OK, 0 rows affected (0.00 sec)
mysql> show variables like 'innodb_old_blocks_pct';
+-----------------------+-------+
| Variable_name | Value |
+-----------------------+-------+
| innodb_old_blocks_pct | 14 |
+-----------------------+-------+
1 row in set (0.00 sec)
mysql> set global innodb_old_blocks_pct=75;
Query OK, 0 rows affected (0.00 sec)
mysql> show variables like 'innodb_old_blocks_pct';
+-----------------------+-------+
| Variable_name | Value |
+-----------------------+-------+
| innodb_old_blocks_pct | 75 |
+-----------------------+-------+
After the fix it gets exactly what was assigned.
Approved by: Marko (via IM)
------------------------------------------------------------------------
r5783 | marko | 2009-09-09 03:25:00 -0400 (Wed, 09 Sep 2009) | 1 line
branches/zip: buf_page_is_accessed(): Correct the function comment.
------------------------------------------------------------------------
r5782 | marko | 2009-09-09 03:00:59 -0400 (Wed, 09 Sep 2009) | 2 lines
branches/zip: buf_page_peek_if_too_old(): Silence a compiler warning
that was introduced in r5779 on 32-bit systems.
------------------------------------------------------------------------
r5780 | marko | 2009-09-09 02:50:50 -0400 (Wed, 09 Sep 2009) | 1 line
branches/zip: ut_time_ms(): Return ulint, not uint.
------------------------------------------------------------------------
r5779 | marko | 2009-09-09 02:17:19 -0400 (Wed, 09 Sep 2009) | 2 lines
branches/zip: buf_page_peek_if_too_old(): Make the bitmasking work when
buf_pool->freed_page_clock is wider than 32 bits.
------------------------------------------------------------------------
r5777 | marko | 2009-09-08 11:50:25 -0400 (Tue, 08 Sep 2009) | 2 lines
branches/zip: Remove BUF_LRU_INITIAL_RATIO, which should have been removed
together with buf_LRU_get_recent_limit().
------------------------------------------------------------------------
r5775 | calvin | 2009-09-07 17:15:05 -0400 (Mon, 07 Sep 2009) | 13 lines
branches/zip: Build InnoDB on Windows with UNIV_HOTBACKUP
The changes are non-functional changes for normal InnoDB,
but needed for building the Hot Backup on Windows (with
UNIV_HOTBACKUP defined).
- Define os_aio_use_native_aio for HB.
- Do not acquire seek mutexes for backup since HB is single threaded.
- Do not use srv_flush_log_at_trx_commit for HB build
rb://155
Approved by: Marko
------------------------------------------------------------------------
r5752 | marko | 2009-09-03 10:55:51 -0400 (Thu, 03 Sep 2009) | 10 lines
branches/zip: recv_recover_page_func(): Write the log sequence number
to the compressed page, if there is one. Previously, the function only
wrote the LSN to the uncompressed page.
It is not clear why recv_recover_page_func() is updating FIL_PAGE_LSN
in the buffer pool. The log sequence number will be stamped on the
page when it is flushed to disk, in buf_flush_init_for_writing().
I noticed this inconsistency when analyzing Issue #313, but this patch
does not fix it. That is no surprise, since FIL_PAGE_LSN should only
matter on disk files, not in the buffer pool.
------------------------------------------------------------------------
r5751 | marko | 2009-09-03 10:36:15 -0400 (Thu, 03 Sep 2009) | 7 lines
branches/zip: row_merge(): Remove a bogus debug assertion
that was triggered when creating an index on an empty table.
row_merge_sort(): Add debug assertions and comments that justify
the loop termination condition.
The bogus assertion ut_ad(ihalf > 0) was reported by Michael.
------------------------------------------------------------------------
r5748 | marko | 2009-09-03 07:05:44 -0400 (Thu, 03 Sep 2009) | 1 line
branches/zip: MLOG_MULTI_REC_END: Correct the comment.
------------------------------------------------------------------------
r5747 | marko | 2009-09-03 06:46:38 -0400 (Thu, 03 Sep 2009) | 2 lines
branches/zip: recv_scan_log_recs(): Replace while with do...while,
because the termination condition will always hold on the first iteration.
------------------------------------------------------------------------
r5746 | marko | 2009-09-03 04:55:36 -0400 (Thu, 03 Sep 2009) | 2 lines
branches/zip: log_reserve_and_write_fast(): Do not cache the log_sys pointer
in a local variable.
------------------------------------------------------------------------
r5745 | marko | 2009-09-03 04:38:22 -0400 (Thu, 03 Sep 2009) | 2 lines
branches/zip: log_check_log_recs(): Enclose in #ifdef UNIV_LOG_DEBUG.
Add const qualifiers.
------------------------------------------------------------------------
r5744 | marko | 2009-09-03 04:28:35 -0400 (Thu, 03 Sep 2009) | 1 line
branches/zip: ut_align(): Make ptr const, like in ut_align_down().
------------------------------------------------------------------------
r5743 | marko | 2009-09-03 02:36:12 -0400 (Thu, 03 Sep 2009) | 3 lines
branches/zip: log_reserve_and_write_fast(): Remove the redundant
output parameter "success".
Success is also indicated by a nonzero return value.
------------------------------------------------------------------------
r5736 | marko | 2009-09-02 03:53:19 -0400 (Wed, 02 Sep 2009) | 1 line
branches/zip: Enclose some timestamp functions in #ifndef UNIV_HOTBACKUP.
------------------------------------------------------------------------
r5735 | marko | 2009-09-02 03:43:09 -0400 (Wed, 02 Sep 2009) | 2 lines
branches/zip: univ.i: Do not undefine PACKAGE or VERSION.
InnoDB source code does not refer to these macros.
------------------------------------------------------------------------
r5734 | sunny | 2009-09-02 03:08:45 -0400 (Wed, 02 Sep 2009) | 2 lines
branches/zip: Update ChangeLog with r5733 changes.
------------------------------------------------------------------------
r5733 | sunny | 2009-09-02 03:05:15 -0400 (Wed, 02 Sep 2009) | 6 lines
branches/zip: Fix a regression introduced by the fix for bug#26316. We check
whether a transaction holds any AUTOINC locks before we acquire the kernel
mutex and release those locks.
Fix for rb://153. Approved by Marko.
------------------------------------------------------------------------
r5716 | vasil | 2009-08-31 03:47:49 -0400 (Mon, 31 Aug 2009) | 9 lines
branches/zip:
Fix Bug#46718 InnoDB plugin incompatible with gcc 4.1 (at least: on PPC): "Undefined symbol"
by implementing our own check in plug.in instead of using the result from
the check from MySQL because it is insufficient.
Approved by: Marko (rb://154)
------------------------------------------------------------------------
r5714 | marko | 2009-08-31 02:10:10 -0400 (Mon, 31 Aug 2009) | 5 lines
branches/zip: buf_chunk_not_freed(): Do not acquire block->mutex unless
block->page.state == BUF_BLOCK_FILE_PAGE. Check that block->page.state
makes sense.
Approved by Sunny Bains over the IM.
------------------------------------------------------------------------
r5709 | inaam | 2009-08-28 02:22:46 -0400 (Fri, 28 Aug 2009) | 5 lines
branches/zip rb://152
Disable display of deprecated parameter innodb_file_io_threads in
'show variables'.
------------------------------------------------------------------------
r5708 | inaam | 2009-08-27 18:43:32 -0400 (Thu, 27 Aug 2009) | 4 lines
branches/zip
Remove redundant TRUE : FALSE from the return statement
------------------------------------------------------------------------
r5707 | inaam | 2009-08-27 12:20:35 -0400 (Thu, 27 Aug 2009) | 6 lines
branches/zip
Remove unused macros as we erased the random readahead code in r5703.
Also fixed some comments.
------------------------------------------------------------------------
r5706 | inaam | 2009-08-27 12:00:27 -0400 (Thu, 27 Aug 2009) | 20 lines
branches/zip rb://147
Done away with following two status variables:
innodb_buffer_pool_read_ahead_rnd
innodb_buffer_pool_read_ahead_seq
Introduced two new status variables:
innodb_buffer_pool_read_ahead = number of pages read as part of
readahead since server startup
innodb_buffer_pool_read_ahead_evicted = number of pages that are read
in as readahead but were evicted before ever being accessed since
server startup i.e.: a measure of how badly our readahead is
performing
SHOW INNODB STATUS will show two extra numbers in buffer pool section:
pages read ahead/sec and pages evicted without access/sec
Approved by: Marko
------------------------------------------------------------------------
r5705 | marko | 2009-08-27 07:56:24 -0400 (Thu, 27 Aug 2009) | 11 lines
branches/zip: dict_index_find_cols(): On column name lookup failure,
return DB_CORRUPTION (HA_ERR_CRASHED) instead of abnormally
terminating the server. Also, disable the previously added diagnostic
output to the error log, because mysql-test-run does not like extra
output in the error log. (Bug #44571)
dict_index_add_to_cache(): Handle errors from dict_index_find_cols().
mysql-test/innodb_bug44571.test: A test case for triggering the bug.
rb://135 approved by Sunny Bains.
------------------------------------------------------------------------
r5704 | marko | 2009-08-27 04:31:17 -0400 (Thu, 27 Aug 2009) | 32 lines
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
------------------------------------------------------------------------
r5703 | marko | 2009-08-27 03:25:00 -0400 (Thu, 27 Aug 2009) | 41 lines
branches/zip: Replace the constant 3/8 ratio that controls the LRU_old
size with the settable global variable innodb_old_blocks_pct. The
minimum and maximum values are 5 and 95 per cent, respectively. The
default is 100*3/8, in line with the old behavior.
ut_time_ms(): New utility function, to return the current time in
milliseconds. TODO: Is there a more efficient timestamp function, such
as rdtsc divided by a power of two?
buf_LRU_old_threshold_ms: New variable, corresponding to
innodb_old_blocks_time. The value 0 is the default behaviour: no
timeout before making blocks 'new'.
bpage->accessed, bpage->LRU_position, buf_pool->ulint_clock: Remove.
bpage->access_time: New field, replacing bpage->accessed. Protected by
buf_pool_mutex instead of bpage->mutex. Updated when a page is created
or accessed the first time in the buffer pool.
buf_LRU_old_ratio, innobase_old_blocks_pct: New variables,
corresponding to innodb_old_blocks_pct
buf_LRU_old_ratio_update(), innobase_old_blocks_pct_update(): Update
functions for buf_LRU_old_ratio, innobase_old_blocks_pct.
buf_page_peek_if_too_old(): Compare ut_time_ms() to bpage->access_time
if buf_LRU_old_threshold_ms && bpage->old. Else observe
buf_LRU_old_ratio and bpage->freed_page_clock.
buf_pool_t: Add n_pages_made_young, n_pages_not_made_young,
n_pages_made_young_old, n_pages_not_made_young, for statistics.
buf_print(): Display buf_pool->n_pages_made_young,
buf_pool->n_pages_not_made_young. This function is only for crash
diagnostics.
buf_print_io(): Display buf_pool->LRU_old_len and quantities derived
from buf_pool->n_pages_made_young, buf_pool->n_pages_not_made_young.
This function is invoked by SHOW ENGINE INNODB STATUS.
rb://129 approved by Heikki Tuuri. This addresses Bug #45015.
------------------------------------------------------------------------
r5702 | marko | 2009-08-27 03:03:15 -0400 (Thu, 27 Aug 2009) | 1 line
branches/zip: Document also the files affected by r5698 in the ChangeLog.
------------------------------------------------------------------------
r5701 | marko | 2009-08-27 03:01:42 -0400 (Thu, 27 Aug 2009) | 1 line
branches/zip: Document r5698 in the ChangeLog.
------------------------------------------------------------------------
r5698 | inaam | 2009-08-26 10:34:35 -0400 (Wed, 26 Aug 2009) | 13 lines
branches/zip bug#42885 rb://148
The call to put IO threads to sleep was most probably meant for Windows
only as the comment in buf0rea.c suggests. However it was enabled on
all platforms. This patch restricts the sleep call to windows. This
approach of not putting threads to sleep makes even more sense because
now we have multiple threads working in the background and it probably
is not a good idea to put all of them to sleep because a user thread
wants to post a batch for readahead.
Approved by: Marko
------------------------------------------------------------------------
r5697 | vasil | 2009-08-26 09:44:40 -0400 (Wed, 26 Aug 2009) | 4 lines
branches/zip:
Fix typo.
------------------------------------------------------------------------
r5696 | vasil | 2009-08-26 09:15:59 -0400 (Wed, 26 Aug 2009) | 14 lines
branches/zip:
Merge a change from MySQL:
http://lists.mysql.com/commits/80832
2968 Jonathan Perkin 2009-08-14
Build fixes for Windows, AIX, HP/UX and Sun Studio11, from Timothy Smith.
modified:
CMakeLists.txt
cmd-line-utils/readline/util.c
storage/innodb_plugin/handler/i_s.cc
storage/innodb_plugin/include/univ.i
------------------------------------------------------------------------
r5695 | marko | 2009-08-26 09:14:59 -0400 (Wed, 26 Aug 2009) | 1 line
branches/zip: UNIV_DEBUG_LOCK_VALIDATE: Move the definition to univ.i.
------------------------------------------------------------------------
r5694 | marko | 2009-08-26 07:25:26 -0400 (Wed, 26 Aug 2009) | 2 lines
branches/zip: buf_page_t: Clarify that bpage->list may contain garbage.
This comment was provoked by Inaam.
------------------------------------------------------------------------
r5687 | vasil | 2009-08-20 05:20:22 -0400 (Thu, 20 Aug 2009) | 8 lines
branches/zip:
ChangeLog:
Follow the convention from the rest of the ChangeLog: for bugfixes from
bugs.mysql.com only the bug number and title goes in the ChangeLog. Detailed
explanation on what is the problem and how it was fixed is present in
the bugs database.
------------------------------------------------------------------------
r5686 | vasil | 2009-08-20 05:15:05 -0400 (Thu, 20 Aug 2009) | 4 lines
branches/zip:
White-space fixup.
------------------------------------------------------------------------
r5685 | sunny | 2009-08-20 04:18:29 -0400 (Thu, 20 Aug 2009) | 2 lines
branches/zip: Update the ChangeLog with r5684 change.
------------------------------------------------------------------------
r5684 | sunny | 2009-08-20 04:05:30 -0400 (Thu, 20 Aug 2009) | 10 lines
branches/zip: Fix bug# 46650: Innodb assertion autoinc_lock == lock in lock_table_remove_low on INSERT SELECT
We only store the autoinc locks that are granted in the transaction's autoinc
lock vector. A transacton, that has been rolled back due to a deadlock because
of an AUTOINC lock attempt, will not have added that lock to the vector. We
need to check for that when we remove that lock.
rb://145
Approved by Marko.
------------------------------------------------------------------------
r5681 | sunny | 2009-08-14 02:16:24 -0400 (Fri, 14 Aug 2009) | 3 lines
branches/zip: When building HotBackup srv_use_sys_malloc is #ifdef out. We
move access to the this variable within a !UNIV_HOTBACKUP block.
------------------------------------------------------------------------
r5671 | marko | 2009-08-13 04:46:33 -0400 (Thu, 13 Aug 2009) | 5 lines
branches/zip: ha_innobase::add_index(): Fix Bug #46557:
after a successful operation, read innodb_table->flags from
the newly created table object, not from the old one that was just freed.
Approved by Sunny.
------------------------------------------------------------------------
r5670 | marko | 2009-08-12 09:16:37 -0400 (Wed, 12 Aug 2009) | 2 lines
branches/zip: trx_undo_rec_copy(): Add const qualifier to undo_rec.
This is a non-functional change.
------------------------------------------------------------------------
r5663 | marko | 2009-08-11 07:42:37 -0400 (Tue, 11 Aug 2009) | 2 lines
branches/zip: trx_general_rollback_for_mysql(): Remove the redundant
parameter partial. If savept==NULL, partial==FALSE.
------------------------------------------------------------------------
r5662 | marko | 2009-08-11 05:54:16 -0400 (Tue, 11 Aug 2009) | 1 line
branches/zip: Bump the version number to 1.0.5 after releasing 1.0.4.
------------------------------------------------------------------------
r5642 | calvin | 2009-08-06 19:04:03 -0400 (Thu, 06 Aug 2009) | 2 lines
branches/zip: remove duplicate "the" in comments.
------------------------------------------------------------------------
r5639 | marko | 2009-08-06 06:39:34 -0400 (Thu, 06 Aug 2009) | 3 lines
branches/zip: mem_heap_block_free(): If innodb_use_sys_malloc is set,
do not tell Valgrind that the memory is free, to avoid
a bogus warning in Valgrind's built-in free() hook.
------------------------------------------------------------------------
r5636 | marko | 2009-08-05 08:27:30 -0400 (Wed, 05 Aug 2009) | 2 lines
branches/zip: lock_rec_validate_page(): Add the parameter zip_size.
This should help track down Mantis Issue #289.
------------------------------------------------------------------------
r5635 | marko | 2009-08-05 07:06:55 -0400 (Wed, 05 Aug 2009) | 2 lines
branches/zip: Replace <number> with NUMBER in some comments,
to avoid problems with Doxygen XML output.
------------------------------------------------------------------------
r5629 | marko | 2009-08-04 07:42:44 -0400 (Tue, 04 Aug 2009) | 1 line
branches/zip: mysql-test: Pass MTR's internal checks.
------------------------------------------------------------------------
r5626 | vasil | 2009-08-04 01:53:31 -0400 (Tue, 04 Aug 2009) | 4 lines
branches/zip:
Revert the dummy change from c5625.
------------------------------------------------------------------------
r5625 | vasil | 2009-08-04 01:52:48 -0400 (Tue, 04 Aug 2009) | 32 lines
branches/zip: Merge 5518:5622 from branches/5.1, resolving conflict in r5622
(after resolving the conflict Makefile.am was not changed so I have made
a dummy change so I can commit and thus record that branches/5.1 has been
merged in branches/zip up to 5622):
------------------------------------------------------------------------
r5622 | vasil | 2009-08-03 15:27:00 +0300 (Mon, 03 Aug 2009) | 20 lines
Changed paths:
M /branches/5.1/Makefile.am
branches/5.1:
Merge a change from MySQL:
------------------------------------------------------------
revno: 2988
committer: Satya B <satya.bn@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Wed 2009-07-01 11:06:05 +0530
message:
Fix build failure after applying Innodb snapshot 5.1-ss5282
After applying Innodb snapshot 5.1-ss5282, build was broken
because of missing header file.
Adding the header file to Makefile.am after informing the
innodb developers.
modified:
storage/innobase/Makefile.am
------------------------------------------------------------------------
------------------------------------------------------------------------
r5614 | vasil | 2009-07-31 11:09:07 -0400 (Fri, 31 Jul 2009) | 6 lines
branches/zip:
Add fsp0types.h to the list of noinst_HEADERS
Suggested by: Sergey Vojtovich <svoj@sun.com>
------------------------------------------------------------------------
r5539 | vasil | 2009-07-21 06:28:27 -0400 (Tue, 21 Jul 2009) | 4 lines
branches/zip:
Add a test program to check whether the PAUSE instruction is available.
------------------------------------------------------------------------
r5537 | vasil | 2009-07-21 05:31:26 -0400 (Tue, 21 Jul 2009) | 5 lines
branches/zip:
Fixups in ChangeLog: sort filenames alphabetically and wrap to 78 chars per
line.
------------------------------------------------------------------------
r5527 | sunny | 2009-07-20 17:56:30 -0400 (Mon, 20 Jul 2009) | 2 lines
branches/zip: For HotBackup builds we don't want to hide the symbols.
------------------------------------------------------------------------
r5525 | calvin | 2009-07-20 13:14:30 -0400 (Mon, 20 Jul 2009) | 2 lines
branches/zip: add ChangeLog entry for r5524.
------------------------------------------------------------------------
2009-09-28 19:34:23 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(array);
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#ifdef WIN_ASYNC_IO
|
|
|
|
/** This function is only used in Windows asynchronous i/o.
|
|
|
|
Waits for an aio operation to complete. This function is used to wait the
|
|
|
|
for completed requests. The aio array of pending requests is divided
|
|
|
|
into segments. The thread specifies which segment or slot it wants to wait
|
|
|
|
for. NOTE: this function will also take care of freeing the aio slot,
|
|
|
|
therefore no other thread is allowed to do the freeing!
|
|
|
|
@param[in] segment The number of the segment in the aio arrays to
|
|
|
|
wait for; segment 0 is the ibuf I/O thread,
|
|
|
|
segment 1 the log I/O thread, then follow the
|
|
|
|
non-ibuf read threads, and as the last are the
|
|
|
|
non-ibuf write threads; if this is
|
|
|
|
ULINT_UNDEFINED, then it means that sync AIO
|
|
|
|
is used, and this parameter is ignored
|
|
|
|
@param[in] pos this parameter is used only in sync AIO:
|
|
|
|
wait for the aio slot at this position
|
|
|
|
@param[out] m1 the messages passed with the AIO request; note
|
|
|
|
that also in the case where the AIO operation
|
|
|
|
failed, these output parameters are valid and
|
|
|
|
can be used to restart the operation,
|
|
|
|
for example
|
|
|
|
@param[out] m2 callback message
|
|
|
|
@param[out] type OS_FILE_WRITE or ..._READ
|
|
|
|
@return DB_SUCCESS or error code */
|
2016-09-19 14:31:20 +02:00
|
|
|
|
|
|
|
#define READ_SEGMENT(s) (s < srv_n_read_io_threads)
|
|
|
|
#define WRITE_SEGMENT(s) !READ_SEGMENT(s)
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
static
|
|
|
|
dberr_t
|
|
|
|
os_aio_windows_handler(
|
|
|
|
ulint segment,
|
|
|
|
ulint pos,
|
|
|
|
fil_node_t** m1,
|
|
|
|
void** m2,
|
|
|
|
IORequest* type)
|
|
|
|
{
|
2016-09-19 14:31:20 +02:00
|
|
|
Slot* slot= 0;
|
2016-08-12 10:17:45 +02:00
|
|
|
dberr_t err;
|
|
|
|
|
2016-09-19 14:31:20 +02:00
|
|
|
BOOL ret;
|
|
|
|
ULONG_PTR key;
|
|
|
|
|
|
|
|
ut_a(segment != ULINT_UNDEFINED);
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
/* NOTE! We only access constant fields in os_aio_array. Therefore
|
|
|
|
we do not have to acquire the protecting mutex yet */
|
|
|
|
|
|
|
|
ut_ad(os_aio_validate_skip());
|
|
|
|
|
2016-09-19 14:31:20 +02:00
|
|
|
HANDLE port = READ_SEGMENT(segment) ? read_completion_port : completion_port;
|
|
|
|
for (;;) {
|
|
|
|
DWORD len;
|
|
|
|
ret = GetQueuedCompletionStatus(port, &len, &key,
|
|
|
|
(OVERLAPPED **)&slot, INFINITE);
|
2016-08-12 10:17:45 +02:00
|
|
|
|
2016-09-19 14:31:20 +02:00
|
|
|
/* If shutdown key was received, repost the shutdown message and exit */
|
|
|
|
if (ret && key == IOCP_SHUTDOWN_KEY) {
|
|
|
|
PostQueuedCompletionStatus(port, 0, key, NULL);
|
|
|
|
*m1 = NULL;
|
|
|
|
*m2 = NULL;
|
|
|
|
return (DB_SUCCESS);
|
2016-08-12 10:17:45 +02:00
|
|
|
}
|
|
|
|
|
2016-09-19 14:31:20 +02:00
|
|
|
ut_a(slot);
|
2016-09-13 23:55:21 +02:00
|
|
|
|
2016-09-19 14:31:20 +02:00
|
|
|
if (!ret) {
|
|
|
|
/* IO failed */
|
|
|
|
break;
|
2016-09-13 23:55:21 +02:00
|
|
|
}
|
2016-08-12 10:17:45 +02:00
|
|
|
|
2016-09-19 14:31:20 +02:00
|
|
|
slot->n_bytes= len;
|
|
|
|
|
|
|
|
if (WRITE_SEGMENT(segment) && slot->type.is_read()) {
|
|
|
|
/*
|
|
|
|
Redirect read completions to the dedicated completion port
|
|
|
|
and thread. We need to split read and write threads. If we do not
|
|
|
|
do that, and just allow all io threads process all IO, it is possible
|
|
|
|
to get stuck in a deadlock in buffer pool code,
|
|
|
|
|
|
|
|
Currently, the problem is solved this way - "write io" threads
|
|
|
|
always get all completion notifications, from both async reads and
|
|
|
|
writes. Write completion is handled in the same thread that gets it.
|
|
|
|
Read completion is forwarded via PostQueueCompletionStatus())
|
|
|
|
to the second completion port dedicated solely to reads. One of the
|
|
|
|
"read io" threads waiting on this port will finally handle the IO.
|
|
|
|
|
|
|
|
Forwarding IO completion this way costs a context switch , and this
|
|
|
|
seems tolerable since asynchronous reads are by far less frequent.
|
|
|
|
*/
|
|
|
|
ut_a(PostQueuedCompletionStatus(read_completion_port, len, key, &slot->control));
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
break;
|
|
|
|
}
|
2016-08-12 10:17:45 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
ut_a(slot->is_reserved);
|
|
|
|
|
|
|
|
*m1 = slot->m1;
|
|
|
|
*m2 = slot->m2;
|
|
|
|
|
|
|
|
*type = slot->type;
|
|
|
|
|
2016-09-19 14:31:20 +02:00
|
|
|
bool retry = false;
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
if (ret && slot->n_bytes == slot->len) {
|
|
|
|
|
|
|
|
err = DB_SUCCESS;
|
|
|
|
|
|
|
|
} else if (os_file_handle_error(slot->name, "Windows aio")) {
|
|
|
|
|
|
|
|
retry = true;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
err = DB_IO_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (retry) {
|
2016-09-19 14:31:20 +02:00
|
|
|
/* Retry failed read/write operation synchronously. */
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
#ifdef UNIV_PFS_IO
|
|
|
|
/* This read/write does not go through os_file_read
|
|
|
|
and os_file_write APIs, need to register with
|
|
|
|
performance schema explicitly here. */
|
|
|
|
struct PSI_file_locker* locker = NULL;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
register_pfs_file_io_begin(
|
|
|
|
locker, slot->file, slot->len,
|
|
|
|
slot->type.is_write()
|
|
|
|
? PSI_FILE_WRITE : PSI_FILE_READ, __FILE__, __LINE__);
|
|
|
|
#endif /* UNIV_PFS_IO */
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_a((slot->len & 0xFFFFFFFFUL) == slot->len);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ssize_t n_bytes = SyncFileIO::execute(slot);
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#ifdef UNIV_PFS_IO
|
|
|
|
register_pfs_file_io_end(locker, slot->len);
|
|
|
|
#endif /* UNIV_PFS_IO */
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
err = (n_bytes == slot->len) ? DB_SUCCESS : DB_IO_ERROR;
|
|
|
|
}
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (err == DB_SUCCESS) {
|
|
|
|
err = AIOHandler::post_io_processing(slot);
|
2009-01-13 19:20:49 +01:00
|
|
|
}
|
|
|
|
|
2016-09-19 14:31:20 +02:00
|
|
|
ut_a(slot->array);
|
|
|
|
slot->array->release_with_mutex(slot);
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-09-19 14:31:20 +02:00
|
|
|
if (srv_shutdown_state == SRV_SHUTDOWN_EXIT_THREADS
|
|
|
|
&& !buf_page_cleaner_is_active
|
|
|
|
&& os_aio_all_slots_free()) {
|
|
|
|
/* Last IO, wakeup other io threads */
|
|
|
|
AIO::wake_at_shutdown();
|
|
|
|
}
|
2016-08-12 10:17:45 +02:00
|
|
|
return(err);
|
|
|
|
}
|
|
|
|
#endif /* WIN_ASYNC_IO */
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/**
|
2010-03-29 09:34:42 +02:00
|
|
|
NOTE! Use the corresponding macro os_aio(), not directly this function!
|
2009-05-25 08:46:10 +02:00
|
|
|
Requests an asynchronous i/o operation.
|
2016-08-12 10:17:45 +02:00
|
|
|
@param[in] type IO request context
|
|
|
|
@param[in] mode IO mode
|
|
|
|
@param[in] name Name of the file or path as NUL terminated
|
|
|
|
string
|
|
|
|
@param[in] file Open file handle
|
|
|
|
@param[out] buf buffer where to read
|
|
|
|
@param[in] offset file offset where to read
|
|
|
|
@param[in] n number of bytes to read
|
|
|
|
@param[in] read_only if true read only mode checks are enforced
|
|
|
|
@param[in,out] m1 Message for the AIO handler, (can be used to
|
|
|
|
identify a completed AIO operation); ignored
|
|
|
|
if mode is OS_AIO_SYNC
|
|
|
|
@param[in,out] m2 message for the AIO handler (can be used to
|
|
|
|
identify a completed AIO operation); ignored
|
|
|
|
if mode is OS_AIO_SYNC
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
@return DB_SUCCESS or error code */
|
|
|
|
dberr_t
|
2010-03-29 09:34:42 +02:00
|
|
|
os_aio_func(
|
2016-08-12 10:17:45 +02:00
|
|
|
IORequest& type,
|
|
|
|
ulint mode,
|
|
|
|
const char* name,
|
|
|
|
os_file_t file,
|
|
|
|
void* buf,
|
|
|
|
os_offset_t offset,
|
|
|
|
ulint n,
|
|
|
|
bool read_only,
|
|
|
|
fil_node_t* m1,
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
void* m2)
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
|
|
|
#ifdef WIN_ASYNC_IO
|
2016-08-12 10:17:45 +02:00
|
|
|
BOOL ret = TRUE;
|
2009-01-29 10:50:23 +01:00
|
|
|
#endif /* WIN_ASYNC_IO */
|
2005-10-27 09:29:40 +02:00
|
|
|
|
|
|
|
ut_ad(n > 0);
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_ad((n % OS_FILE_LOG_BLOCK_SIZE) == 0);
|
|
|
|
ut_ad((offset % OS_FILE_LOG_BLOCK_SIZE) == 0);
|
2010-12-01 09:43:33 +01:00
|
|
|
ut_ad(os_aio_validate_skip());
|
2016-08-12 10:17:45 +02:00
|
|
|
|
2010-10-28 07:34:53 +02:00
|
|
|
#ifdef WIN_ASYNC_IO
|
|
|
|
ut_ad((n & 0xFFFFFFFFUL) == n);
|
2016-08-12 10:17:45 +02:00
|
|
|
#endif /* WIN_ASYNC_IO */
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2014-07-04 05:31:48 +02:00
|
|
|
DBUG_EXECUTE_IF("ib_os_aio_func_io_failure_28",
|
2015-03-09 17:21:48 +01:00
|
|
|
mode = OS_AIO_SYNC; os_has_said_disk_full = FALSE;);
|
2014-07-04 05:31:48 +02:00
|
|
|
|
2016-09-19 14:31:20 +02:00
|
|
|
if (mode == OS_AIO_SYNC) {
|
2016-08-12 10:17:45 +02:00
|
|
|
if (type.is_read()) {
|
|
|
|
return(os_file_read_func(type, file, buf, offset, n));
|
|
|
|
}
|
2014-07-04 05:31:48 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_ad(type.is_write());
|
2014-07-04 05:31:48 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(os_file_write_func(type, name, file, buf, offset, n));
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
try_again:
|
2015-03-09 17:21:48 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
AIO* array;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
array = AIO::select_slot_array(type, read_only, mode);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
Slot* slot;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
MDEV-11254: innodb-use-trim has no effect in 10.2
Problem was that implementation merged from 10.1 was incompatible
with InnoDB 5.7.
buf0buf.cc: Add functions to return should we punch hole and
how big.
buf0flu.cc: Add written page to IORequest
fil0fil.cc: Remove unneeded status call and add test is
sparse files and punch hole supported by file system when
tablespace is created. Add call to get file system
block size. Used file node is added to IORequest. Added
functions to check is punch hole supported and setting
punch hole.
ha_innodb.cc: Remove unneeded status variables (trim512-32768)
and trim_op_saved. Deprecate innodb_use_trim and
set it ON by default. Add function to set innodb-use-trim
dynamically.
dberr.h: Add error code DB_IO_NO_PUNCH_HOLE
if punch hole operation fails.
fil0fil.h: Add punch_hole variable to fil_space_t and
block size to fil_node_t.
os0api.h: Header to helper functions on buf0buf.cc and
fil0fil.cc for os0file.h
os0file.h: Remove unneeded m_block_size from IORequest
and add bpage to IORequest to know actual size of
the block and m_fil_node to know tablespace file
system block size and does it support punch hole.
os0file.cc: Add function punch_hole() to IORequest
to do punch_hole operation,
get the file system block size and determine
does file system support sparse files (for punch hole).
page0size.h: remove implicit copy disable and
use this implicit copy to implement copy_from()
function.
buf0dblwr.cc, buf0flu.cc, buf0rea.cc, fil0fil.cc, fil0fil.h,
os0file.h, os0file.cc, log0log.cc, log0recv.cc:
Remove unneeded write_size parameter from fil_io
calls.
srv0mon.h, srv0srv.h, srv0mon.cc: Remove unneeded
trim512-trim32678 status variables. Removed
these from monitor tests.
2017-01-24 13:40:58 +01:00
|
|
|
slot = array->reserve_slot(type, m1, m2, file, name, buf, offset, n);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (type.is_read()) {
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2013-12-19 13:36:38 +01:00
|
|
|
|
2009-01-13 19:20:49 +01:00
|
|
|
if (srv_use_native_aio) {
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
++os_n_file_reads;
|
|
|
|
|
2009-01-13 19:20:49 +01:00
|
|
|
os_bytes_read_since_printout += n;
|
|
|
|
#ifdef WIN_ASYNC_IO
|
2016-08-12 10:17:45 +02:00
|
|
|
ret = ReadFile(
|
|
|
|
file, slot->ptr, slot->len,
|
|
|
|
&slot->n_bytes, &slot->control);
|
2009-01-13 19:20:49 +01:00
|
|
|
|
|
|
|
#elif defined(LINUX_NATIVE_AIO)
|
2016-08-12 10:17:45 +02:00
|
|
|
if (!array->linux_dispatch(slot)) {
|
2009-01-13 19:20:49 +01:00
|
|
|
goto err_exit;
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
#endif /* WIN_ASYNC_IO */
|
2016-08-12 10:17:45 +02:00
|
|
|
} else if (type.is_wake()) {
|
|
|
|
AIO::wake_simulated_handler_thread(
|
|
|
|
AIO::get_segment_no_from_slot(array, slot));
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
2016-08-12 10:17:45 +02:00
|
|
|
} else if (type.is_write()) {
|
|
|
|
|
2009-01-13 19:20:49 +01:00
|
|
|
if (srv_use_native_aio) {
|
2016-08-12 10:17:45 +02:00
|
|
|
++os_n_file_writes;
|
2015-01-09 11:30:59 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#ifdef WIN_ASYNC_IO
|
|
|
|
ret = WriteFile(
|
|
|
|
file, slot->ptr, slot->len,
|
|
|
|
&slot->n_bytes, &slot->control);
|
2009-01-13 19:20:49 +01:00
|
|
|
|
|
|
|
#elif defined(LINUX_NATIVE_AIO)
|
2016-08-12 10:17:45 +02:00
|
|
|
if (!array->linux_dispatch(slot)) {
|
2009-01-13 19:20:49 +01:00
|
|
|
goto err_exit;
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
#endif /* WIN_ASYNC_IO */
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
} else if (type.is_wake()) {
|
|
|
|
AIO::wake_simulated_handler_thread(
|
|
|
|
AIO::get_segment_no_from_slot(array, slot));
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
ut_error;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef WIN_ASYNC_IO
|
2016-09-19 14:31:20 +02:00
|
|
|
if ((ret && slot->len == slot->n_bytes)
|
|
|
|
|| (!ret && GetLastError() == ERROR_IO_PENDING)) {
|
|
|
|
/* aio completed or was queued successfully! */
|
|
|
|
return(DB_SUCCESS);
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-09-19 14:31:20 +02:00
|
|
|
goto err_exit;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2009-01-29 10:50:23 +01:00
|
|
|
#endif /* WIN_ASYNC_IO */
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
/* AIO request was queued successfully! */
|
|
|
|
return(DB_SUCCESS);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2009-01-29 10:50:23 +01:00
|
|
|
#if defined LINUX_NATIVE_AIO || defined WIN_ASYNC_IO
|
2009-01-13 19:20:49 +01:00
|
|
|
err_exit:
|
2009-01-29 10:50:23 +01:00
|
|
|
#endif /* LINUX_NATIVE_AIO || WIN_ASYNC_IO */
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
array->release_with_mutex(slot);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (os_file_handle_error(
|
2016-08-12 10:17:45 +02:00
|
|
|
name, type.is_read() ? "aio read" : "aio write")) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
|
|
|
goto try_again;
|
2006-02-23 20:25:29 +01:00
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(DB_IO_ERROR);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Simulated AIO handler for reaping IO requests */
|
|
|
|
class SimulatedAIOHandler {
|
|
|
|
|
|
|
|
public:
|
|
|
|
|
|
|
|
/** Constructor
|
|
|
|
@param[in,out] array The AIO array
|
|
|
|
@param[in] segment Local segment in the array */
|
|
|
|
SimulatedAIOHandler(AIO* array, ulint segment)
|
|
|
|
:
|
|
|
|
m_oldest(),
|
|
|
|
m_n_elems(),
|
|
|
|
m_lowest_offset(IB_UINT64_MAX),
|
|
|
|
m_array(array),
|
|
|
|
m_n_slots(),
|
|
|
|
m_segment(segment),
|
|
|
|
m_ptr(),
|
|
|
|
m_buf()
|
|
|
|
{
|
|
|
|
ut_ad(m_segment < 100);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
m_slots.resize(OS_AIO_MERGE_N_CONSECUTIVE);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Destructor */
|
|
|
|
~SimulatedAIOHandler()
|
|
|
|
{
|
|
|
|
if (m_ptr != NULL) {
|
|
|
|
ut_free(m_ptr);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2010-07-20 22:42:31 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Reset the state of the handler
|
|
|
|
@param[in] n_slots Number of pending AIO operations supported */
|
|
|
|
void init(ulint n_slots)
|
|
|
|
{
|
|
|
|
m_oldest = 0;
|
|
|
|
m_n_elems = 0;
|
|
|
|
m_n_slots = n_slots;
|
|
|
|
m_lowest_offset = IB_UINT64_MAX;
|
|
|
|
|
|
|
|
if (m_ptr != NULL) {
|
|
|
|
ut_free(m_ptr);
|
|
|
|
m_ptr = m_buf = NULL;
|
|
|
|
}
|
2011-04-05 09:37:58 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
m_slots[0] = NULL;
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Check if there is a slot for which the i/o has already been done
|
|
|
|
@param[out] n_reserved Number of reserved slots
|
|
|
|
@return the first completed slot that is found. */
|
|
|
|
Slot* check_completed(ulint* n_reserved)
|
|
|
|
{
|
|
|
|
ulint offset = m_segment * m_n_slots;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
*n_reserved = 0;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
Slot* slot;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
slot = m_array->at(offset);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
for (ulint i = 0; i < m_n_slots; ++i, ++slot) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (slot->is_reserved) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (slot->io_already_done) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_a(slot->is_reserved);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(slot);
|
|
|
|
}
|
branches/innodb+: Merge revisions 6130:6364 from branches/zip:
------------------------------------------------------------------------
r6130 | marko | 2009-11-02 11:42:56 +0200 (Mon, 02 Nov 2009) | 9 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/btr/btr0sea.c
M /branches/zip/buf/buf0buf.c
M /branches/zip/dict/dict0dict.c
M /branches/zip/fil/fil0fil.c
M /branches/zip/ibuf/ibuf0ibuf.c
M /branches/zip/include/btr0sea.h
M /branches/zip/include/dict0dict.h
M /branches/zip/include/fil0fil.h
M /branches/zip/include/ibuf0ibuf.h
M /branches/zip/include/lock0lock.h
M /branches/zip/include/log0log.h
M /branches/zip/include/log0recv.h
M /branches/zip/include/mem0mem.h
M /branches/zip/include/mem0pool.h
M /branches/zip/include/os0file.h
M /branches/zip/include/pars0pars.h
M /branches/zip/include/srv0srv.h
M /branches/zip/include/thr0loc.h
M /branches/zip/include/trx0i_s.h
M /branches/zip/include/trx0purge.h
M /branches/zip/include/trx0rseg.h
M /branches/zip/include/trx0sys.h
M /branches/zip/include/trx0undo.h
M /branches/zip/include/usr0sess.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/log/log0recv.c
M /branches/zip/mem/mem0dbg.c
M /branches/zip/mem/mem0pool.c
M /branches/zip/os/os0file.c
M /branches/zip/os/os0sync.c
M /branches/zip/os/os0thread.c
M /branches/zip/pars/lexyy.c
M /branches/zip/pars/pars0lex.l
M /branches/zip/que/que0que.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
M /branches/zip/sync/sync0arr.c
M /branches/zip/sync/sync0sync.c
M /branches/zip/thr/thr0loc.c
M /branches/zip/trx/trx0i_s.c
M /branches/zip/trx/trx0purge.c
M /branches/zip/trx/trx0rseg.c
M /branches/zip/trx/trx0sys.c
M /branches/zip/trx/trx0undo.c
M /branches/zip/usr/usr0sess.c
M /branches/zip/ut/ut0mem.c
branches/zip: Free all resources at shutdown. Set pointers to NULL, so
that Valgrind will not complain about freed data structures that are
reachable via pointers. This addresses Bug #45992 and Bug #46656.
This patch is mostly based on changes copied from branches/embedded-1.0,
mainly c5432, c3439, c3134, c2994, c2978, but also some other code was
copied. Some added cleanup code is specific to MySQL/InnoDB.
rb://199 approved by Sunny Bains
------------------------------------------------------------------------
r6134 | marko | 2009-11-04 09:57:29 +0200 (Wed, 04 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
branches/zip: innobase_convert_identifier(): Convert table names with
explain_filename() to address Bug #32430: 'show innodb status'
causes errors Invalid (old?) table or database name in logs.
rb://134 approved by Sunny Bains
------------------------------------------------------------------------
r6137 | marko | 2009-11-04 15:24:28 +0200 (Wed, 04 Nov 2009) | 1 line
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_index_too_big_for_undo(): Correct a typo.
------------------------------------------------------------------------
r6153 | vasil | 2009-11-10 15:33:22 +0200 (Tue, 10 Nov 2009) | 145 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Merge r6125:6152 from branches/5.1:
(everything except the last white-space change was skipped as it is already
in branches/zip)
------------------------------------------------------------------------
r6127 | vasil | 2009-10-30 11:18:25 +0200 (Fri, 30 Oct 2009) | 18 lines
Changed paths:
M /branches/5.1/Makefile.am
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1:
Backport c6121 from branches/zip:
------------------------------------------------------------------------
r6121 | sunny | 2009-10-30 01:42:11 +0200 (Fri, 30 Oct 2009) | 7 lines
Changed paths:
M /branches/zip/mysql-test/innodb-autoinc.result
branches/zip: This test has been problematic for sometime now. The underlying
bug is that the data dictionaries get out of sync. In the AUTOINC code we
try and apply salve to the symptoms. In the past MySQL made some unrelated
change and the dictionaries stopped getting out of sync and this test started
to fail. Now, it seems they have reverted that changed and the test is
passing again. I suspect this is not he last time that this test will change.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6129 | vasil | 2009-10-30 17:14:22 +0200 (Fri, 30 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/Makefile.am
branches/5.1:
Revert a change to Makefile.am that sneaked unnoticed in c6127.
------------------------------------------------------------------------
r6136 | marko | 2009-11-04 12:28:10 +0200 (Wed, 04 Nov 2009) | 15 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/ha_prototypes.h
M /branches/5.1/ut/ut0ut.c
branches/5.1: Port r6134 from branches/zip:
------------------------------------------------------------------------
r6134 | marko | 2009-11-04 07:57:29 +0000 (Wed, 04 Nov 2009) | 5 lines
branches/zip: innobase_convert_identifier(): Convert table names with
explain_filename() to address Bug #32430: 'show innodb status'
causes errors Invalid (old?) table or database name in logs.
rb://134 approved by Sunny Bains
------------------------------------------------------------------------
innobase_print_identifier(): Replace with innobase_convert_name().
innobase_convert_identifier(): New function, called by innobase_convert_name().
------------------------------------------------------------------------
r6149 | vasil | 2009-11-09 11:15:01 +0200 (Mon, 09 Nov 2009) | 5 lines
Changed paths:
M /branches/5.1/CMakeLists.txt
branches/5.1:
Followup to r5700: Adjust the changes so they are the same as in the BZR
repository.
------------------------------------------------------------------------
r6150 | vasil | 2009-11-09 11:43:31 +0200 (Mon, 09 Nov 2009) | 58 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Merge a part of r2911.5.5 from MySQL:
(the other part of this was merged in c5700)
------------------------------------------------------------
revno: 2911.5.5
committer: Vladislav Vaintroub <vvaintroub@mysql.com>
branch nick: 5.1-innodb_plugin
timestamp: Wed 2009-06-10 10:59:49 +0200
message:
Backport WL#3653 to 5.1 to enable bundled innodb plugin.
Remove custom DLL loader code from innodb plugin code, use
symbols exported from mysqld.
removed:
storage/innodb_plugin/handler/handler0vars.h
storage/innodb_plugin/handler/win_delay_loader.cc
added:
storage/mysql_storage_engine.cmake
win/create_def_file.js
modified:
CMakeLists.txt
include/m_ctype.h
include/my_global.h
include/my_sys.h
include/mysql/plugin.h
libmysqld/CMakeLists.txt
mysql-test/mysql-test-run.pl
mysql-test/t/plugin.test
mysql-test/t/plugin_load-master.opt
mysys/charset.c
sql/CMakeLists.txt
sql/handler.h
sql/mysql_priv.h
sql/mysqld.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_list.h
sql/sql_profile.h
storage/Makefile.am
storage/archive/CMakeLists.txt
storage/blackhole/CMakeLists.txt
storage/csv/CMakeLists.txt
storage/example/CMakeLists.txt
storage/federated/CMakeLists.txt
storage/heap/CMakeLists.txt
storage/innobase/CMakeLists.txt
storage/innobase/handler/ha_innodb.cc
storage/innodb_plugin/CMakeLists.txt
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/handler0alter.cc
storage/innodb_plugin/handler/i_s.cc
storage/innodb_plugin/plug.in
storage/myisam/CMakeLists.txt
storage/myisammrg/CMakeLists.txt
win/Makefile.am
win/configure.js
------------------------------------------------------------------------
r6152 | vasil | 2009-11-10 15:30:20 +0200 (Tue, 10 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
White space fixup.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6157 | jyang | 2009-11-11 14:27:09 +0200 (Wed, 11 Nov 2009) | 10 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
A /branches/zip/mysql-test/innodb_bug47167.result
A /branches/zip/mysql-test/innodb_bug47167.test
M /branches/zip/mysql-test/innodb_file_format.result
branches/zip: Fix an issue that a local variable defined
in innodb_file_format_check_validate() is being referenced
across function in innodb_file_format_check_update().
In addition, fix "set global innodb_file_format_check =
DEFAULT" call.
Bug #47167: "set global innodb_file_format_check" cannot
set value by User-Defined Variable."
rb://169 approved by Sunny Bains and Marko.
------------------------------------------------------------------------
r6159 | vasil | 2009-11-11 15:13:01 +0200 (Wed, 11 Nov 2009) | 37 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
branches/zip:
Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)
------------------------------------------------------------
revno: 3092.5.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-09-24 15:52:52 +0100
message:
BUG#42829: binlogging enabled for all schemas regardless of
binlog-db-db / binlog-ignore-db
InnoDB will return an error if statement based replication is used
along with transaction isolation level READ-COMMITTED (or weaker),
even if the statement in question is filtered out according to the
binlog-do-db rules set. In this case, an error should not be printed.
This patch addresses this issue by extending the existing check in
external_lock to take into account the filter rules before deciding to
print an error. Furthermore, it also changes decide_logging_format to
take into consideration whether the statement is filtered out from
binlog before decision is made.
added:
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
modified:
sql/sql_base.cc
sql/sql_class.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
------------------------------------------------------------------------
r6160 | vasil | 2009-11-11 15:33:49 +0200 (Wed, 11 Nov 2009) | 72 lines
Changed paths:
M /branches/zip/include/os0file.h
M /branches/zip/os/os0file.c
branches/zip: Merge r6152:6159 from branches/5.1:
(r6158 was skipped as an equivallent change has already been merged from MySQL)
------------------------------------------------------------------------
r6154 | calvin | 2009-11-11 02:51:17 +0200 (Wed, 11 Nov 2009) | 17 lines
Changed paths:
M /branches/5.1/include/os0file.h
M /branches/5.1/os/os0file.c
branches/5.1: fix bug#3139: Mysql crashes: 'windows error 995'
after several selects on a large DB
During stress environment, Windows AIO may fail with error code
ERROR_OPERATION_ABORTED. InnoDB does not handle the error, rather
crashes. The cause of the error is unknown, but likely due to
faulty hardware or driver.
This patch introduces a new error code OS_FILE_OPERATION_ABORTED,
which maps to Windows ERROR_OPERATION_ABORTED (995). When the error
is detected during AIO, the InnoDB will issue a synchronous retry
(read/write).
This patch has been extensively tested by MySQL support.
Approved by: Marko
rb://196
------------------------------------------------------------------------
r6158 | vasil | 2009-11-11 14:52:14 +0200 (Wed, 11 Nov 2009) | 37 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/handler/ha_innodb.h
branches/5.1:
Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)
------------------------------------------------------------
revno: 3092.5.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-09-24 15:52:52 +0100
message:
BUG#42829: binlogging enabled for all schemas regardless of
binlog-db-db / binlog-ignore-db
InnoDB will return an error if statement based replication is used
along with transaction isolation level READ-COMMITTED (or weaker),
even if the statement in question is filtered out according to the
binlog-do-db rules set. In this case, an error should not be printed.
This patch addresses this issue by extending the existing check in
external_lock to take into account the filter rules before deciding to
print an error. Furthermore, it also changes decide_logging_format to
take into consideration whether the statement is filtered out from
binlog before decision is made.
added:
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
modified:
sql/sql_base.cc
sql/sql_class.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
------------------------------------------------------------------------
------------------------------------------------------------------------
r6161 | vasil | 2009-11-11 15:36:16 +0200 (Wed, 11 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add changelog entry for r6160.
------------------------------------------------------------------------
r6162 | vasil | 2009-11-11 16:00:12 +0200 (Wed, 11 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog for r6157.
------------------------------------------------------------------------
r6163 | calvin | 2009-11-11 17:53:20 +0200 (Wed, 11 Nov 2009) | 8 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
branches/zip: Exclude thd_binlog_filter_ok() when building
with older version of MySQL.
thd_binlog_filter_ok() is introduced in MySQL 5.1.41. But the
plugin can be built with MySQL prior to 5.1.41.
Approved by Heikki (on IM).
------------------------------------------------------------------------
r6169 | calvin | 2009-11-12 14:40:43 +0200 (Thu, 12 Nov 2009) | 6 lines
Changed paths:
A /branches/zip/mysql-test/innodb_bug46676.result
A /branches/zip/mysql-test/innodb_bug46676.test
branches/zip: add test case for bug#46676
This crash is reproducible with InnoDB plugin 1.0.4 + MySQL 5.1.37.
But no longer reproducible after MySQL 5.1.38 (with plugin 1.0.5).
Add test case to catch future regression.
------------------------------------------------------------------------
r6170 | marko | 2009-11-12 15:49:08 +0200 (Thu, 12 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/db0err.h
M /branches/zip/row/row0merge.c
M /branches/zip/row/row0mysql.c
branches/zip: Allow CREATE INDEX to be interrupted. (Issue #354)
rb://183 approved by Heikki Tuuri
------------------------------------------------------------------------
r6175 | vasil | 2009-11-16 20:07:39 +0200 (Mon, 16 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Wrap line at 78th char in the ChangeLog
------------------------------------------------------------------------
r6177 | calvin | 2009-11-16 20:20:38 +0200 (Mon, 16 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip: add an entry to ChangeLog for r6065
------------------------------------------------------------------------
r6179 | marko | 2009-11-17 10:19:34 +0200 (Tue, 17 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: ha_innobase::change_active_index(): When the history is
missing, report it to the client, not to the error log.
------------------------------------------------------------------------
r6181 | vasil | 2009-11-17 12:21:41 +0200 (Tue, 17 Nov 2009) | 33 lines
Changed paths:
M /branches/zip/mysql-test/innodb-index.test
branches/zip:
At the end of innodb-index.test: restore the environment as it was before
the test was started to silence this warning:
MTR's internal check of the test case 'main.innodb-index' failed.
This means that the test case does not preserve the state that existed
before the test case was executed. Most likely the test case did not
do a proper clean-up.
This is the diff of the states of the servers before and after the
test case was executed:
mysqltest: Logging to '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.log'.
mysqltest: Results saved in '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result'.
mysqltest: Connecting to server localhost:13000 (socket /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/mysqld.1.sock) as 'root', connection 'default', attempt 0 ...
mysqltest: ... Connected.
mysqltest: Start processing test commands from './include/check-testcase.test' ...
mysqltest: ... Done processing test commands.
--- /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result 2009-11-17 13:10:40.000000000 +0300
+++ /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.reject 2009-11-17 13:10:54.000000000 +0300
@@ -84,7 +84,7 @@
INNODB_DOUBLEWRITE ON
INNODB_FAST_SHUTDOWN 1
INNODB_FILE_FORMAT Antelope
-INNODB_FILE_FORMAT_CHECK Antelope
+INNODB_FILE_FORMAT_CHECK Barracuda
INNODB_FILE_PER_TABLE OFF
INNODB_FLUSH_LOG_AT_TRX_COMMIT 1
INNODB_FLUSH_METHOD
mysqltest: Result content mismatch
not ok
------------------------------------------------------------------------
r6182 | marko | 2009-11-17 13:49:15 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-consistent-master.opt
M /branches/zip/mysql-test/innodb-consistent.result
M /branches/zip/mysql-test/innodb-consistent.test
M /branches/zip/mysql-test/innodb-use-sys-malloc-master.opt
M /branches/zip/mysql-test/innodb-use-sys-malloc.result
M /branches/zip/mysql-test/innodb-use-sys-malloc.test
M /branches/zip/mysql-test/innodb_bug21704.result
M /branches/zip/mysql-test/innodb_bug21704.test
M /branches/zip/mysql-test/innodb_bug40360.test
M /branches/zip/mysql-test/innodb_bug40565.result
M /branches/zip/mysql-test/innodb_bug40565.test
M /branches/zip/mysql-test/innodb_bug41904.result
M /branches/zip/mysql-test/innodb_bug41904.test
M /branches/zip/mysql-test/innodb_bug42101-nonzero-master.opt
M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
M /branches/zip/mysql-test/innodb_bug42101.result
M /branches/zip/mysql-test/innodb_bug42101.test
M /branches/zip/mysql-test/innodb_bug44032.result
M /branches/zip/mysql-test/innodb_bug44032.test
M /branches/zip/mysql-test/innodb_bug44369.result
M /branches/zip/mysql-test/innodb_bug44369.test
M /branches/zip/mysql-test/innodb_bug44571.result
M /branches/zip/mysql-test/innodb_bug44571.test
M /branches/zip/mysql-test/innodb_bug45357.test
M /branches/zip/mysql-test/innodb_bug46000.result
M /branches/zip/mysql-test/innodb_bug46000.test
M /branches/zip/mysql-test/innodb_bug46676.result
M /branches/zip/mysql-test/innodb_bug46676.test
M /branches/zip/mysql-test/innodb_bug47167.result
M /branches/zip/mysql-test/innodb_bug47167.test
M /branches/zip/mysql-test/innodb_bug47777.result
M /branches/zip/mysql-test/innodb_bug47777.test
M /branches/zip/mysql-test/innodb_file_format.result
M /branches/zip/mysql-test/innodb_file_format.test
branches/zip: Set svn:eol-style on mysql-test files.
------------------------------------------------------------------------
r6183 | marko | 2009-11-17 13:51:16 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-consistent-master.opt
M /branches/zip/mysql-test/innodb-master.opt
M /branches/zip/mysql-test/innodb-semi-consistent-master.opt
M /branches/zip/mysql-test/innodb-use-sys-malloc-master.opt
M /branches/zip/mysql-test/innodb_bug42101-nonzero-master.opt
branches/zip: Prepend loose_ to plugin-only mysql-test options.
------------------------------------------------------------------------
r6184 | marko | 2009-11-17 13:52:01 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-index.result
M /branches/zip/mysql-test/innodb-index.test
branches/zip: innodb-index.test: Restore innodb_file_format_check.
------------------------------------------------------------------------
r6185 | marko | 2009-11-17 16:44:20 +0200 (Tue, 17 Nov 2009) | 16 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/mysql-test/innodb.result
M /branches/zip/mysql-test/innodb.test
M /branches/zip/mysql-test/innodb_bug44369.result
M /branches/zip/mysql-test/innodb_bug44369.test
D /branches/zip/mysql-test/patches/innodb-index.diff
M /branches/zip/row/row0mysql.c
branches/zip: Report duplicate table names
to the client connection, not to the error log. This change will allow
innodb-index.test to be re-enabled. It was previously disabled, because
mysql-test-run does not like output in the error log.
row_create_table_for_mysql(): Do not output anything to the error log
when reporting DB_DUPLICATE_KEY. Let the caller report the error.
Add a TODO comment that the dict_table_t object is apparently not freed
when an error occurs.
create_table_def(): Convert InnoDB table names to the character set
of the client connection for reporting. Use my_error(ER_WRONG_COLUMN_NAME)
for reporting reserved column names. Report my_error(ER_TABLE_EXISTS_ERROR)
when row_create_table_for_mysql() returns DB_DUPLICATE_KEY.
rb://206
------------------------------------------------------------------------
r6186 | vasil | 2009-11-17 16:48:14 +0200 (Tue, 17 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for r6185.
------------------------------------------------------------------------
r6189 | marko | 2009-11-18 11:36:18 +0200 (Wed, 18 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): When creating the primary key
and the table is being locked by another transaction,
do not attempt to drop the table. (Bug #48782)
Approved by Sunny Bains over IM
------------------------------------------------------------------------
r6194 | vasil | 2009-11-19 09:24:45 +0200 (Thu, 19 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/include/univ.i
branches/zip:
Increment version number from 1.0.5 to 1.0.6 since 1.0.5 was just released
by MySQL and we will soon release 1.0.6.
------------------------------------------------------------------------
r6197 | calvin | 2009-11-19 09:32:55 +0200 (Thu, 19 Nov 2009) | 6 lines
Changed paths:
M /branches/zip/CMakeLists.txt
branches/zip: merge the fix of bug#48317 (CMake file)
Due to MySQL changes to the CMake, it is no longer able
to build InnoDB plugin as a static library on Windows.
The fix is proposed by Vlad of MySQL.
------------------------------------------------------------------------
r6198 | vasil | 2009-11-19 09:44:31 +0200 (Thu, 19 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for r6197.
------------------------------------------------------------------------
r6199 | vasil | 2009-11-19 12:10:12 +0200 (Thu, 19 Nov 2009) | 31 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/btr/btr0btr.c
M /branches/zip/data/data0type.c
branches/zip: Merge r6159:6198 from branches/5.1:
------------------------------------------------------------------------
r6187 | jyang | 2009-11-18 05:27:30 +0200 (Wed, 18 Nov 2009) | 9 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1: Fix bug #48469 "when innodb tablespace is
configured too small, crash and corruption!". Function
btr_create() did not check the return status of fseg_create(),
and continue the index creation even there is no sufficient
space.
rb://205 Approved by Marko
------------------------------------------------------------------------
r6188 | jyang | 2009-11-18 07:14:23 +0200 (Wed, 18 Nov 2009) | 8 lines
Changed paths:
M /branches/5.1/data/data0type.c
branches/5.1: Fix bug #48526 "Data type for float and
double is incorrectly reported in InnoDB table monitor".
Certain datatypes are not printed correctly in
dtype_print().
rb://204 Approved by Marko.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6201 | marko | 2009-11-19 14:09:11 +0200 (Thu, 19 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): Clarify the comment
on orphaned tables when creating a primary key.
------------------------------------------------------------------------
r6202 | jyang | 2009-11-19 15:01:00 +0200 (Thu, 19 Nov 2009) | 8 lines
Changed paths:
M /branches/zip/btr/btr0btr.c
branches/zip: Function fseg_free() is no longer defined
in branches/zip. To port fix for bug #48469 to zip,
we can use btr_free_root() which frees the page,
and also does not require mini-transaction.
Approved by Marko.
------------------------------------------------------------------------
r6207 | vasil | 2009-11-20 10:19:14 +0200 (Fri, 20 Nov 2009) | 54 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Merge r6198:6206 from branches/5.1:
(r6203 was skipped as it is already in branches/zip)
------------------------------------------------------------------------
r6200 | vasil | 2009-11-19 12:14:23 +0200 (Thu, 19 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1:
White space fixup - indent under the opening (
------------------------------------------------------------------------
r6203 | jyang | 2009-11-19 15:12:22 +0200 (Thu, 19 Nov 2009) | 8 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1: Use btr_free_root() instead of fseg_free() for
the fix of bug #48469, because fseg_free() is not defined
in the zip branch. And we could save one mini-trasaction started
by fseg_free().
Approved by Marko.
------------------------------------------------------------------------
r6205 | jyang | 2009-11-20 07:55:48 +0200 (Fri, 20 Nov 2009) | 11 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Add a special case to handle the Duplicated Key error
and return DB_ERROR instead. This is to avoid a possible SIGSEGV
by mysql error handling re-entering the storage layer for dup key
info without proper table handle.
This is to prevent a server crash when error situation in bug
#45961 "DDL on partitioned innodb tables leaves data dictionary
in an inconsistent state" happens.
rb://157 approved by Sunny Bains.
------------------------------------------------------------------------
r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 5 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Fix a minor code formating issue for
the parenthesis iplacement of the if condition in
rename_table().
------------------------------------------------------------------------
------------------------------------------------------------------------
r6208 | vasil | 2009-11-20 10:49:24 +0200 (Fri, 20 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for c6207.
------------------------------------------------------------------------
r6210 | vasil | 2009-11-20 23:39:48 +0200 (Fri, 20 Nov 2009) | 3 lines
Changed paths:
M /branches/zip/trx/trx0i_s.c
branches/zip:
Whitespace fixup.
------------------------------------------------------------------------
r6248 | marko | 2009-11-30 12:19:50 +0200 (Mon, 30 Nov 2009) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: ChangeLog: Document r4922 that was forgotten.
------------------------------------------------------------------------
r6252 | marko | 2009-11-30 12:50:11 +0200 (Mon, 30 Nov 2009) | 23 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/dict/dict0boot.c
M /branches/zip/dict/dict0crea.c
M /branches/zip/dict/dict0load.c
M /branches/zip/dict/dict0mem.c
M /branches/zip/fil/fil0fil.c
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/dict0mem.h
M /branches/zip/row/row0mysql.c
branches/zip: Suppress errors about non-found temporary tables.
Write the is_temp flag to SYS_TABLES.MIX_LEN.
dict_table_t::flags: Add a flag for is_temporary, DICT_TF2_TEMPORARY.
Unlike other flags, this will not be written to the tablespace flags
or SYS_TABLES.TYPE, but only to SYS_TABLES.MIX_LEN.
dict_build_table_def_step(): Only pass DICT_TF_BITS to tablespaces.
dict_check_tablespaces_and_store_max_id(), dict_load_table():
Suppress errors about temporary tables not being found.
dict_create_sys_tables_tuple(): Write the DICT_TF2_TEMPORARY flag
to SYS_TABLES.MIX_LEN.
fil_space_create(), fil_create_new_single_table_tablespace(): Add assertions
about space->flags.
row_drop_table_for_mysql(): Do not complain about non-found temporary tables.
rb://160 approved by Heikki Tuuri. This addresses the second part of
Bug #41609 Crash recovery does not work for InnoDB temporary tables.
------------------------------------------------------------------------
r6263 | vasil | 2009-12-01 14:49:05 +0200 (Tue, 01 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/include/univ.i
branches/zip: Increment version number from 1.0.6 to 1.0.7
1.0.6 has been released
------------------------------------------------------------------------
r6264 | vasil | 2009-12-01 16:19:44 +0200 (Tue, 01 Dec 2009) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: Add ChangeLog entry for the release of 1.0.6.
------------------------------------------------------------------------
r6269 | marko | 2009-12-02 11:35:22 +0200 (Wed, 02 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/srv/srv0start.c
branches/zip: innobase_start_or_create_for_mysql(): UNIV_IBUF_DEBUG
should not break crash recovery, but UNIV_IBUF_COUNT_DEBUG will.
------------------------------------------------------------------------
r6270 | marko | 2009-12-02 11:36:47 +0200 (Wed, 02 Dec 2009) | 1 line
Changed paths:
M /branches/zip/srv/srv0start.c
branches/zip: innobase_start_or_create_for_mysql(): Log the zlib version.
------------------------------------------------------------------------
r6271 | marko | 2009-12-02 11:43:49 +0200 (Wed, 02 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/Makefile.am
M /branches/zip/include/univ.i
M /branches/zip/plug.in
branches/zip: ChangeLog: Document that since r6270, the zlib version number
will be displayed at start-up.
------------------------------------------------------------------------
r6272 | marko | 2009-12-02 11:46:05 +0200 (Wed, 02 Dec 2009) | 1 line
Changed paths:
M /branches/zip/Makefile.am
M /branches/zip/include/univ.i
M /branches/zip/plug.in
branches/zip: Revert changes that were accidentally committed in r6271.
------------------------------------------------------------------------
r6274 | marko | 2009-12-03 14:47:12 +0200 (Thu, 03 Dec 2009) | 6 lines
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_table_check_for_dup_indexes(): Assert that the
data dictionary mutex is being held while table->indexes is accessed.
This is already the case.
Currently, only dict_table_get_next_index() and dict_table_get_first_index()
are being invoked without holding dict_sys->mutex.
------------------------------------------------------------------------
r6275 | pekka | 2009-12-03 18:32:47 +0200 (Thu, 03 Dec 2009) | 10 lines
Changed paths:
M /branches/zip/include/log0recv.h
M /branches/zip/include/trx0sys.h
M /branches/zip/log/log0recv.c
M /branches/zip/trx/trx0sys.c
branches/zip: Minor changes which allow build with UNIV_HOTBACKUP
defined to succeed:
include/trx0sys.h: Allow Hot Backup build to see some
TRX_SYS_DOUBLEWRITE_... macros.
trx/trx0sys.c: Exclude trx_sys_close() function from Hot Backup build.
log/log0recv.[ch]: Exclude recv_sys_var_init() function from Hot Backup build.
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r6277 | marko | 2009-12-08 11:13:36 +0200 (Tue, 08 Dec 2009) | 1 line
Changed paths:
M /branches/zip/fsp/fsp0fsp.c
branches/zip: fsp0fsp.c: Add some missing in/out and const qualifiers.
------------------------------------------------------------------------
r6285 | marko | 2009-12-09 09:24:50 +0200 (Wed, 09 Dec 2009) | 13 lines
Changed paths:
M /branches/zip/row/row0sel.c
branches/zip: row_sel_fetch_columns(): Remove redundant code that was
accidentally added in r1591, which introduced dfield_t::ext in order
to make the merge sort of fast index creation support externally
stored columns,
Initially, I tried to allocate the bit for dfield_t::ext from
dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
to something that would fit in it. Then I decided that it would be
too risky. The redundant check was part of the mapping. The
condition may have been dfield_is_null() initially.
This redundant code was noticed by Sergey Petrunya on the MySQL
internals list.
------------------------------------------------------------------------
r6288 | marko | 2009-12-09 09:51:00 +0200 (Wed, 09 Dec 2009) | 15 lines
Changed paths:
M /branches/zip/row/row0upd.c
branches/zip: row_upd_copy_columns(): Remove redundant code that was
accidentally added in r1591, which introduced dfield_t::ext in order
to make the merge sort of fast index creation support externally
stored columns.
Initially, I tried to allocate the bit for dfield_t::ext from
dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
to something that would fit in it. Then I decided that it would be
too risky. The redundant check was part of the mapping. The
condition may have been dfield_is_null() initially.
This is similar to the redundant code in row_sel_fetch_columns() that
was noticed by Sergey Petrunya on the MySQL internals list and removed
in r6285. As far as I can tell, there are no redundant UNIV_SQL_NULL
assignments remaining after this change.
------------------------------------------------------------------------
r6305 | marko | 2009-12-14 13:03:57 +0200 (Mon, 14 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/row/row0umod.c
branches/zip: row_undo_mod_del_unmark_sec_and_undo_update(): Add a missing
const qualifier.
------------------------------------------------------------------------
r6309 | marko | 2009-12-15 14:05:50 +0200 (Tue, 15 Dec 2009) | 3 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: lock_rec_insert_check_and_lock(): Avoid casting away constness.
Use page_rec_get_next_const() instead. This silences a gcc 4.2.4 warning.
Reported by Sunny Bains.
------------------------------------------------------------------------
r6312 | marko | 2009-12-16 10:10:36 +0200 (Wed, 16 Dec 2009) | 6 lines
Changed paths:
M /branches/zip/fil/fil0fil.c
branches/zip: fil_close(): Add #ifndef UNIV_HOTBACKUP around a debug
assertion on mutex.magic_n. InnoDB Hot Backup is a single-threaded
program and does not contain mutexes. This change allows InnoDB Hot
Backup to be compiled with UNIV_DEBUG.
Suggested by Michael Izioumtchenko.
------------------------------------------------------------------------
r6321 | marko | 2009-12-16 16:16:33 +0200 (Wed, 16 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/row/row0merge.c
branches/zip: row_merge_drop_temp_indexes(): Revert a hack to
transaction isolation level that was made unnecessary by r5826 (Issue #337).
When this function is called, any active data dictionary transaction
should have been rolled back.
------------------------------------------------------------------------
r6345 | marko | 2009-12-21 10:46:14 +0200 (Mon, 21 Dec 2009) | 7 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_scan_log_recs(): Non-functional change: Replace a
debug assertion ut_ad(len > 0) with ut_ad(len >= OS_FILE_LOG_BLOCK_SIZE).
This change is only for readability, for Issue #428. Another
assertion on len being an integer multiple of OS_FILE_LOG_BLOCK_SIZE
already ensured together with the old ut_ad(len > 0) that actually len
must be at least OS_FILE_LOG_BLOCK_SIZE.
------------------------------------------------------------------------
r6346 | marko | 2009-12-21 12:03:25 +0200 (Mon, 21 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_recovery_from_checkpoint_finish():
Revert a change that was accidentally committed in r6345.
------------------------------------------------------------------------
r6348 | marko | 2009-12-22 11:04:34 +0200 (Tue, 22 Dec 2009) | 37 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/ha_prototypes.h
M /branches/zip/include/trx0trx.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/trx/trx0i_s.c
M /branches/zip/trx/trx0trx.c
branches/zip: Merge a change from MySQL:
------------------------------------------------------------
revno: 3236
committer: Satya B <satya.bn@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-12-01 17:48:57 +0530
message:
merge to mysql-5.1-bugteam
------------------------------------------------------------
revno: 3234.1.1
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-12-01 14:38:40 +0400
message:
Bug #38883 (reopened): thd_security_context is not thread safe, crashes?
manual merge 5.0-->5.1, updating InnoDB plugin.
------------------------------------------------------------
revno: 1810.3968.13
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.0-bugteam
timestamp: Tue 2009-12-01 14:24:44 +0400
message:
Bug #38883 (reopened): thd_security_context is not thread safe, crashes?
The bug 38816 changed the lock that protects THD::query from
LOCK_thread_count to LOCK_thd_data, but didn't update the associated
InnoDB functions.
1. The innobase_mysql_prepare_print_arbitrary_thd and the
innobase_mysql_end_print_arbitrary_thd InnoDB functions have been
removed, since now we have a per-thread mutex: now we don't need to wrap
several inter-thread access tries to THD::query with a single global
LOCK_thread_count lock, so we can simplify the code.
2. The innobase_mysql_print_thd function has been modified to lock
LOCK_thd_data in direct way.
------------------------------------------------------------------------
r6351 | marko | 2009-12-22 11:11:18 +0200 (Tue, 22 Dec 2009) | 1 line
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Remove an obsolete declaration of LOCK_thread_count.
------------------------------------------------------------------------
r6352 | marko | 2009-12-22 12:33:01 +0200 (Tue, 22 Dec 2009) | 104 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/lock0lock.h
M /branches/zip/include/srv0srv.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/mysql-test/innodb-autoinc.result
M /branches/zip/mysql-test/innodb-autoinc.test
M /branches/zip/row/row0sel.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
branches/zip: Merge revisions 6206:6350 from branches/5.1,
except r6347, r6349, r6350 which were committed separately
to both branches, and r6310, which was backported from zip to 5.1.
------------------------------------------------------------------------
r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 3 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Non-functional change, fix formatting.
------------------------------------------------------------------------
r6230 | sunny | 2009-11-24 23:52:43 +0200 (Tue, 24 Nov 2009) | 3 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
branches/5.1: Fix autoinc failing test results.
(this should be skipped when merging 5.1 into zip)
------------------------------------------------------------------------
r6231 | sunny | 2009-11-25 10:26:27 +0200 (Wed, 25 Nov 2009) | 7 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
M /branches/5.1/row/row0sel.c
branches/5.1: Fix BUG#49032 - auto_increment field does not initialize to last value in InnoDB Storage Engine.
We use the appropriate function to read the column value for non-integer
autoinc column types, namely float and double.
rb://208. Approved by Marko.
------------------------------------------------------------------------
r6232 | sunny | 2009-11-25 10:27:39 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix white space errors.
------------------------------------------------------------------------
r6233 | sunny | 2009-11-25 10:28:35 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/include/mach0data.h
M /branches/5.1/include/mach0data.ic
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix tests and make read float/double arg const.
------------------------------------------------------------------------
r6234 | sunny | 2009-11-25 10:29:03 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix whitepsace issues.
------------------------------------------------------------------------
r6235 | sunny | 2009-11-26 01:14:42 +0200 (Thu, 26 Nov 2009) | 9 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Fix Bug#47720 - REPLACE INTO Autoincrement column with negative values.
This bug is similiar to the negative autoinc filter patch from earlier,
with the additional handling of filtering out the negative column values
set explicitly by the user.
rb://184
Approved by Heikki.
------------------------------------------------------------------------
r6242 | vasil | 2009-11-27 22:07:12 +0200 (Fri, 27 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/export.sh
branches/5.1:
Minor changes to support plugin snapshots.
------------------------------------------------------------------------
r6306 | calvin | 2009-12-14 15:12:46 +0200 (Mon, 14 Dec 2009) | 5 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: fix bug#49267: innodb-autoinc.test fails on windows
because of different case mode
There is no change to the InnoDB code, only to fix test case by
changing "T1" to "t1".
------------------------------------------------------------------------
r6324 | jyang | 2009-12-17 06:54:24 +0200 (Thu, 17 Dec 2009) | 8 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/lock0lock.h
M /branches/5.1/include/srv0srv.h
M /branches/5.1/lock/lock0lock.c
M /branches/5.1/log/log0log.c
M /branches/5.1/srv/srv0srv.c
M /branches/5.1/srv/srv0start.c
branches/5.1: Fix bug #47814 - Diagnostics are frequently not
printed after a long lock wait in InnoDB. Separate out the
lock wait timeout check thread from monitor information
printing thread.
rb://200 Approved by Marko.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6364 | marko | 2009-12-26 21:06:31 +0200 (Sat, 26 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/ibuf/ibuf0ibuf.c
branches/zip: ibuf_bitmap_get_map_page():
Define a wrapper macro that passes __FILE__, __LINE__ of the caller
to buf_page_get_gen().
This will ease the diagnosis of the likes of Issue #135.
------------------------------------------------------------------------
2009-12-26 20:17:43 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
++*n_reserved;
|
2014-11-24 09:01:49 +01:00
|
|
|
}
|
|
|
|
}
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(NULL);
|
2006-02-23 20:25:29 +01:00
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** If there are at least 2 seconds old requests, then pick the
|
|
|
|
oldest one to prevent starvation. If several requests have the
|
|
|
|
same age, then pick the one at the lowest offset.
|
|
|
|
@return true if request was selected */
|
|
|
|
bool select()
|
|
|
|
{
|
|
|
|
if (!select_oldest()) {
|
branches/innodb+: Merge revisions 6130:6364 from branches/zip:
------------------------------------------------------------------------
r6130 | marko | 2009-11-02 11:42:56 +0200 (Mon, 02 Nov 2009) | 9 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/btr/btr0sea.c
M /branches/zip/buf/buf0buf.c
M /branches/zip/dict/dict0dict.c
M /branches/zip/fil/fil0fil.c
M /branches/zip/ibuf/ibuf0ibuf.c
M /branches/zip/include/btr0sea.h
M /branches/zip/include/dict0dict.h
M /branches/zip/include/fil0fil.h
M /branches/zip/include/ibuf0ibuf.h
M /branches/zip/include/lock0lock.h
M /branches/zip/include/log0log.h
M /branches/zip/include/log0recv.h
M /branches/zip/include/mem0mem.h
M /branches/zip/include/mem0pool.h
M /branches/zip/include/os0file.h
M /branches/zip/include/pars0pars.h
M /branches/zip/include/srv0srv.h
M /branches/zip/include/thr0loc.h
M /branches/zip/include/trx0i_s.h
M /branches/zip/include/trx0purge.h
M /branches/zip/include/trx0rseg.h
M /branches/zip/include/trx0sys.h
M /branches/zip/include/trx0undo.h
M /branches/zip/include/usr0sess.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/log/log0recv.c
M /branches/zip/mem/mem0dbg.c
M /branches/zip/mem/mem0pool.c
M /branches/zip/os/os0file.c
M /branches/zip/os/os0sync.c
M /branches/zip/os/os0thread.c
M /branches/zip/pars/lexyy.c
M /branches/zip/pars/pars0lex.l
M /branches/zip/que/que0que.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
M /branches/zip/sync/sync0arr.c
M /branches/zip/sync/sync0sync.c
M /branches/zip/thr/thr0loc.c
M /branches/zip/trx/trx0i_s.c
M /branches/zip/trx/trx0purge.c
M /branches/zip/trx/trx0rseg.c
M /branches/zip/trx/trx0sys.c
M /branches/zip/trx/trx0undo.c
M /branches/zip/usr/usr0sess.c
M /branches/zip/ut/ut0mem.c
branches/zip: Free all resources at shutdown. Set pointers to NULL, so
that Valgrind will not complain about freed data structures that are
reachable via pointers. This addresses Bug #45992 and Bug #46656.
This patch is mostly based on changes copied from branches/embedded-1.0,
mainly c5432, c3439, c3134, c2994, c2978, but also some other code was
copied. Some added cleanup code is specific to MySQL/InnoDB.
rb://199 approved by Sunny Bains
------------------------------------------------------------------------
r6134 | marko | 2009-11-04 09:57:29 +0200 (Wed, 04 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
branches/zip: innobase_convert_identifier(): Convert table names with
explain_filename() to address Bug #32430: 'show innodb status'
causes errors Invalid (old?) table or database name in logs.
rb://134 approved by Sunny Bains
------------------------------------------------------------------------
r6137 | marko | 2009-11-04 15:24:28 +0200 (Wed, 04 Nov 2009) | 1 line
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_index_too_big_for_undo(): Correct a typo.
------------------------------------------------------------------------
r6153 | vasil | 2009-11-10 15:33:22 +0200 (Tue, 10 Nov 2009) | 145 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Merge r6125:6152 from branches/5.1:
(everything except the last white-space change was skipped as it is already
in branches/zip)
------------------------------------------------------------------------
r6127 | vasil | 2009-10-30 11:18:25 +0200 (Fri, 30 Oct 2009) | 18 lines
Changed paths:
M /branches/5.1/Makefile.am
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1:
Backport c6121 from branches/zip:
------------------------------------------------------------------------
r6121 | sunny | 2009-10-30 01:42:11 +0200 (Fri, 30 Oct 2009) | 7 lines
Changed paths:
M /branches/zip/mysql-test/innodb-autoinc.result
branches/zip: This test has been problematic for sometime now. The underlying
bug is that the data dictionaries get out of sync. In the AUTOINC code we
try and apply salve to the symptoms. In the past MySQL made some unrelated
change and the dictionaries stopped getting out of sync and this test started
to fail. Now, it seems they have reverted that changed and the test is
passing again. I suspect this is not he last time that this test will change.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6129 | vasil | 2009-10-30 17:14:22 +0200 (Fri, 30 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/Makefile.am
branches/5.1:
Revert a change to Makefile.am that sneaked unnoticed in c6127.
------------------------------------------------------------------------
r6136 | marko | 2009-11-04 12:28:10 +0200 (Wed, 04 Nov 2009) | 15 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/ha_prototypes.h
M /branches/5.1/ut/ut0ut.c
branches/5.1: Port r6134 from branches/zip:
------------------------------------------------------------------------
r6134 | marko | 2009-11-04 07:57:29 +0000 (Wed, 04 Nov 2009) | 5 lines
branches/zip: innobase_convert_identifier(): Convert table names with
explain_filename() to address Bug #32430: 'show innodb status'
causes errors Invalid (old?) table or database name in logs.
rb://134 approved by Sunny Bains
------------------------------------------------------------------------
innobase_print_identifier(): Replace with innobase_convert_name().
innobase_convert_identifier(): New function, called by innobase_convert_name().
------------------------------------------------------------------------
r6149 | vasil | 2009-11-09 11:15:01 +0200 (Mon, 09 Nov 2009) | 5 lines
Changed paths:
M /branches/5.1/CMakeLists.txt
branches/5.1:
Followup to r5700: Adjust the changes so they are the same as in the BZR
repository.
------------------------------------------------------------------------
r6150 | vasil | 2009-11-09 11:43:31 +0200 (Mon, 09 Nov 2009) | 58 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Merge a part of r2911.5.5 from MySQL:
(the other part of this was merged in c5700)
------------------------------------------------------------
revno: 2911.5.5
committer: Vladislav Vaintroub <vvaintroub@mysql.com>
branch nick: 5.1-innodb_plugin
timestamp: Wed 2009-06-10 10:59:49 +0200
message:
Backport WL#3653 to 5.1 to enable bundled innodb plugin.
Remove custom DLL loader code from innodb plugin code, use
symbols exported from mysqld.
removed:
storage/innodb_plugin/handler/handler0vars.h
storage/innodb_plugin/handler/win_delay_loader.cc
added:
storage/mysql_storage_engine.cmake
win/create_def_file.js
modified:
CMakeLists.txt
include/m_ctype.h
include/my_global.h
include/my_sys.h
include/mysql/plugin.h
libmysqld/CMakeLists.txt
mysql-test/mysql-test-run.pl
mysql-test/t/plugin.test
mysql-test/t/plugin_load-master.opt
mysys/charset.c
sql/CMakeLists.txt
sql/handler.h
sql/mysql_priv.h
sql/mysqld.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_list.h
sql/sql_profile.h
storage/Makefile.am
storage/archive/CMakeLists.txt
storage/blackhole/CMakeLists.txt
storage/csv/CMakeLists.txt
storage/example/CMakeLists.txt
storage/federated/CMakeLists.txt
storage/heap/CMakeLists.txt
storage/innobase/CMakeLists.txt
storage/innobase/handler/ha_innodb.cc
storage/innodb_plugin/CMakeLists.txt
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/handler0alter.cc
storage/innodb_plugin/handler/i_s.cc
storage/innodb_plugin/plug.in
storage/myisam/CMakeLists.txt
storage/myisammrg/CMakeLists.txt
win/Makefile.am
win/configure.js
------------------------------------------------------------------------
r6152 | vasil | 2009-11-10 15:30:20 +0200 (Tue, 10 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
White space fixup.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6157 | jyang | 2009-11-11 14:27:09 +0200 (Wed, 11 Nov 2009) | 10 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
A /branches/zip/mysql-test/innodb_bug47167.result
A /branches/zip/mysql-test/innodb_bug47167.test
M /branches/zip/mysql-test/innodb_file_format.result
branches/zip: Fix an issue that a local variable defined
in innodb_file_format_check_validate() is being referenced
across function in innodb_file_format_check_update().
In addition, fix "set global innodb_file_format_check =
DEFAULT" call.
Bug #47167: "set global innodb_file_format_check" cannot
set value by User-Defined Variable."
rb://169 approved by Sunny Bains and Marko.
------------------------------------------------------------------------
r6159 | vasil | 2009-11-11 15:13:01 +0200 (Wed, 11 Nov 2009) | 37 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
branches/zip:
Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)
------------------------------------------------------------
revno: 3092.5.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-09-24 15:52:52 +0100
message:
BUG#42829: binlogging enabled for all schemas regardless of
binlog-db-db / binlog-ignore-db
InnoDB will return an error if statement based replication is used
along with transaction isolation level READ-COMMITTED (or weaker),
even if the statement in question is filtered out according to the
binlog-do-db rules set. In this case, an error should not be printed.
This patch addresses this issue by extending the existing check in
external_lock to take into account the filter rules before deciding to
print an error. Furthermore, it also changes decide_logging_format to
take into consideration whether the statement is filtered out from
binlog before decision is made.
added:
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
modified:
sql/sql_base.cc
sql/sql_class.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
------------------------------------------------------------------------
r6160 | vasil | 2009-11-11 15:33:49 +0200 (Wed, 11 Nov 2009) | 72 lines
Changed paths:
M /branches/zip/include/os0file.h
M /branches/zip/os/os0file.c
branches/zip: Merge r6152:6159 from branches/5.1:
(r6158 was skipped as an equivallent change has already been merged from MySQL)
------------------------------------------------------------------------
r6154 | calvin | 2009-11-11 02:51:17 +0200 (Wed, 11 Nov 2009) | 17 lines
Changed paths:
M /branches/5.1/include/os0file.h
M /branches/5.1/os/os0file.c
branches/5.1: fix bug#3139: Mysql crashes: 'windows error 995'
after several selects on a large DB
During stress environment, Windows AIO may fail with error code
ERROR_OPERATION_ABORTED. InnoDB does not handle the error, rather
crashes. The cause of the error is unknown, but likely due to
faulty hardware or driver.
This patch introduces a new error code OS_FILE_OPERATION_ABORTED,
which maps to Windows ERROR_OPERATION_ABORTED (995). When the error
is detected during AIO, the InnoDB will issue a synchronous retry
(read/write).
This patch has been extensively tested by MySQL support.
Approved by: Marko
rb://196
------------------------------------------------------------------------
r6158 | vasil | 2009-11-11 14:52:14 +0200 (Wed, 11 Nov 2009) | 37 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/handler/ha_innodb.h
branches/5.1:
Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)
------------------------------------------------------------
revno: 3092.5.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-09-24 15:52:52 +0100
message:
BUG#42829: binlogging enabled for all schemas regardless of
binlog-db-db / binlog-ignore-db
InnoDB will return an error if statement based replication is used
along with transaction isolation level READ-COMMITTED (or weaker),
even if the statement in question is filtered out according to the
binlog-do-db rules set. In this case, an error should not be printed.
This patch addresses this issue by extending the existing check in
external_lock to take into account the filter rules before deciding to
print an error. Furthermore, it also changes decide_logging_format to
take into consideration whether the statement is filtered out from
binlog before decision is made.
added:
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
modified:
sql/sql_base.cc
sql/sql_class.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
------------------------------------------------------------------------
------------------------------------------------------------------------
r6161 | vasil | 2009-11-11 15:36:16 +0200 (Wed, 11 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add changelog entry for r6160.
------------------------------------------------------------------------
r6162 | vasil | 2009-11-11 16:00:12 +0200 (Wed, 11 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog for r6157.
------------------------------------------------------------------------
r6163 | calvin | 2009-11-11 17:53:20 +0200 (Wed, 11 Nov 2009) | 8 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
branches/zip: Exclude thd_binlog_filter_ok() when building
with older version of MySQL.
thd_binlog_filter_ok() is introduced in MySQL 5.1.41. But the
plugin can be built with MySQL prior to 5.1.41.
Approved by Heikki (on IM).
------------------------------------------------------------------------
r6169 | calvin | 2009-11-12 14:40:43 +0200 (Thu, 12 Nov 2009) | 6 lines
Changed paths:
A /branches/zip/mysql-test/innodb_bug46676.result
A /branches/zip/mysql-test/innodb_bug46676.test
branches/zip: add test case for bug#46676
This crash is reproducible with InnoDB plugin 1.0.4 + MySQL 5.1.37.
But no longer reproducible after MySQL 5.1.38 (with plugin 1.0.5).
Add test case to catch future regression.
------------------------------------------------------------------------
r6170 | marko | 2009-11-12 15:49:08 +0200 (Thu, 12 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/db0err.h
M /branches/zip/row/row0merge.c
M /branches/zip/row/row0mysql.c
branches/zip: Allow CREATE INDEX to be interrupted. (Issue #354)
rb://183 approved by Heikki Tuuri
------------------------------------------------------------------------
r6175 | vasil | 2009-11-16 20:07:39 +0200 (Mon, 16 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Wrap line at 78th char in the ChangeLog
------------------------------------------------------------------------
r6177 | calvin | 2009-11-16 20:20:38 +0200 (Mon, 16 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip: add an entry to ChangeLog for r6065
------------------------------------------------------------------------
r6179 | marko | 2009-11-17 10:19:34 +0200 (Tue, 17 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: ha_innobase::change_active_index(): When the history is
missing, report it to the client, not to the error log.
------------------------------------------------------------------------
r6181 | vasil | 2009-11-17 12:21:41 +0200 (Tue, 17 Nov 2009) | 33 lines
Changed paths:
M /branches/zip/mysql-test/innodb-index.test
branches/zip:
At the end of innodb-index.test: restore the environment as it was before
the test was started to silence this warning:
MTR's internal check of the test case 'main.innodb-index' failed.
This means that the test case does not preserve the state that existed
before the test case was executed. Most likely the test case did not
do a proper clean-up.
This is the diff of the states of the servers before and after the
test case was executed:
mysqltest: Logging to '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.log'.
mysqltest: Results saved in '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result'.
mysqltest: Connecting to server localhost:13000 (socket /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/mysqld.1.sock) as 'root', connection 'default', attempt 0 ...
mysqltest: ... Connected.
mysqltest: Start processing test commands from './include/check-testcase.test' ...
mysqltest: ... Done processing test commands.
--- /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result 2009-11-17 13:10:40.000000000 +0300
+++ /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.reject 2009-11-17 13:10:54.000000000 +0300
@@ -84,7 +84,7 @@
INNODB_DOUBLEWRITE ON
INNODB_FAST_SHUTDOWN 1
INNODB_FILE_FORMAT Antelope
-INNODB_FILE_FORMAT_CHECK Antelope
+INNODB_FILE_FORMAT_CHECK Barracuda
INNODB_FILE_PER_TABLE OFF
INNODB_FLUSH_LOG_AT_TRX_COMMIT 1
INNODB_FLUSH_METHOD
mysqltest: Result content mismatch
not ok
------------------------------------------------------------------------
r6182 | marko | 2009-11-17 13:49:15 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-consistent-master.opt
M /branches/zip/mysql-test/innodb-consistent.result
M /branches/zip/mysql-test/innodb-consistent.test
M /branches/zip/mysql-test/innodb-use-sys-malloc-master.opt
M /branches/zip/mysql-test/innodb-use-sys-malloc.result
M /branches/zip/mysql-test/innodb-use-sys-malloc.test
M /branches/zip/mysql-test/innodb_bug21704.result
M /branches/zip/mysql-test/innodb_bug21704.test
M /branches/zip/mysql-test/innodb_bug40360.test
M /branches/zip/mysql-test/innodb_bug40565.result
M /branches/zip/mysql-test/innodb_bug40565.test
M /branches/zip/mysql-test/innodb_bug41904.result
M /branches/zip/mysql-test/innodb_bug41904.test
M /branches/zip/mysql-test/innodb_bug42101-nonzero-master.opt
M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
M /branches/zip/mysql-test/innodb_bug42101.result
M /branches/zip/mysql-test/innodb_bug42101.test
M /branches/zip/mysql-test/innodb_bug44032.result
M /branches/zip/mysql-test/innodb_bug44032.test
M /branches/zip/mysql-test/innodb_bug44369.result
M /branches/zip/mysql-test/innodb_bug44369.test
M /branches/zip/mysql-test/innodb_bug44571.result
M /branches/zip/mysql-test/innodb_bug44571.test
M /branches/zip/mysql-test/innodb_bug45357.test
M /branches/zip/mysql-test/innodb_bug46000.result
M /branches/zip/mysql-test/innodb_bug46000.test
M /branches/zip/mysql-test/innodb_bug46676.result
M /branches/zip/mysql-test/innodb_bug46676.test
M /branches/zip/mysql-test/innodb_bug47167.result
M /branches/zip/mysql-test/innodb_bug47167.test
M /branches/zip/mysql-test/innodb_bug47777.result
M /branches/zip/mysql-test/innodb_bug47777.test
M /branches/zip/mysql-test/innodb_file_format.result
M /branches/zip/mysql-test/innodb_file_format.test
branches/zip: Set svn:eol-style on mysql-test files.
------------------------------------------------------------------------
r6183 | marko | 2009-11-17 13:51:16 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-consistent-master.opt
M /branches/zip/mysql-test/innodb-master.opt
M /branches/zip/mysql-test/innodb-semi-consistent-master.opt
M /branches/zip/mysql-test/innodb-use-sys-malloc-master.opt
M /branches/zip/mysql-test/innodb_bug42101-nonzero-master.opt
branches/zip: Prepend loose_ to plugin-only mysql-test options.
------------------------------------------------------------------------
r6184 | marko | 2009-11-17 13:52:01 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-index.result
M /branches/zip/mysql-test/innodb-index.test
branches/zip: innodb-index.test: Restore innodb_file_format_check.
------------------------------------------------------------------------
r6185 | marko | 2009-11-17 16:44:20 +0200 (Tue, 17 Nov 2009) | 16 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/mysql-test/innodb.result
M /branches/zip/mysql-test/innodb.test
M /branches/zip/mysql-test/innodb_bug44369.result
M /branches/zip/mysql-test/innodb_bug44369.test
D /branches/zip/mysql-test/patches/innodb-index.diff
M /branches/zip/row/row0mysql.c
branches/zip: Report duplicate table names
to the client connection, not to the error log. This change will allow
innodb-index.test to be re-enabled. It was previously disabled, because
mysql-test-run does not like output in the error log.
row_create_table_for_mysql(): Do not output anything to the error log
when reporting DB_DUPLICATE_KEY. Let the caller report the error.
Add a TODO comment that the dict_table_t object is apparently not freed
when an error occurs.
create_table_def(): Convert InnoDB table names to the character set
of the client connection for reporting. Use my_error(ER_WRONG_COLUMN_NAME)
for reporting reserved column names. Report my_error(ER_TABLE_EXISTS_ERROR)
when row_create_table_for_mysql() returns DB_DUPLICATE_KEY.
rb://206
------------------------------------------------------------------------
r6186 | vasil | 2009-11-17 16:48:14 +0200 (Tue, 17 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for r6185.
------------------------------------------------------------------------
r6189 | marko | 2009-11-18 11:36:18 +0200 (Wed, 18 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): When creating the primary key
and the table is being locked by another transaction,
do not attempt to drop the table. (Bug #48782)
Approved by Sunny Bains over IM
------------------------------------------------------------------------
r6194 | vasil | 2009-11-19 09:24:45 +0200 (Thu, 19 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/include/univ.i
branches/zip:
Increment version number from 1.0.5 to 1.0.6 since 1.0.5 was just released
by MySQL and we will soon release 1.0.6.
------------------------------------------------------------------------
r6197 | calvin | 2009-11-19 09:32:55 +0200 (Thu, 19 Nov 2009) | 6 lines
Changed paths:
M /branches/zip/CMakeLists.txt
branches/zip: merge the fix of bug#48317 (CMake file)
Due to MySQL changes to the CMake, it is no longer able
to build InnoDB plugin as a static library on Windows.
The fix is proposed by Vlad of MySQL.
------------------------------------------------------------------------
r6198 | vasil | 2009-11-19 09:44:31 +0200 (Thu, 19 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for r6197.
------------------------------------------------------------------------
r6199 | vasil | 2009-11-19 12:10:12 +0200 (Thu, 19 Nov 2009) | 31 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/btr/btr0btr.c
M /branches/zip/data/data0type.c
branches/zip: Merge r6159:6198 from branches/5.1:
------------------------------------------------------------------------
r6187 | jyang | 2009-11-18 05:27:30 +0200 (Wed, 18 Nov 2009) | 9 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1: Fix bug #48469 "when innodb tablespace is
configured too small, crash and corruption!". Function
btr_create() did not check the return status of fseg_create(),
and continue the index creation even there is no sufficient
space.
rb://205 Approved by Marko
------------------------------------------------------------------------
r6188 | jyang | 2009-11-18 07:14:23 +0200 (Wed, 18 Nov 2009) | 8 lines
Changed paths:
M /branches/5.1/data/data0type.c
branches/5.1: Fix bug #48526 "Data type for float and
double is incorrectly reported in InnoDB table monitor".
Certain datatypes are not printed correctly in
dtype_print().
rb://204 Approved by Marko.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6201 | marko | 2009-11-19 14:09:11 +0200 (Thu, 19 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): Clarify the comment
on orphaned tables when creating a primary key.
------------------------------------------------------------------------
r6202 | jyang | 2009-11-19 15:01:00 +0200 (Thu, 19 Nov 2009) | 8 lines
Changed paths:
M /branches/zip/btr/btr0btr.c
branches/zip: Function fseg_free() is no longer defined
in branches/zip. To port fix for bug #48469 to zip,
we can use btr_free_root() which frees the page,
and also does not require mini-transaction.
Approved by Marko.
------------------------------------------------------------------------
r6207 | vasil | 2009-11-20 10:19:14 +0200 (Fri, 20 Nov 2009) | 54 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Merge r6198:6206 from branches/5.1:
(r6203 was skipped as it is already in branches/zip)
------------------------------------------------------------------------
r6200 | vasil | 2009-11-19 12:14:23 +0200 (Thu, 19 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1:
White space fixup - indent under the opening (
------------------------------------------------------------------------
r6203 | jyang | 2009-11-19 15:12:22 +0200 (Thu, 19 Nov 2009) | 8 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1: Use btr_free_root() instead of fseg_free() for
the fix of bug #48469, because fseg_free() is not defined
in the zip branch. And we could save one mini-trasaction started
by fseg_free().
Approved by Marko.
------------------------------------------------------------------------
r6205 | jyang | 2009-11-20 07:55:48 +0200 (Fri, 20 Nov 2009) | 11 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Add a special case to handle the Duplicated Key error
and return DB_ERROR instead. This is to avoid a possible SIGSEGV
by mysql error handling re-entering the storage layer for dup key
info without proper table handle.
This is to prevent a server crash when error situation in bug
#45961 "DDL on partitioned innodb tables leaves data dictionary
in an inconsistent state" happens.
rb://157 approved by Sunny Bains.
------------------------------------------------------------------------
r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 5 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Fix a minor code formating issue for
the parenthesis iplacement of the if condition in
rename_table().
------------------------------------------------------------------------
------------------------------------------------------------------------
r6208 | vasil | 2009-11-20 10:49:24 +0200 (Fri, 20 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for c6207.
------------------------------------------------------------------------
r6210 | vasil | 2009-11-20 23:39:48 +0200 (Fri, 20 Nov 2009) | 3 lines
Changed paths:
M /branches/zip/trx/trx0i_s.c
branches/zip:
Whitespace fixup.
------------------------------------------------------------------------
r6248 | marko | 2009-11-30 12:19:50 +0200 (Mon, 30 Nov 2009) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: ChangeLog: Document r4922 that was forgotten.
------------------------------------------------------------------------
r6252 | marko | 2009-11-30 12:50:11 +0200 (Mon, 30 Nov 2009) | 23 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/dict/dict0boot.c
M /branches/zip/dict/dict0crea.c
M /branches/zip/dict/dict0load.c
M /branches/zip/dict/dict0mem.c
M /branches/zip/fil/fil0fil.c
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/dict0mem.h
M /branches/zip/row/row0mysql.c
branches/zip: Suppress errors about non-found temporary tables.
Write the is_temp flag to SYS_TABLES.MIX_LEN.
dict_table_t::flags: Add a flag for is_temporary, DICT_TF2_TEMPORARY.
Unlike other flags, this will not be written to the tablespace flags
or SYS_TABLES.TYPE, but only to SYS_TABLES.MIX_LEN.
dict_build_table_def_step(): Only pass DICT_TF_BITS to tablespaces.
dict_check_tablespaces_and_store_max_id(), dict_load_table():
Suppress errors about temporary tables not being found.
dict_create_sys_tables_tuple(): Write the DICT_TF2_TEMPORARY flag
to SYS_TABLES.MIX_LEN.
fil_space_create(), fil_create_new_single_table_tablespace(): Add assertions
about space->flags.
row_drop_table_for_mysql(): Do not complain about non-found temporary tables.
rb://160 approved by Heikki Tuuri. This addresses the second part of
Bug #41609 Crash recovery does not work for InnoDB temporary tables.
------------------------------------------------------------------------
r6263 | vasil | 2009-12-01 14:49:05 +0200 (Tue, 01 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/include/univ.i
branches/zip: Increment version number from 1.0.6 to 1.0.7
1.0.6 has been released
------------------------------------------------------------------------
r6264 | vasil | 2009-12-01 16:19:44 +0200 (Tue, 01 Dec 2009) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: Add ChangeLog entry for the release of 1.0.6.
------------------------------------------------------------------------
r6269 | marko | 2009-12-02 11:35:22 +0200 (Wed, 02 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/srv/srv0start.c
branches/zip: innobase_start_or_create_for_mysql(): UNIV_IBUF_DEBUG
should not break crash recovery, but UNIV_IBUF_COUNT_DEBUG will.
------------------------------------------------------------------------
r6270 | marko | 2009-12-02 11:36:47 +0200 (Wed, 02 Dec 2009) | 1 line
Changed paths:
M /branches/zip/srv/srv0start.c
branches/zip: innobase_start_or_create_for_mysql(): Log the zlib version.
------------------------------------------------------------------------
r6271 | marko | 2009-12-02 11:43:49 +0200 (Wed, 02 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/Makefile.am
M /branches/zip/include/univ.i
M /branches/zip/plug.in
branches/zip: ChangeLog: Document that since r6270, the zlib version number
will be displayed at start-up.
------------------------------------------------------------------------
r6272 | marko | 2009-12-02 11:46:05 +0200 (Wed, 02 Dec 2009) | 1 line
Changed paths:
M /branches/zip/Makefile.am
M /branches/zip/include/univ.i
M /branches/zip/plug.in
branches/zip: Revert changes that were accidentally committed in r6271.
------------------------------------------------------------------------
r6274 | marko | 2009-12-03 14:47:12 +0200 (Thu, 03 Dec 2009) | 6 lines
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_table_check_for_dup_indexes(): Assert that the
data dictionary mutex is being held while table->indexes is accessed.
This is already the case.
Currently, only dict_table_get_next_index() and dict_table_get_first_index()
are being invoked without holding dict_sys->mutex.
------------------------------------------------------------------------
r6275 | pekka | 2009-12-03 18:32:47 +0200 (Thu, 03 Dec 2009) | 10 lines
Changed paths:
M /branches/zip/include/log0recv.h
M /branches/zip/include/trx0sys.h
M /branches/zip/log/log0recv.c
M /branches/zip/trx/trx0sys.c
branches/zip: Minor changes which allow build with UNIV_HOTBACKUP
defined to succeed:
include/trx0sys.h: Allow Hot Backup build to see some
TRX_SYS_DOUBLEWRITE_... macros.
trx/trx0sys.c: Exclude trx_sys_close() function from Hot Backup build.
log/log0recv.[ch]: Exclude recv_sys_var_init() function from Hot Backup build.
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r6277 | marko | 2009-12-08 11:13:36 +0200 (Tue, 08 Dec 2009) | 1 line
Changed paths:
M /branches/zip/fsp/fsp0fsp.c
branches/zip: fsp0fsp.c: Add some missing in/out and const qualifiers.
------------------------------------------------------------------------
r6285 | marko | 2009-12-09 09:24:50 +0200 (Wed, 09 Dec 2009) | 13 lines
Changed paths:
M /branches/zip/row/row0sel.c
branches/zip: row_sel_fetch_columns(): Remove redundant code that was
accidentally added in r1591, which introduced dfield_t::ext in order
to make the merge sort of fast index creation support externally
stored columns,
Initially, I tried to allocate the bit for dfield_t::ext from
dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
to something that would fit in it. Then I decided that it would be
too risky. The redundant check was part of the mapping. The
condition may have been dfield_is_null() initially.
This redundant code was noticed by Sergey Petrunya on the MySQL
internals list.
------------------------------------------------------------------------
r6288 | marko | 2009-12-09 09:51:00 +0200 (Wed, 09 Dec 2009) | 15 lines
Changed paths:
M /branches/zip/row/row0upd.c
branches/zip: row_upd_copy_columns(): Remove redundant code that was
accidentally added in r1591, which introduced dfield_t::ext in order
to make the merge sort of fast index creation support externally
stored columns.
Initially, I tried to allocate the bit for dfield_t::ext from
dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
to something that would fit in it. Then I decided that it would be
too risky. The redundant check was part of the mapping. The
condition may have been dfield_is_null() initially.
This is similar to the redundant code in row_sel_fetch_columns() that
was noticed by Sergey Petrunya on the MySQL internals list and removed
in r6285. As far as I can tell, there are no redundant UNIV_SQL_NULL
assignments remaining after this change.
------------------------------------------------------------------------
r6305 | marko | 2009-12-14 13:03:57 +0200 (Mon, 14 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/row/row0umod.c
branches/zip: row_undo_mod_del_unmark_sec_and_undo_update(): Add a missing
const qualifier.
------------------------------------------------------------------------
r6309 | marko | 2009-12-15 14:05:50 +0200 (Tue, 15 Dec 2009) | 3 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: lock_rec_insert_check_and_lock(): Avoid casting away constness.
Use page_rec_get_next_const() instead. This silences a gcc 4.2.4 warning.
Reported by Sunny Bains.
------------------------------------------------------------------------
r6312 | marko | 2009-12-16 10:10:36 +0200 (Wed, 16 Dec 2009) | 6 lines
Changed paths:
M /branches/zip/fil/fil0fil.c
branches/zip: fil_close(): Add #ifndef UNIV_HOTBACKUP around a debug
assertion on mutex.magic_n. InnoDB Hot Backup is a single-threaded
program and does not contain mutexes. This change allows InnoDB Hot
Backup to be compiled with UNIV_DEBUG.
Suggested by Michael Izioumtchenko.
------------------------------------------------------------------------
r6321 | marko | 2009-12-16 16:16:33 +0200 (Wed, 16 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/row/row0merge.c
branches/zip: row_merge_drop_temp_indexes(): Revert a hack to
transaction isolation level that was made unnecessary by r5826 (Issue #337).
When this function is called, any active data dictionary transaction
should have been rolled back.
------------------------------------------------------------------------
r6345 | marko | 2009-12-21 10:46:14 +0200 (Mon, 21 Dec 2009) | 7 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_scan_log_recs(): Non-functional change: Replace a
debug assertion ut_ad(len > 0) with ut_ad(len >= OS_FILE_LOG_BLOCK_SIZE).
This change is only for readability, for Issue #428. Another
assertion on len being an integer multiple of OS_FILE_LOG_BLOCK_SIZE
already ensured together with the old ut_ad(len > 0) that actually len
must be at least OS_FILE_LOG_BLOCK_SIZE.
------------------------------------------------------------------------
r6346 | marko | 2009-12-21 12:03:25 +0200 (Mon, 21 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_recovery_from_checkpoint_finish():
Revert a change that was accidentally committed in r6345.
------------------------------------------------------------------------
r6348 | marko | 2009-12-22 11:04:34 +0200 (Tue, 22 Dec 2009) | 37 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/ha_prototypes.h
M /branches/zip/include/trx0trx.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/trx/trx0i_s.c
M /branches/zip/trx/trx0trx.c
branches/zip: Merge a change from MySQL:
------------------------------------------------------------
revno: 3236
committer: Satya B <satya.bn@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-12-01 17:48:57 +0530
message:
merge to mysql-5.1-bugteam
------------------------------------------------------------
revno: 3234.1.1
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-12-01 14:38:40 +0400
message:
Bug #38883 (reopened): thd_security_context is not thread safe, crashes?
manual merge 5.0-->5.1, updating InnoDB plugin.
------------------------------------------------------------
revno: 1810.3968.13
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.0-bugteam
timestamp: Tue 2009-12-01 14:24:44 +0400
message:
Bug #38883 (reopened): thd_security_context is not thread safe, crashes?
The bug 38816 changed the lock that protects THD::query from
LOCK_thread_count to LOCK_thd_data, but didn't update the associated
InnoDB functions.
1. The innobase_mysql_prepare_print_arbitrary_thd and the
innobase_mysql_end_print_arbitrary_thd InnoDB functions have been
removed, since now we have a per-thread mutex: now we don't need to wrap
several inter-thread access tries to THD::query with a single global
LOCK_thread_count lock, so we can simplify the code.
2. The innobase_mysql_print_thd function has been modified to lock
LOCK_thd_data in direct way.
------------------------------------------------------------------------
r6351 | marko | 2009-12-22 11:11:18 +0200 (Tue, 22 Dec 2009) | 1 line
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Remove an obsolete declaration of LOCK_thread_count.
------------------------------------------------------------------------
r6352 | marko | 2009-12-22 12:33:01 +0200 (Tue, 22 Dec 2009) | 104 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/lock0lock.h
M /branches/zip/include/srv0srv.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/mysql-test/innodb-autoinc.result
M /branches/zip/mysql-test/innodb-autoinc.test
M /branches/zip/row/row0sel.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
branches/zip: Merge revisions 6206:6350 from branches/5.1,
except r6347, r6349, r6350 which were committed separately
to both branches, and r6310, which was backported from zip to 5.1.
------------------------------------------------------------------------
r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 3 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Non-functional change, fix formatting.
------------------------------------------------------------------------
r6230 | sunny | 2009-11-24 23:52:43 +0200 (Tue, 24 Nov 2009) | 3 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
branches/5.1: Fix autoinc failing test results.
(this should be skipped when merging 5.1 into zip)
------------------------------------------------------------------------
r6231 | sunny | 2009-11-25 10:26:27 +0200 (Wed, 25 Nov 2009) | 7 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
M /branches/5.1/row/row0sel.c
branches/5.1: Fix BUG#49032 - auto_increment field does not initialize to last value in InnoDB Storage Engine.
We use the appropriate function to read the column value for non-integer
autoinc column types, namely float and double.
rb://208. Approved by Marko.
------------------------------------------------------------------------
r6232 | sunny | 2009-11-25 10:27:39 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix white space errors.
------------------------------------------------------------------------
r6233 | sunny | 2009-11-25 10:28:35 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/include/mach0data.h
M /branches/5.1/include/mach0data.ic
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix tests and make read float/double arg const.
------------------------------------------------------------------------
r6234 | sunny | 2009-11-25 10:29:03 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix whitepsace issues.
------------------------------------------------------------------------
r6235 | sunny | 2009-11-26 01:14:42 +0200 (Thu, 26 Nov 2009) | 9 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Fix Bug#47720 - REPLACE INTO Autoincrement column with negative values.
This bug is similiar to the negative autoinc filter patch from earlier,
with the additional handling of filtering out the negative column values
set explicitly by the user.
rb://184
Approved by Heikki.
------------------------------------------------------------------------
r6242 | vasil | 2009-11-27 22:07:12 +0200 (Fri, 27 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/export.sh
branches/5.1:
Minor changes to support plugin snapshots.
------------------------------------------------------------------------
r6306 | calvin | 2009-12-14 15:12:46 +0200 (Mon, 14 Dec 2009) | 5 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: fix bug#49267: innodb-autoinc.test fails on windows
because of different case mode
There is no change to the InnoDB code, only to fix test case by
changing "T1" to "t1".
------------------------------------------------------------------------
r6324 | jyang | 2009-12-17 06:54:24 +0200 (Thu, 17 Dec 2009) | 8 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/lock0lock.h
M /branches/5.1/include/srv0srv.h
M /branches/5.1/lock/lock0lock.c
M /branches/5.1/log/log0log.c
M /branches/5.1/srv/srv0srv.c
M /branches/5.1/srv/srv0start.c
branches/5.1: Fix bug #47814 - Diagnostics are frequently not
printed after a long lock wait in InnoDB. Separate out the
lock wait timeout check thread from monitor information
printing thread.
rb://200 Approved by Marko.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6364 | marko | 2009-12-26 21:06:31 +0200 (Sat, 26 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/ibuf/ibuf0ibuf.c
branches/zip: ibuf_bitmap_get_map_page():
Define a wrapper macro that passes __FILE__, __LINE__ of the caller
to buf_page_get_gen().
This will ease the diagnosis of the likes of Issue #135.
------------------------------------------------------------------------
2009-12-26 20:17:43 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(select_lowest_offset());
|
branches/innodb+: Merge revisions 6130:6364 from branches/zip:
------------------------------------------------------------------------
r6130 | marko | 2009-11-02 11:42:56 +0200 (Mon, 02 Nov 2009) | 9 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/btr/btr0sea.c
M /branches/zip/buf/buf0buf.c
M /branches/zip/dict/dict0dict.c
M /branches/zip/fil/fil0fil.c
M /branches/zip/ibuf/ibuf0ibuf.c
M /branches/zip/include/btr0sea.h
M /branches/zip/include/dict0dict.h
M /branches/zip/include/fil0fil.h
M /branches/zip/include/ibuf0ibuf.h
M /branches/zip/include/lock0lock.h
M /branches/zip/include/log0log.h
M /branches/zip/include/log0recv.h
M /branches/zip/include/mem0mem.h
M /branches/zip/include/mem0pool.h
M /branches/zip/include/os0file.h
M /branches/zip/include/pars0pars.h
M /branches/zip/include/srv0srv.h
M /branches/zip/include/thr0loc.h
M /branches/zip/include/trx0i_s.h
M /branches/zip/include/trx0purge.h
M /branches/zip/include/trx0rseg.h
M /branches/zip/include/trx0sys.h
M /branches/zip/include/trx0undo.h
M /branches/zip/include/usr0sess.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/log/log0recv.c
M /branches/zip/mem/mem0dbg.c
M /branches/zip/mem/mem0pool.c
M /branches/zip/os/os0file.c
M /branches/zip/os/os0sync.c
M /branches/zip/os/os0thread.c
M /branches/zip/pars/lexyy.c
M /branches/zip/pars/pars0lex.l
M /branches/zip/que/que0que.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
M /branches/zip/sync/sync0arr.c
M /branches/zip/sync/sync0sync.c
M /branches/zip/thr/thr0loc.c
M /branches/zip/trx/trx0i_s.c
M /branches/zip/trx/trx0purge.c
M /branches/zip/trx/trx0rseg.c
M /branches/zip/trx/trx0sys.c
M /branches/zip/trx/trx0undo.c
M /branches/zip/usr/usr0sess.c
M /branches/zip/ut/ut0mem.c
branches/zip: Free all resources at shutdown. Set pointers to NULL, so
that Valgrind will not complain about freed data structures that are
reachable via pointers. This addresses Bug #45992 and Bug #46656.
This patch is mostly based on changes copied from branches/embedded-1.0,
mainly c5432, c3439, c3134, c2994, c2978, but also some other code was
copied. Some added cleanup code is specific to MySQL/InnoDB.
rb://199 approved by Sunny Bains
------------------------------------------------------------------------
r6134 | marko | 2009-11-04 09:57:29 +0200 (Wed, 04 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
branches/zip: innobase_convert_identifier(): Convert table names with
explain_filename() to address Bug #32430: 'show innodb status'
causes errors Invalid (old?) table or database name in logs.
rb://134 approved by Sunny Bains
------------------------------------------------------------------------
r6137 | marko | 2009-11-04 15:24:28 +0200 (Wed, 04 Nov 2009) | 1 line
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_index_too_big_for_undo(): Correct a typo.
------------------------------------------------------------------------
r6153 | vasil | 2009-11-10 15:33:22 +0200 (Tue, 10 Nov 2009) | 145 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Merge r6125:6152 from branches/5.1:
(everything except the last white-space change was skipped as it is already
in branches/zip)
------------------------------------------------------------------------
r6127 | vasil | 2009-10-30 11:18:25 +0200 (Fri, 30 Oct 2009) | 18 lines
Changed paths:
M /branches/5.1/Makefile.am
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1:
Backport c6121 from branches/zip:
------------------------------------------------------------------------
r6121 | sunny | 2009-10-30 01:42:11 +0200 (Fri, 30 Oct 2009) | 7 lines
Changed paths:
M /branches/zip/mysql-test/innodb-autoinc.result
branches/zip: This test has been problematic for sometime now. The underlying
bug is that the data dictionaries get out of sync. In the AUTOINC code we
try and apply salve to the symptoms. In the past MySQL made some unrelated
change and the dictionaries stopped getting out of sync and this test started
to fail. Now, it seems they have reverted that changed and the test is
passing again. I suspect this is not he last time that this test will change.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6129 | vasil | 2009-10-30 17:14:22 +0200 (Fri, 30 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/Makefile.am
branches/5.1:
Revert a change to Makefile.am that sneaked unnoticed in c6127.
------------------------------------------------------------------------
r6136 | marko | 2009-11-04 12:28:10 +0200 (Wed, 04 Nov 2009) | 15 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/ha_prototypes.h
M /branches/5.1/ut/ut0ut.c
branches/5.1: Port r6134 from branches/zip:
------------------------------------------------------------------------
r6134 | marko | 2009-11-04 07:57:29 +0000 (Wed, 04 Nov 2009) | 5 lines
branches/zip: innobase_convert_identifier(): Convert table names with
explain_filename() to address Bug #32430: 'show innodb status'
causes errors Invalid (old?) table or database name in logs.
rb://134 approved by Sunny Bains
------------------------------------------------------------------------
innobase_print_identifier(): Replace with innobase_convert_name().
innobase_convert_identifier(): New function, called by innobase_convert_name().
------------------------------------------------------------------------
r6149 | vasil | 2009-11-09 11:15:01 +0200 (Mon, 09 Nov 2009) | 5 lines
Changed paths:
M /branches/5.1/CMakeLists.txt
branches/5.1:
Followup to r5700: Adjust the changes so they are the same as in the BZR
repository.
------------------------------------------------------------------------
r6150 | vasil | 2009-11-09 11:43:31 +0200 (Mon, 09 Nov 2009) | 58 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Merge a part of r2911.5.5 from MySQL:
(the other part of this was merged in c5700)
------------------------------------------------------------
revno: 2911.5.5
committer: Vladislav Vaintroub <vvaintroub@mysql.com>
branch nick: 5.1-innodb_plugin
timestamp: Wed 2009-06-10 10:59:49 +0200
message:
Backport WL#3653 to 5.1 to enable bundled innodb plugin.
Remove custom DLL loader code from innodb plugin code, use
symbols exported from mysqld.
removed:
storage/innodb_plugin/handler/handler0vars.h
storage/innodb_plugin/handler/win_delay_loader.cc
added:
storage/mysql_storage_engine.cmake
win/create_def_file.js
modified:
CMakeLists.txt
include/m_ctype.h
include/my_global.h
include/my_sys.h
include/mysql/plugin.h
libmysqld/CMakeLists.txt
mysql-test/mysql-test-run.pl
mysql-test/t/plugin.test
mysql-test/t/plugin_load-master.opt
mysys/charset.c
sql/CMakeLists.txt
sql/handler.h
sql/mysql_priv.h
sql/mysqld.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_list.h
sql/sql_profile.h
storage/Makefile.am
storage/archive/CMakeLists.txt
storage/blackhole/CMakeLists.txt
storage/csv/CMakeLists.txt
storage/example/CMakeLists.txt
storage/federated/CMakeLists.txt
storage/heap/CMakeLists.txt
storage/innobase/CMakeLists.txt
storage/innobase/handler/ha_innodb.cc
storage/innodb_plugin/CMakeLists.txt
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/handler0alter.cc
storage/innodb_plugin/handler/i_s.cc
storage/innodb_plugin/plug.in
storage/myisam/CMakeLists.txt
storage/myisammrg/CMakeLists.txt
win/Makefile.am
win/configure.js
------------------------------------------------------------------------
r6152 | vasil | 2009-11-10 15:30:20 +0200 (Tue, 10 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
White space fixup.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6157 | jyang | 2009-11-11 14:27:09 +0200 (Wed, 11 Nov 2009) | 10 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
A /branches/zip/mysql-test/innodb_bug47167.result
A /branches/zip/mysql-test/innodb_bug47167.test
M /branches/zip/mysql-test/innodb_file_format.result
branches/zip: Fix an issue that a local variable defined
in innodb_file_format_check_validate() is being referenced
across function in innodb_file_format_check_update().
In addition, fix "set global innodb_file_format_check =
DEFAULT" call.
Bug #47167: "set global innodb_file_format_check" cannot
set value by User-Defined Variable."
rb://169 approved by Sunny Bains and Marko.
------------------------------------------------------------------------
r6159 | vasil | 2009-11-11 15:13:01 +0200 (Wed, 11 Nov 2009) | 37 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
branches/zip:
Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)
------------------------------------------------------------
revno: 3092.5.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-09-24 15:52:52 +0100
message:
BUG#42829: binlogging enabled for all schemas regardless of
binlog-db-db / binlog-ignore-db
InnoDB will return an error if statement based replication is used
along with transaction isolation level READ-COMMITTED (or weaker),
even if the statement in question is filtered out according to the
binlog-do-db rules set. In this case, an error should not be printed.
This patch addresses this issue by extending the existing check in
external_lock to take into account the filter rules before deciding to
print an error. Furthermore, it also changes decide_logging_format to
take into consideration whether the statement is filtered out from
binlog before decision is made.
added:
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
modified:
sql/sql_base.cc
sql/sql_class.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
------------------------------------------------------------------------
r6160 | vasil | 2009-11-11 15:33:49 +0200 (Wed, 11 Nov 2009) | 72 lines
Changed paths:
M /branches/zip/include/os0file.h
M /branches/zip/os/os0file.c
branches/zip: Merge r6152:6159 from branches/5.1:
(r6158 was skipped as an equivallent change has already been merged from MySQL)
------------------------------------------------------------------------
r6154 | calvin | 2009-11-11 02:51:17 +0200 (Wed, 11 Nov 2009) | 17 lines
Changed paths:
M /branches/5.1/include/os0file.h
M /branches/5.1/os/os0file.c
branches/5.1: fix bug#3139: Mysql crashes: 'windows error 995'
after several selects on a large DB
During stress environment, Windows AIO may fail with error code
ERROR_OPERATION_ABORTED. InnoDB does not handle the error, rather
crashes. The cause of the error is unknown, but likely due to
faulty hardware or driver.
This patch introduces a new error code OS_FILE_OPERATION_ABORTED,
which maps to Windows ERROR_OPERATION_ABORTED (995). When the error
is detected during AIO, the InnoDB will issue a synchronous retry
(read/write).
This patch has been extensively tested by MySQL support.
Approved by: Marko
rb://196
------------------------------------------------------------------------
r6158 | vasil | 2009-11-11 14:52:14 +0200 (Wed, 11 Nov 2009) | 37 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/handler/ha_innodb.h
branches/5.1:
Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)
------------------------------------------------------------
revno: 3092.5.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-09-24 15:52:52 +0100
message:
BUG#42829: binlogging enabled for all schemas regardless of
binlog-db-db / binlog-ignore-db
InnoDB will return an error if statement based replication is used
along with transaction isolation level READ-COMMITTED (or weaker),
even if the statement in question is filtered out according to the
binlog-do-db rules set. In this case, an error should not be printed.
This patch addresses this issue by extending the existing check in
external_lock to take into account the filter rules before deciding to
print an error. Furthermore, it also changes decide_logging_format to
take into consideration whether the statement is filtered out from
binlog before decision is made.
added:
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
modified:
sql/sql_base.cc
sql/sql_class.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
------------------------------------------------------------------------
------------------------------------------------------------------------
r6161 | vasil | 2009-11-11 15:36:16 +0200 (Wed, 11 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add changelog entry for r6160.
------------------------------------------------------------------------
r6162 | vasil | 2009-11-11 16:00:12 +0200 (Wed, 11 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog for r6157.
------------------------------------------------------------------------
r6163 | calvin | 2009-11-11 17:53:20 +0200 (Wed, 11 Nov 2009) | 8 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
branches/zip: Exclude thd_binlog_filter_ok() when building
with older version of MySQL.
thd_binlog_filter_ok() is introduced in MySQL 5.1.41. But the
plugin can be built with MySQL prior to 5.1.41.
Approved by Heikki (on IM).
------------------------------------------------------------------------
r6169 | calvin | 2009-11-12 14:40:43 +0200 (Thu, 12 Nov 2009) | 6 lines
Changed paths:
A /branches/zip/mysql-test/innodb_bug46676.result
A /branches/zip/mysql-test/innodb_bug46676.test
branches/zip: add test case for bug#46676
This crash is reproducible with InnoDB plugin 1.0.4 + MySQL 5.1.37.
But no longer reproducible after MySQL 5.1.38 (with plugin 1.0.5).
Add test case to catch future regression.
------------------------------------------------------------------------
r6170 | marko | 2009-11-12 15:49:08 +0200 (Thu, 12 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/db0err.h
M /branches/zip/row/row0merge.c
M /branches/zip/row/row0mysql.c
branches/zip: Allow CREATE INDEX to be interrupted. (Issue #354)
rb://183 approved by Heikki Tuuri
------------------------------------------------------------------------
r6175 | vasil | 2009-11-16 20:07:39 +0200 (Mon, 16 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Wrap line at 78th char in the ChangeLog
------------------------------------------------------------------------
r6177 | calvin | 2009-11-16 20:20:38 +0200 (Mon, 16 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip: add an entry to ChangeLog for r6065
------------------------------------------------------------------------
r6179 | marko | 2009-11-17 10:19:34 +0200 (Tue, 17 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: ha_innobase::change_active_index(): When the history is
missing, report it to the client, not to the error log.
------------------------------------------------------------------------
r6181 | vasil | 2009-11-17 12:21:41 +0200 (Tue, 17 Nov 2009) | 33 lines
Changed paths:
M /branches/zip/mysql-test/innodb-index.test
branches/zip:
At the end of innodb-index.test: restore the environment as it was before
the test was started to silence this warning:
MTR's internal check of the test case 'main.innodb-index' failed.
This means that the test case does not preserve the state that existed
before the test case was executed. Most likely the test case did not
do a proper clean-up.
This is the diff of the states of the servers before and after the
test case was executed:
mysqltest: Logging to '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.log'.
mysqltest: Results saved in '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result'.
mysqltest: Connecting to server localhost:13000 (socket /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/mysqld.1.sock) as 'root', connection 'default', attempt 0 ...
mysqltest: ... Connected.
mysqltest: Start processing test commands from './include/check-testcase.test' ...
mysqltest: ... Done processing test commands.
--- /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result 2009-11-17 13:10:40.000000000 +0300
+++ /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.reject 2009-11-17 13:10:54.000000000 +0300
@@ -84,7 +84,7 @@
INNODB_DOUBLEWRITE ON
INNODB_FAST_SHUTDOWN 1
INNODB_FILE_FORMAT Antelope
-INNODB_FILE_FORMAT_CHECK Antelope
+INNODB_FILE_FORMAT_CHECK Barracuda
INNODB_FILE_PER_TABLE OFF
INNODB_FLUSH_LOG_AT_TRX_COMMIT 1
INNODB_FLUSH_METHOD
mysqltest: Result content mismatch
not ok
------------------------------------------------------------------------
r6182 | marko | 2009-11-17 13:49:15 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-consistent-master.opt
M /branches/zip/mysql-test/innodb-consistent.result
M /branches/zip/mysql-test/innodb-consistent.test
M /branches/zip/mysql-test/innodb-use-sys-malloc-master.opt
M /branches/zip/mysql-test/innodb-use-sys-malloc.result
M /branches/zip/mysql-test/innodb-use-sys-malloc.test
M /branches/zip/mysql-test/innodb_bug21704.result
M /branches/zip/mysql-test/innodb_bug21704.test
M /branches/zip/mysql-test/innodb_bug40360.test
M /branches/zip/mysql-test/innodb_bug40565.result
M /branches/zip/mysql-test/innodb_bug40565.test
M /branches/zip/mysql-test/innodb_bug41904.result
M /branches/zip/mysql-test/innodb_bug41904.test
M /branches/zip/mysql-test/innodb_bug42101-nonzero-master.opt
M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
M /branches/zip/mysql-test/innodb_bug42101.result
M /branches/zip/mysql-test/innodb_bug42101.test
M /branches/zip/mysql-test/innodb_bug44032.result
M /branches/zip/mysql-test/innodb_bug44032.test
M /branches/zip/mysql-test/innodb_bug44369.result
M /branches/zip/mysql-test/innodb_bug44369.test
M /branches/zip/mysql-test/innodb_bug44571.result
M /branches/zip/mysql-test/innodb_bug44571.test
M /branches/zip/mysql-test/innodb_bug45357.test
M /branches/zip/mysql-test/innodb_bug46000.result
M /branches/zip/mysql-test/innodb_bug46000.test
M /branches/zip/mysql-test/innodb_bug46676.result
M /branches/zip/mysql-test/innodb_bug46676.test
M /branches/zip/mysql-test/innodb_bug47167.result
M /branches/zip/mysql-test/innodb_bug47167.test
M /branches/zip/mysql-test/innodb_bug47777.result
M /branches/zip/mysql-test/innodb_bug47777.test
M /branches/zip/mysql-test/innodb_file_format.result
M /branches/zip/mysql-test/innodb_file_format.test
branches/zip: Set svn:eol-style on mysql-test files.
------------------------------------------------------------------------
r6183 | marko | 2009-11-17 13:51:16 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-consistent-master.opt
M /branches/zip/mysql-test/innodb-master.opt
M /branches/zip/mysql-test/innodb-semi-consistent-master.opt
M /branches/zip/mysql-test/innodb-use-sys-malloc-master.opt
M /branches/zip/mysql-test/innodb_bug42101-nonzero-master.opt
branches/zip: Prepend loose_ to plugin-only mysql-test options.
------------------------------------------------------------------------
r6184 | marko | 2009-11-17 13:52:01 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-index.result
M /branches/zip/mysql-test/innodb-index.test
branches/zip: innodb-index.test: Restore innodb_file_format_check.
------------------------------------------------------------------------
r6185 | marko | 2009-11-17 16:44:20 +0200 (Tue, 17 Nov 2009) | 16 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/mysql-test/innodb.result
M /branches/zip/mysql-test/innodb.test
M /branches/zip/mysql-test/innodb_bug44369.result
M /branches/zip/mysql-test/innodb_bug44369.test
D /branches/zip/mysql-test/patches/innodb-index.diff
M /branches/zip/row/row0mysql.c
branches/zip: Report duplicate table names
to the client connection, not to the error log. This change will allow
innodb-index.test to be re-enabled. It was previously disabled, because
mysql-test-run does not like output in the error log.
row_create_table_for_mysql(): Do not output anything to the error log
when reporting DB_DUPLICATE_KEY. Let the caller report the error.
Add a TODO comment that the dict_table_t object is apparently not freed
when an error occurs.
create_table_def(): Convert InnoDB table names to the character set
of the client connection for reporting. Use my_error(ER_WRONG_COLUMN_NAME)
for reporting reserved column names. Report my_error(ER_TABLE_EXISTS_ERROR)
when row_create_table_for_mysql() returns DB_DUPLICATE_KEY.
rb://206
------------------------------------------------------------------------
r6186 | vasil | 2009-11-17 16:48:14 +0200 (Tue, 17 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for r6185.
------------------------------------------------------------------------
r6189 | marko | 2009-11-18 11:36:18 +0200 (Wed, 18 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): When creating the primary key
and the table is being locked by another transaction,
do not attempt to drop the table. (Bug #48782)
Approved by Sunny Bains over IM
------------------------------------------------------------------------
r6194 | vasil | 2009-11-19 09:24:45 +0200 (Thu, 19 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/include/univ.i
branches/zip:
Increment version number from 1.0.5 to 1.0.6 since 1.0.5 was just released
by MySQL and we will soon release 1.0.6.
------------------------------------------------------------------------
r6197 | calvin | 2009-11-19 09:32:55 +0200 (Thu, 19 Nov 2009) | 6 lines
Changed paths:
M /branches/zip/CMakeLists.txt
branches/zip: merge the fix of bug#48317 (CMake file)
Due to MySQL changes to the CMake, it is no longer able
to build InnoDB plugin as a static library on Windows.
The fix is proposed by Vlad of MySQL.
------------------------------------------------------------------------
r6198 | vasil | 2009-11-19 09:44:31 +0200 (Thu, 19 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for r6197.
------------------------------------------------------------------------
r6199 | vasil | 2009-11-19 12:10:12 +0200 (Thu, 19 Nov 2009) | 31 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/btr/btr0btr.c
M /branches/zip/data/data0type.c
branches/zip: Merge r6159:6198 from branches/5.1:
------------------------------------------------------------------------
r6187 | jyang | 2009-11-18 05:27:30 +0200 (Wed, 18 Nov 2009) | 9 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1: Fix bug #48469 "when innodb tablespace is
configured too small, crash and corruption!". Function
btr_create() did not check the return status of fseg_create(),
and continue the index creation even there is no sufficient
space.
rb://205 Approved by Marko
------------------------------------------------------------------------
r6188 | jyang | 2009-11-18 07:14:23 +0200 (Wed, 18 Nov 2009) | 8 lines
Changed paths:
M /branches/5.1/data/data0type.c
branches/5.1: Fix bug #48526 "Data type for float and
double is incorrectly reported in InnoDB table monitor".
Certain datatypes are not printed correctly in
dtype_print().
rb://204 Approved by Marko.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6201 | marko | 2009-11-19 14:09:11 +0200 (Thu, 19 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): Clarify the comment
on orphaned tables when creating a primary key.
------------------------------------------------------------------------
r6202 | jyang | 2009-11-19 15:01:00 +0200 (Thu, 19 Nov 2009) | 8 lines
Changed paths:
M /branches/zip/btr/btr0btr.c
branches/zip: Function fseg_free() is no longer defined
in branches/zip. To port fix for bug #48469 to zip,
we can use btr_free_root() which frees the page,
and also does not require mini-transaction.
Approved by Marko.
------------------------------------------------------------------------
r6207 | vasil | 2009-11-20 10:19:14 +0200 (Fri, 20 Nov 2009) | 54 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Merge r6198:6206 from branches/5.1:
(r6203 was skipped as it is already in branches/zip)
------------------------------------------------------------------------
r6200 | vasil | 2009-11-19 12:14:23 +0200 (Thu, 19 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1:
White space fixup - indent under the opening (
------------------------------------------------------------------------
r6203 | jyang | 2009-11-19 15:12:22 +0200 (Thu, 19 Nov 2009) | 8 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1: Use btr_free_root() instead of fseg_free() for
the fix of bug #48469, because fseg_free() is not defined
in the zip branch. And we could save one mini-trasaction started
by fseg_free().
Approved by Marko.
------------------------------------------------------------------------
r6205 | jyang | 2009-11-20 07:55:48 +0200 (Fri, 20 Nov 2009) | 11 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Add a special case to handle the Duplicated Key error
and return DB_ERROR instead. This is to avoid a possible SIGSEGV
by mysql error handling re-entering the storage layer for dup key
info without proper table handle.
This is to prevent a server crash when error situation in bug
#45961 "DDL on partitioned innodb tables leaves data dictionary
in an inconsistent state" happens.
rb://157 approved by Sunny Bains.
------------------------------------------------------------------------
r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 5 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Fix a minor code formating issue for
the parenthesis iplacement of the if condition in
rename_table().
------------------------------------------------------------------------
------------------------------------------------------------------------
r6208 | vasil | 2009-11-20 10:49:24 +0200 (Fri, 20 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for c6207.
------------------------------------------------------------------------
r6210 | vasil | 2009-11-20 23:39:48 +0200 (Fri, 20 Nov 2009) | 3 lines
Changed paths:
M /branches/zip/trx/trx0i_s.c
branches/zip:
Whitespace fixup.
------------------------------------------------------------------------
r6248 | marko | 2009-11-30 12:19:50 +0200 (Mon, 30 Nov 2009) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: ChangeLog: Document r4922 that was forgotten.
------------------------------------------------------------------------
r6252 | marko | 2009-11-30 12:50:11 +0200 (Mon, 30 Nov 2009) | 23 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/dict/dict0boot.c
M /branches/zip/dict/dict0crea.c
M /branches/zip/dict/dict0load.c
M /branches/zip/dict/dict0mem.c
M /branches/zip/fil/fil0fil.c
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/dict0mem.h
M /branches/zip/row/row0mysql.c
branches/zip: Suppress errors about non-found temporary tables.
Write the is_temp flag to SYS_TABLES.MIX_LEN.
dict_table_t::flags: Add a flag for is_temporary, DICT_TF2_TEMPORARY.
Unlike other flags, this will not be written to the tablespace flags
or SYS_TABLES.TYPE, but only to SYS_TABLES.MIX_LEN.
dict_build_table_def_step(): Only pass DICT_TF_BITS to tablespaces.
dict_check_tablespaces_and_store_max_id(), dict_load_table():
Suppress errors about temporary tables not being found.
dict_create_sys_tables_tuple(): Write the DICT_TF2_TEMPORARY flag
to SYS_TABLES.MIX_LEN.
fil_space_create(), fil_create_new_single_table_tablespace(): Add assertions
about space->flags.
row_drop_table_for_mysql(): Do not complain about non-found temporary tables.
rb://160 approved by Heikki Tuuri. This addresses the second part of
Bug #41609 Crash recovery does not work for InnoDB temporary tables.
------------------------------------------------------------------------
r6263 | vasil | 2009-12-01 14:49:05 +0200 (Tue, 01 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/include/univ.i
branches/zip: Increment version number from 1.0.6 to 1.0.7
1.0.6 has been released
------------------------------------------------------------------------
r6264 | vasil | 2009-12-01 16:19:44 +0200 (Tue, 01 Dec 2009) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: Add ChangeLog entry for the release of 1.0.6.
------------------------------------------------------------------------
r6269 | marko | 2009-12-02 11:35:22 +0200 (Wed, 02 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/srv/srv0start.c
branches/zip: innobase_start_or_create_for_mysql(): UNIV_IBUF_DEBUG
should not break crash recovery, but UNIV_IBUF_COUNT_DEBUG will.
------------------------------------------------------------------------
r6270 | marko | 2009-12-02 11:36:47 +0200 (Wed, 02 Dec 2009) | 1 line
Changed paths:
M /branches/zip/srv/srv0start.c
branches/zip: innobase_start_or_create_for_mysql(): Log the zlib version.
------------------------------------------------------------------------
r6271 | marko | 2009-12-02 11:43:49 +0200 (Wed, 02 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/Makefile.am
M /branches/zip/include/univ.i
M /branches/zip/plug.in
branches/zip: ChangeLog: Document that since r6270, the zlib version number
will be displayed at start-up.
------------------------------------------------------------------------
r6272 | marko | 2009-12-02 11:46:05 +0200 (Wed, 02 Dec 2009) | 1 line
Changed paths:
M /branches/zip/Makefile.am
M /branches/zip/include/univ.i
M /branches/zip/plug.in
branches/zip: Revert changes that were accidentally committed in r6271.
------------------------------------------------------------------------
r6274 | marko | 2009-12-03 14:47:12 +0200 (Thu, 03 Dec 2009) | 6 lines
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_table_check_for_dup_indexes(): Assert that the
data dictionary mutex is being held while table->indexes is accessed.
This is already the case.
Currently, only dict_table_get_next_index() and dict_table_get_first_index()
are being invoked without holding dict_sys->mutex.
------------------------------------------------------------------------
r6275 | pekka | 2009-12-03 18:32:47 +0200 (Thu, 03 Dec 2009) | 10 lines
Changed paths:
M /branches/zip/include/log0recv.h
M /branches/zip/include/trx0sys.h
M /branches/zip/log/log0recv.c
M /branches/zip/trx/trx0sys.c
branches/zip: Minor changes which allow build with UNIV_HOTBACKUP
defined to succeed:
include/trx0sys.h: Allow Hot Backup build to see some
TRX_SYS_DOUBLEWRITE_... macros.
trx/trx0sys.c: Exclude trx_sys_close() function from Hot Backup build.
log/log0recv.[ch]: Exclude recv_sys_var_init() function from Hot Backup build.
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r6277 | marko | 2009-12-08 11:13:36 +0200 (Tue, 08 Dec 2009) | 1 line
Changed paths:
M /branches/zip/fsp/fsp0fsp.c
branches/zip: fsp0fsp.c: Add some missing in/out and const qualifiers.
------------------------------------------------------------------------
r6285 | marko | 2009-12-09 09:24:50 +0200 (Wed, 09 Dec 2009) | 13 lines
Changed paths:
M /branches/zip/row/row0sel.c
branches/zip: row_sel_fetch_columns(): Remove redundant code that was
accidentally added in r1591, which introduced dfield_t::ext in order
to make the merge sort of fast index creation support externally
stored columns,
Initially, I tried to allocate the bit for dfield_t::ext from
dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
to something that would fit in it. Then I decided that it would be
too risky. The redundant check was part of the mapping. The
condition may have been dfield_is_null() initially.
This redundant code was noticed by Sergey Petrunya on the MySQL
internals list.
------------------------------------------------------------------------
r6288 | marko | 2009-12-09 09:51:00 +0200 (Wed, 09 Dec 2009) | 15 lines
Changed paths:
M /branches/zip/row/row0upd.c
branches/zip: row_upd_copy_columns(): Remove redundant code that was
accidentally added in r1591, which introduced dfield_t::ext in order
to make the merge sort of fast index creation support externally
stored columns.
Initially, I tried to allocate the bit for dfield_t::ext from
dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
to something that would fit in it. Then I decided that it would be
too risky. The redundant check was part of the mapping. The
condition may have been dfield_is_null() initially.
This is similar to the redundant code in row_sel_fetch_columns() that
was noticed by Sergey Petrunya on the MySQL internals list and removed
in r6285. As far as I can tell, there are no redundant UNIV_SQL_NULL
assignments remaining after this change.
------------------------------------------------------------------------
r6305 | marko | 2009-12-14 13:03:57 +0200 (Mon, 14 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/row/row0umod.c
branches/zip: row_undo_mod_del_unmark_sec_and_undo_update(): Add a missing
const qualifier.
------------------------------------------------------------------------
r6309 | marko | 2009-12-15 14:05:50 +0200 (Tue, 15 Dec 2009) | 3 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: lock_rec_insert_check_and_lock(): Avoid casting away constness.
Use page_rec_get_next_const() instead. This silences a gcc 4.2.4 warning.
Reported by Sunny Bains.
------------------------------------------------------------------------
r6312 | marko | 2009-12-16 10:10:36 +0200 (Wed, 16 Dec 2009) | 6 lines
Changed paths:
M /branches/zip/fil/fil0fil.c
branches/zip: fil_close(): Add #ifndef UNIV_HOTBACKUP around a debug
assertion on mutex.magic_n. InnoDB Hot Backup is a single-threaded
program and does not contain mutexes. This change allows InnoDB Hot
Backup to be compiled with UNIV_DEBUG.
Suggested by Michael Izioumtchenko.
------------------------------------------------------------------------
r6321 | marko | 2009-12-16 16:16:33 +0200 (Wed, 16 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/row/row0merge.c
branches/zip: row_merge_drop_temp_indexes(): Revert a hack to
transaction isolation level that was made unnecessary by r5826 (Issue #337).
When this function is called, any active data dictionary transaction
should have been rolled back.
------------------------------------------------------------------------
r6345 | marko | 2009-12-21 10:46:14 +0200 (Mon, 21 Dec 2009) | 7 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_scan_log_recs(): Non-functional change: Replace a
debug assertion ut_ad(len > 0) with ut_ad(len >= OS_FILE_LOG_BLOCK_SIZE).
This change is only for readability, for Issue #428. Another
assertion on len being an integer multiple of OS_FILE_LOG_BLOCK_SIZE
already ensured together with the old ut_ad(len > 0) that actually len
must be at least OS_FILE_LOG_BLOCK_SIZE.
------------------------------------------------------------------------
r6346 | marko | 2009-12-21 12:03:25 +0200 (Mon, 21 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_recovery_from_checkpoint_finish():
Revert a change that was accidentally committed in r6345.
------------------------------------------------------------------------
r6348 | marko | 2009-12-22 11:04:34 +0200 (Tue, 22 Dec 2009) | 37 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/ha_prototypes.h
M /branches/zip/include/trx0trx.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/trx/trx0i_s.c
M /branches/zip/trx/trx0trx.c
branches/zip: Merge a change from MySQL:
------------------------------------------------------------
revno: 3236
committer: Satya B <satya.bn@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-12-01 17:48:57 +0530
message:
merge to mysql-5.1-bugteam
------------------------------------------------------------
revno: 3234.1.1
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-12-01 14:38:40 +0400
message:
Bug #38883 (reopened): thd_security_context is not thread safe, crashes?
manual merge 5.0-->5.1, updating InnoDB plugin.
------------------------------------------------------------
revno: 1810.3968.13
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.0-bugteam
timestamp: Tue 2009-12-01 14:24:44 +0400
message:
Bug #38883 (reopened): thd_security_context is not thread safe, crashes?
The bug 38816 changed the lock that protects THD::query from
LOCK_thread_count to LOCK_thd_data, but didn't update the associated
InnoDB functions.
1. The innobase_mysql_prepare_print_arbitrary_thd and the
innobase_mysql_end_print_arbitrary_thd InnoDB functions have been
removed, since now we have a per-thread mutex: now we don't need to wrap
several inter-thread access tries to THD::query with a single global
LOCK_thread_count lock, so we can simplify the code.
2. The innobase_mysql_print_thd function has been modified to lock
LOCK_thd_data in direct way.
------------------------------------------------------------------------
r6351 | marko | 2009-12-22 11:11:18 +0200 (Tue, 22 Dec 2009) | 1 line
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Remove an obsolete declaration of LOCK_thread_count.
------------------------------------------------------------------------
r6352 | marko | 2009-12-22 12:33:01 +0200 (Tue, 22 Dec 2009) | 104 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/lock0lock.h
M /branches/zip/include/srv0srv.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/mysql-test/innodb-autoinc.result
M /branches/zip/mysql-test/innodb-autoinc.test
M /branches/zip/row/row0sel.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
branches/zip: Merge revisions 6206:6350 from branches/5.1,
except r6347, r6349, r6350 which were committed separately
to both branches, and r6310, which was backported from zip to 5.1.
------------------------------------------------------------------------
r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 3 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Non-functional change, fix formatting.
------------------------------------------------------------------------
r6230 | sunny | 2009-11-24 23:52:43 +0200 (Tue, 24 Nov 2009) | 3 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
branches/5.1: Fix autoinc failing test results.
(this should be skipped when merging 5.1 into zip)
------------------------------------------------------------------------
r6231 | sunny | 2009-11-25 10:26:27 +0200 (Wed, 25 Nov 2009) | 7 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
M /branches/5.1/row/row0sel.c
branches/5.1: Fix BUG#49032 - auto_increment field does not initialize to last value in InnoDB Storage Engine.
We use the appropriate function to read the column value for non-integer
autoinc column types, namely float and double.
rb://208. Approved by Marko.
------------------------------------------------------------------------
r6232 | sunny | 2009-11-25 10:27:39 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix white space errors.
------------------------------------------------------------------------
r6233 | sunny | 2009-11-25 10:28:35 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/include/mach0data.h
M /branches/5.1/include/mach0data.ic
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix tests and make read float/double arg const.
------------------------------------------------------------------------
r6234 | sunny | 2009-11-25 10:29:03 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix whitepsace issues.
------------------------------------------------------------------------
r6235 | sunny | 2009-11-26 01:14:42 +0200 (Thu, 26 Nov 2009) | 9 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Fix Bug#47720 - REPLACE INTO Autoincrement column with negative values.
This bug is similiar to the negative autoinc filter patch from earlier,
with the additional handling of filtering out the negative column values
set explicitly by the user.
rb://184
Approved by Heikki.
------------------------------------------------------------------------
r6242 | vasil | 2009-11-27 22:07:12 +0200 (Fri, 27 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/export.sh
branches/5.1:
Minor changes to support plugin snapshots.
------------------------------------------------------------------------
r6306 | calvin | 2009-12-14 15:12:46 +0200 (Mon, 14 Dec 2009) | 5 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: fix bug#49267: innodb-autoinc.test fails on windows
because of different case mode
There is no change to the InnoDB code, only to fix test case by
changing "T1" to "t1".
------------------------------------------------------------------------
r6324 | jyang | 2009-12-17 06:54:24 +0200 (Thu, 17 Dec 2009) | 8 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/lock0lock.h
M /branches/5.1/include/srv0srv.h
M /branches/5.1/lock/lock0lock.c
M /branches/5.1/log/log0log.c
M /branches/5.1/srv/srv0srv.c
M /branches/5.1/srv/srv0start.c
branches/5.1: Fix bug #47814 - Diagnostics are frequently not
printed after a long lock wait in InnoDB. Separate out the
lock wait timeout check thread from monitor information
printing thread.
rb://200 Approved by Marko.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6364 | marko | 2009-12-26 21:06:31 +0200 (Sat, 26 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/ibuf/ibuf0ibuf.c
branches/zip: ibuf_bitmap_get_map_page():
Define a wrapper macro that passes __FILE__, __LINE__ of the caller
to buf_page_get_gen().
This will ease the diagnosis of the likes of Issue #135.
------------------------------------------------------------------------
2009-12-26 20:17:43 +01:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(true);
|
|
|
|
}
|
branches/innodb+: Merge revisions 6130:6364 from branches/zip:
------------------------------------------------------------------------
r6130 | marko | 2009-11-02 11:42:56 +0200 (Mon, 02 Nov 2009) | 9 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/btr/btr0sea.c
M /branches/zip/buf/buf0buf.c
M /branches/zip/dict/dict0dict.c
M /branches/zip/fil/fil0fil.c
M /branches/zip/ibuf/ibuf0ibuf.c
M /branches/zip/include/btr0sea.h
M /branches/zip/include/dict0dict.h
M /branches/zip/include/fil0fil.h
M /branches/zip/include/ibuf0ibuf.h
M /branches/zip/include/lock0lock.h
M /branches/zip/include/log0log.h
M /branches/zip/include/log0recv.h
M /branches/zip/include/mem0mem.h
M /branches/zip/include/mem0pool.h
M /branches/zip/include/os0file.h
M /branches/zip/include/pars0pars.h
M /branches/zip/include/srv0srv.h
M /branches/zip/include/thr0loc.h
M /branches/zip/include/trx0i_s.h
M /branches/zip/include/trx0purge.h
M /branches/zip/include/trx0rseg.h
M /branches/zip/include/trx0sys.h
M /branches/zip/include/trx0undo.h
M /branches/zip/include/usr0sess.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/log/log0recv.c
M /branches/zip/mem/mem0dbg.c
M /branches/zip/mem/mem0pool.c
M /branches/zip/os/os0file.c
M /branches/zip/os/os0sync.c
M /branches/zip/os/os0thread.c
M /branches/zip/pars/lexyy.c
M /branches/zip/pars/pars0lex.l
M /branches/zip/que/que0que.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
M /branches/zip/sync/sync0arr.c
M /branches/zip/sync/sync0sync.c
M /branches/zip/thr/thr0loc.c
M /branches/zip/trx/trx0i_s.c
M /branches/zip/trx/trx0purge.c
M /branches/zip/trx/trx0rseg.c
M /branches/zip/trx/trx0sys.c
M /branches/zip/trx/trx0undo.c
M /branches/zip/usr/usr0sess.c
M /branches/zip/ut/ut0mem.c
branches/zip: Free all resources at shutdown. Set pointers to NULL, so
that Valgrind will not complain about freed data structures that are
reachable via pointers. This addresses Bug #45992 and Bug #46656.
This patch is mostly based on changes copied from branches/embedded-1.0,
mainly c5432, c3439, c3134, c2994, c2978, but also some other code was
copied. Some added cleanup code is specific to MySQL/InnoDB.
rb://199 approved by Sunny Bains
------------------------------------------------------------------------
r6134 | marko | 2009-11-04 09:57:29 +0200 (Wed, 04 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
branches/zip: innobase_convert_identifier(): Convert table names with
explain_filename() to address Bug #32430: 'show innodb status'
causes errors Invalid (old?) table or database name in logs.
rb://134 approved by Sunny Bains
------------------------------------------------------------------------
r6137 | marko | 2009-11-04 15:24:28 +0200 (Wed, 04 Nov 2009) | 1 line
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_index_too_big_for_undo(): Correct a typo.
------------------------------------------------------------------------
r6153 | vasil | 2009-11-10 15:33:22 +0200 (Tue, 10 Nov 2009) | 145 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Merge r6125:6152 from branches/5.1:
(everything except the last white-space change was skipped as it is already
in branches/zip)
------------------------------------------------------------------------
r6127 | vasil | 2009-10-30 11:18:25 +0200 (Fri, 30 Oct 2009) | 18 lines
Changed paths:
M /branches/5.1/Makefile.am
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1:
Backport c6121 from branches/zip:
------------------------------------------------------------------------
r6121 | sunny | 2009-10-30 01:42:11 +0200 (Fri, 30 Oct 2009) | 7 lines
Changed paths:
M /branches/zip/mysql-test/innodb-autoinc.result
branches/zip: This test has been problematic for sometime now. The underlying
bug is that the data dictionaries get out of sync. In the AUTOINC code we
try and apply salve to the symptoms. In the past MySQL made some unrelated
change and the dictionaries stopped getting out of sync and this test started
to fail. Now, it seems they have reverted that changed and the test is
passing again. I suspect this is not he last time that this test will change.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6129 | vasil | 2009-10-30 17:14:22 +0200 (Fri, 30 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/Makefile.am
branches/5.1:
Revert a change to Makefile.am that sneaked unnoticed in c6127.
------------------------------------------------------------------------
r6136 | marko | 2009-11-04 12:28:10 +0200 (Wed, 04 Nov 2009) | 15 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/ha_prototypes.h
M /branches/5.1/ut/ut0ut.c
branches/5.1: Port r6134 from branches/zip:
------------------------------------------------------------------------
r6134 | marko | 2009-11-04 07:57:29 +0000 (Wed, 04 Nov 2009) | 5 lines
branches/zip: innobase_convert_identifier(): Convert table names with
explain_filename() to address Bug #32430: 'show innodb status'
causes errors Invalid (old?) table or database name in logs.
rb://134 approved by Sunny Bains
------------------------------------------------------------------------
innobase_print_identifier(): Replace with innobase_convert_name().
innobase_convert_identifier(): New function, called by innobase_convert_name().
------------------------------------------------------------------------
r6149 | vasil | 2009-11-09 11:15:01 +0200 (Mon, 09 Nov 2009) | 5 lines
Changed paths:
M /branches/5.1/CMakeLists.txt
branches/5.1:
Followup to r5700: Adjust the changes so they are the same as in the BZR
repository.
------------------------------------------------------------------------
r6150 | vasil | 2009-11-09 11:43:31 +0200 (Mon, 09 Nov 2009) | 58 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Merge a part of r2911.5.5 from MySQL:
(the other part of this was merged in c5700)
------------------------------------------------------------
revno: 2911.5.5
committer: Vladislav Vaintroub <vvaintroub@mysql.com>
branch nick: 5.1-innodb_plugin
timestamp: Wed 2009-06-10 10:59:49 +0200
message:
Backport WL#3653 to 5.1 to enable bundled innodb plugin.
Remove custom DLL loader code from innodb plugin code, use
symbols exported from mysqld.
removed:
storage/innodb_plugin/handler/handler0vars.h
storage/innodb_plugin/handler/win_delay_loader.cc
added:
storage/mysql_storage_engine.cmake
win/create_def_file.js
modified:
CMakeLists.txt
include/m_ctype.h
include/my_global.h
include/my_sys.h
include/mysql/plugin.h
libmysqld/CMakeLists.txt
mysql-test/mysql-test-run.pl
mysql-test/t/plugin.test
mysql-test/t/plugin_load-master.opt
mysys/charset.c
sql/CMakeLists.txt
sql/handler.h
sql/mysql_priv.h
sql/mysqld.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_list.h
sql/sql_profile.h
storage/Makefile.am
storage/archive/CMakeLists.txt
storage/blackhole/CMakeLists.txt
storage/csv/CMakeLists.txt
storage/example/CMakeLists.txt
storage/federated/CMakeLists.txt
storage/heap/CMakeLists.txt
storage/innobase/CMakeLists.txt
storage/innobase/handler/ha_innodb.cc
storage/innodb_plugin/CMakeLists.txt
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/handler0alter.cc
storage/innodb_plugin/handler/i_s.cc
storage/innodb_plugin/plug.in
storage/myisam/CMakeLists.txt
storage/myisammrg/CMakeLists.txt
win/Makefile.am
win/configure.js
------------------------------------------------------------------------
r6152 | vasil | 2009-11-10 15:30:20 +0200 (Tue, 10 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
White space fixup.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6157 | jyang | 2009-11-11 14:27:09 +0200 (Wed, 11 Nov 2009) | 10 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
A /branches/zip/mysql-test/innodb_bug47167.result
A /branches/zip/mysql-test/innodb_bug47167.test
M /branches/zip/mysql-test/innodb_file_format.result
branches/zip: Fix an issue that a local variable defined
in innodb_file_format_check_validate() is being referenced
across function in innodb_file_format_check_update().
In addition, fix "set global innodb_file_format_check =
DEFAULT" call.
Bug #47167: "set global innodb_file_format_check" cannot
set value by User-Defined Variable."
rb://169 approved by Sunny Bains and Marko.
------------------------------------------------------------------------
r6159 | vasil | 2009-11-11 15:13:01 +0200 (Wed, 11 Nov 2009) | 37 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
branches/zip:
Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)
------------------------------------------------------------
revno: 3092.5.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-09-24 15:52:52 +0100
message:
BUG#42829: binlogging enabled for all schemas regardless of
binlog-db-db / binlog-ignore-db
InnoDB will return an error if statement based replication is used
along with transaction isolation level READ-COMMITTED (or weaker),
even if the statement in question is filtered out according to the
binlog-do-db rules set. In this case, an error should not be printed.
This patch addresses this issue by extending the existing check in
external_lock to take into account the filter rules before deciding to
print an error. Furthermore, it also changes decide_logging_format to
take into consideration whether the statement is filtered out from
binlog before decision is made.
added:
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
modified:
sql/sql_base.cc
sql/sql_class.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
------------------------------------------------------------------------
r6160 | vasil | 2009-11-11 15:33:49 +0200 (Wed, 11 Nov 2009) | 72 lines
Changed paths:
M /branches/zip/include/os0file.h
M /branches/zip/os/os0file.c
branches/zip: Merge r6152:6159 from branches/5.1:
(r6158 was skipped as an equivallent change has already been merged from MySQL)
------------------------------------------------------------------------
r6154 | calvin | 2009-11-11 02:51:17 +0200 (Wed, 11 Nov 2009) | 17 lines
Changed paths:
M /branches/5.1/include/os0file.h
M /branches/5.1/os/os0file.c
branches/5.1: fix bug#3139: Mysql crashes: 'windows error 995'
after several selects on a large DB
During stress environment, Windows AIO may fail with error code
ERROR_OPERATION_ABORTED. InnoDB does not handle the error, rather
crashes. The cause of the error is unknown, but likely due to
faulty hardware or driver.
This patch introduces a new error code OS_FILE_OPERATION_ABORTED,
which maps to Windows ERROR_OPERATION_ABORTED (995). When the error
is detected during AIO, the InnoDB will issue a synchronous retry
(read/write).
This patch has been extensively tested by MySQL support.
Approved by: Marko
rb://196
------------------------------------------------------------------------
r6158 | vasil | 2009-11-11 14:52:14 +0200 (Wed, 11 Nov 2009) | 37 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/handler/ha_innodb.h
branches/5.1:
Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)
------------------------------------------------------------
revno: 3092.5.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-09-24 15:52:52 +0100
message:
BUG#42829: binlogging enabled for all schemas regardless of
binlog-db-db / binlog-ignore-db
InnoDB will return an error if statement based replication is used
along with transaction isolation level READ-COMMITTED (or weaker),
even if the statement in question is filtered out according to the
binlog-do-db rules set. In this case, an error should not be printed.
This patch addresses this issue by extending the existing check in
external_lock to take into account the filter rules before deciding to
print an error. Furthermore, it also changes decide_logging_format to
take into consideration whether the statement is filtered out from
binlog before decision is made.
added:
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
modified:
sql/sql_base.cc
sql/sql_class.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
------------------------------------------------------------------------
------------------------------------------------------------------------
r6161 | vasil | 2009-11-11 15:36:16 +0200 (Wed, 11 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add changelog entry for r6160.
------------------------------------------------------------------------
r6162 | vasil | 2009-11-11 16:00:12 +0200 (Wed, 11 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog for r6157.
------------------------------------------------------------------------
r6163 | calvin | 2009-11-11 17:53:20 +0200 (Wed, 11 Nov 2009) | 8 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
branches/zip: Exclude thd_binlog_filter_ok() when building
with older version of MySQL.
thd_binlog_filter_ok() is introduced in MySQL 5.1.41. But the
plugin can be built with MySQL prior to 5.1.41.
Approved by Heikki (on IM).
------------------------------------------------------------------------
r6169 | calvin | 2009-11-12 14:40:43 +0200 (Thu, 12 Nov 2009) | 6 lines
Changed paths:
A /branches/zip/mysql-test/innodb_bug46676.result
A /branches/zip/mysql-test/innodb_bug46676.test
branches/zip: add test case for bug#46676
This crash is reproducible with InnoDB plugin 1.0.4 + MySQL 5.1.37.
But no longer reproducible after MySQL 5.1.38 (with plugin 1.0.5).
Add test case to catch future regression.
------------------------------------------------------------------------
r6170 | marko | 2009-11-12 15:49:08 +0200 (Thu, 12 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/db0err.h
M /branches/zip/row/row0merge.c
M /branches/zip/row/row0mysql.c
branches/zip: Allow CREATE INDEX to be interrupted. (Issue #354)
rb://183 approved by Heikki Tuuri
------------------------------------------------------------------------
r6175 | vasil | 2009-11-16 20:07:39 +0200 (Mon, 16 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Wrap line at 78th char in the ChangeLog
------------------------------------------------------------------------
r6177 | calvin | 2009-11-16 20:20:38 +0200 (Mon, 16 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip: add an entry to ChangeLog for r6065
------------------------------------------------------------------------
r6179 | marko | 2009-11-17 10:19:34 +0200 (Tue, 17 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: ha_innobase::change_active_index(): When the history is
missing, report it to the client, not to the error log.
------------------------------------------------------------------------
r6181 | vasil | 2009-11-17 12:21:41 +0200 (Tue, 17 Nov 2009) | 33 lines
Changed paths:
M /branches/zip/mysql-test/innodb-index.test
branches/zip:
At the end of innodb-index.test: restore the environment as it was before
the test was started to silence this warning:
MTR's internal check of the test case 'main.innodb-index' failed.
This means that the test case does not preserve the state that existed
before the test case was executed. Most likely the test case did not
do a proper clean-up.
This is the diff of the states of the servers before and after the
test case was executed:
mysqltest: Logging to '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.log'.
mysqltest: Results saved in '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result'.
mysqltest: Connecting to server localhost:13000 (socket /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/mysqld.1.sock) as 'root', connection 'default', attempt 0 ...
mysqltest: ... Connected.
mysqltest: Start processing test commands from './include/check-testcase.test' ...
mysqltest: ... Done processing test commands.
--- /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result 2009-11-17 13:10:40.000000000 +0300
+++ /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.reject 2009-11-17 13:10:54.000000000 +0300
@@ -84,7 +84,7 @@
INNODB_DOUBLEWRITE ON
INNODB_FAST_SHUTDOWN 1
INNODB_FILE_FORMAT Antelope
-INNODB_FILE_FORMAT_CHECK Antelope
+INNODB_FILE_FORMAT_CHECK Barracuda
INNODB_FILE_PER_TABLE OFF
INNODB_FLUSH_LOG_AT_TRX_COMMIT 1
INNODB_FLUSH_METHOD
mysqltest: Result content mismatch
not ok
------------------------------------------------------------------------
r6182 | marko | 2009-11-17 13:49:15 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-consistent-master.opt
M /branches/zip/mysql-test/innodb-consistent.result
M /branches/zip/mysql-test/innodb-consistent.test
M /branches/zip/mysql-test/innodb-use-sys-malloc-master.opt
M /branches/zip/mysql-test/innodb-use-sys-malloc.result
M /branches/zip/mysql-test/innodb-use-sys-malloc.test
M /branches/zip/mysql-test/innodb_bug21704.result
M /branches/zip/mysql-test/innodb_bug21704.test
M /branches/zip/mysql-test/innodb_bug40360.test
M /branches/zip/mysql-test/innodb_bug40565.result
M /branches/zip/mysql-test/innodb_bug40565.test
M /branches/zip/mysql-test/innodb_bug41904.result
M /branches/zip/mysql-test/innodb_bug41904.test
M /branches/zip/mysql-test/innodb_bug42101-nonzero-master.opt
M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
M /branches/zip/mysql-test/innodb_bug42101.result
M /branches/zip/mysql-test/innodb_bug42101.test
M /branches/zip/mysql-test/innodb_bug44032.result
M /branches/zip/mysql-test/innodb_bug44032.test
M /branches/zip/mysql-test/innodb_bug44369.result
M /branches/zip/mysql-test/innodb_bug44369.test
M /branches/zip/mysql-test/innodb_bug44571.result
M /branches/zip/mysql-test/innodb_bug44571.test
M /branches/zip/mysql-test/innodb_bug45357.test
M /branches/zip/mysql-test/innodb_bug46000.result
M /branches/zip/mysql-test/innodb_bug46000.test
M /branches/zip/mysql-test/innodb_bug46676.result
M /branches/zip/mysql-test/innodb_bug46676.test
M /branches/zip/mysql-test/innodb_bug47167.result
M /branches/zip/mysql-test/innodb_bug47167.test
M /branches/zip/mysql-test/innodb_bug47777.result
M /branches/zip/mysql-test/innodb_bug47777.test
M /branches/zip/mysql-test/innodb_file_format.result
M /branches/zip/mysql-test/innodb_file_format.test
branches/zip: Set svn:eol-style on mysql-test files.
------------------------------------------------------------------------
r6183 | marko | 2009-11-17 13:51:16 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-consistent-master.opt
M /branches/zip/mysql-test/innodb-master.opt
M /branches/zip/mysql-test/innodb-semi-consistent-master.opt
M /branches/zip/mysql-test/innodb-use-sys-malloc-master.opt
M /branches/zip/mysql-test/innodb_bug42101-nonzero-master.opt
branches/zip: Prepend loose_ to plugin-only mysql-test options.
------------------------------------------------------------------------
r6184 | marko | 2009-11-17 13:52:01 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-index.result
M /branches/zip/mysql-test/innodb-index.test
branches/zip: innodb-index.test: Restore innodb_file_format_check.
------------------------------------------------------------------------
r6185 | marko | 2009-11-17 16:44:20 +0200 (Tue, 17 Nov 2009) | 16 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/mysql-test/innodb.result
M /branches/zip/mysql-test/innodb.test
M /branches/zip/mysql-test/innodb_bug44369.result
M /branches/zip/mysql-test/innodb_bug44369.test
D /branches/zip/mysql-test/patches/innodb-index.diff
M /branches/zip/row/row0mysql.c
branches/zip: Report duplicate table names
to the client connection, not to the error log. This change will allow
innodb-index.test to be re-enabled. It was previously disabled, because
mysql-test-run does not like output in the error log.
row_create_table_for_mysql(): Do not output anything to the error log
when reporting DB_DUPLICATE_KEY. Let the caller report the error.
Add a TODO comment that the dict_table_t object is apparently not freed
when an error occurs.
create_table_def(): Convert InnoDB table names to the character set
of the client connection for reporting. Use my_error(ER_WRONG_COLUMN_NAME)
for reporting reserved column names. Report my_error(ER_TABLE_EXISTS_ERROR)
when row_create_table_for_mysql() returns DB_DUPLICATE_KEY.
rb://206
------------------------------------------------------------------------
r6186 | vasil | 2009-11-17 16:48:14 +0200 (Tue, 17 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for r6185.
------------------------------------------------------------------------
r6189 | marko | 2009-11-18 11:36:18 +0200 (Wed, 18 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): When creating the primary key
and the table is being locked by another transaction,
do not attempt to drop the table. (Bug #48782)
Approved by Sunny Bains over IM
------------------------------------------------------------------------
r6194 | vasil | 2009-11-19 09:24:45 +0200 (Thu, 19 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/include/univ.i
branches/zip:
Increment version number from 1.0.5 to 1.0.6 since 1.0.5 was just released
by MySQL and we will soon release 1.0.6.
------------------------------------------------------------------------
r6197 | calvin | 2009-11-19 09:32:55 +0200 (Thu, 19 Nov 2009) | 6 lines
Changed paths:
M /branches/zip/CMakeLists.txt
branches/zip: merge the fix of bug#48317 (CMake file)
Due to MySQL changes to the CMake, it is no longer able
to build InnoDB plugin as a static library on Windows.
The fix is proposed by Vlad of MySQL.
------------------------------------------------------------------------
r6198 | vasil | 2009-11-19 09:44:31 +0200 (Thu, 19 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for r6197.
------------------------------------------------------------------------
r6199 | vasil | 2009-11-19 12:10:12 +0200 (Thu, 19 Nov 2009) | 31 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/btr/btr0btr.c
M /branches/zip/data/data0type.c
branches/zip: Merge r6159:6198 from branches/5.1:
------------------------------------------------------------------------
r6187 | jyang | 2009-11-18 05:27:30 +0200 (Wed, 18 Nov 2009) | 9 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1: Fix bug #48469 "when innodb tablespace is
configured too small, crash and corruption!". Function
btr_create() did not check the return status of fseg_create(),
and continue the index creation even there is no sufficient
space.
rb://205 Approved by Marko
------------------------------------------------------------------------
r6188 | jyang | 2009-11-18 07:14:23 +0200 (Wed, 18 Nov 2009) | 8 lines
Changed paths:
M /branches/5.1/data/data0type.c
branches/5.1: Fix bug #48526 "Data type for float and
double is incorrectly reported in InnoDB table monitor".
Certain datatypes are not printed correctly in
dtype_print().
rb://204 Approved by Marko.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6201 | marko | 2009-11-19 14:09:11 +0200 (Thu, 19 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): Clarify the comment
on orphaned tables when creating a primary key.
------------------------------------------------------------------------
r6202 | jyang | 2009-11-19 15:01:00 +0200 (Thu, 19 Nov 2009) | 8 lines
Changed paths:
M /branches/zip/btr/btr0btr.c
branches/zip: Function fseg_free() is no longer defined
in branches/zip. To port fix for bug #48469 to zip,
we can use btr_free_root() which frees the page,
and also does not require mini-transaction.
Approved by Marko.
------------------------------------------------------------------------
r6207 | vasil | 2009-11-20 10:19:14 +0200 (Fri, 20 Nov 2009) | 54 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Merge r6198:6206 from branches/5.1:
(r6203 was skipped as it is already in branches/zip)
------------------------------------------------------------------------
r6200 | vasil | 2009-11-19 12:14:23 +0200 (Thu, 19 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1:
White space fixup - indent under the opening (
------------------------------------------------------------------------
r6203 | jyang | 2009-11-19 15:12:22 +0200 (Thu, 19 Nov 2009) | 8 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1: Use btr_free_root() instead of fseg_free() for
the fix of bug #48469, because fseg_free() is not defined
in the zip branch. And we could save one mini-trasaction started
by fseg_free().
Approved by Marko.
------------------------------------------------------------------------
r6205 | jyang | 2009-11-20 07:55:48 +0200 (Fri, 20 Nov 2009) | 11 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Add a special case to handle the Duplicated Key error
and return DB_ERROR instead. This is to avoid a possible SIGSEGV
by mysql error handling re-entering the storage layer for dup key
info without proper table handle.
This is to prevent a server crash when error situation in bug
#45961 "DDL on partitioned innodb tables leaves data dictionary
in an inconsistent state" happens.
rb://157 approved by Sunny Bains.
------------------------------------------------------------------------
r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 5 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Fix a minor code formating issue for
the parenthesis iplacement of the if condition in
rename_table().
------------------------------------------------------------------------
------------------------------------------------------------------------
r6208 | vasil | 2009-11-20 10:49:24 +0200 (Fri, 20 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for c6207.
------------------------------------------------------------------------
r6210 | vasil | 2009-11-20 23:39:48 +0200 (Fri, 20 Nov 2009) | 3 lines
Changed paths:
M /branches/zip/trx/trx0i_s.c
branches/zip:
Whitespace fixup.
------------------------------------------------------------------------
r6248 | marko | 2009-11-30 12:19:50 +0200 (Mon, 30 Nov 2009) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: ChangeLog: Document r4922 that was forgotten.
------------------------------------------------------------------------
r6252 | marko | 2009-11-30 12:50:11 +0200 (Mon, 30 Nov 2009) | 23 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/dict/dict0boot.c
M /branches/zip/dict/dict0crea.c
M /branches/zip/dict/dict0load.c
M /branches/zip/dict/dict0mem.c
M /branches/zip/fil/fil0fil.c
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/dict0mem.h
M /branches/zip/row/row0mysql.c
branches/zip: Suppress errors about non-found temporary tables.
Write the is_temp flag to SYS_TABLES.MIX_LEN.
dict_table_t::flags: Add a flag for is_temporary, DICT_TF2_TEMPORARY.
Unlike other flags, this will not be written to the tablespace flags
or SYS_TABLES.TYPE, but only to SYS_TABLES.MIX_LEN.
dict_build_table_def_step(): Only pass DICT_TF_BITS to tablespaces.
dict_check_tablespaces_and_store_max_id(), dict_load_table():
Suppress errors about temporary tables not being found.
dict_create_sys_tables_tuple(): Write the DICT_TF2_TEMPORARY flag
to SYS_TABLES.MIX_LEN.
fil_space_create(), fil_create_new_single_table_tablespace(): Add assertions
about space->flags.
row_drop_table_for_mysql(): Do not complain about non-found temporary tables.
rb://160 approved by Heikki Tuuri. This addresses the second part of
Bug #41609 Crash recovery does not work for InnoDB temporary tables.
------------------------------------------------------------------------
r6263 | vasil | 2009-12-01 14:49:05 +0200 (Tue, 01 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/include/univ.i
branches/zip: Increment version number from 1.0.6 to 1.0.7
1.0.6 has been released
------------------------------------------------------------------------
r6264 | vasil | 2009-12-01 16:19:44 +0200 (Tue, 01 Dec 2009) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: Add ChangeLog entry for the release of 1.0.6.
------------------------------------------------------------------------
r6269 | marko | 2009-12-02 11:35:22 +0200 (Wed, 02 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/srv/srv0start.c
branches/zip: innobase_start_or_create_for_mysql(): UNIV_IBUF_DEBUG
should not break crash recovery, but UNIV_IBUF_COUNT_DEBUG will.
------------------------------------------------------------------------
r6270 | marko | 2009-12-02 11:36:47 +0200 (Wed, 02 Dec 2009) | 1 line
Changed paths:
M /branches/zip/srv/srv0start.c
branches/zip: innobase_start_or_create_for_mysql(): Log the zlib version.
------------------------------------------------------------------------
r6271 | marko | 2009-12-02 11:43:49 +0200 (Wed, 02 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/Makefile.am
M /branches/zip/include/univ.i
M /branches/zip/plug.in
branches/zip: ChangeLog: Document that since r6270, the zlib version number
will be displayed at start-up.
------------------------------------------------------------------------
r6272 | marko | 2009-12-02 11:46:05 +0200 (Wed, 02 Dec 2009) | 1 line
Changed paths:
M /branches/zip/Makefile.am
M /branches/zip/include/univ.i
M /branches/zip/plug.in
branches/zip: Revert changes that were accidentally committed in r6271.
------------------------------------------------------------------------
r6274 | marko | 2009-12-03 14:47:12 +0200 (Thu, 03 Dec 2009) | 6 lines
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_table_check_for_dup_indexes(): Assert that the
data dictionary mutex is being held while table->indexes is accessed.
This is already the case.
Currently, only dict_table_get_next_index() and dict_table_get_first_index()
are being invoked without holding dict_sys->mutex.
------------------------------------------------------------------------
r6275 | pekka | 2009-12-03 18:32:47 +0200 (Thu, 03 Dec 2009) | 10 lines
Changed paths:
M /branches/zip/include/log0recv.h
M /branches/zip/include/trx0sys.h
M /branches/zip/log/log0recv.c
M /branches/zip/trx/trx0sys.c
branches/zip: Minor changes which allow build with UNIV_HOTBACKUP
defined to succeed:
include/trx0sys.h: Allow Hot Backup build to see some
TRX_SYS_DOUBLEWRITE_... macros.
trx/trx0sys.c: Exclude trx_sys_close() function from Hot Backup build.
log/log0recv.[ch]: Exclude recv_sys_var_init() function from Hot Backup build.
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r6277 | marko | 2009-12-08 11:13:36 +0200 (Tue, 08 Dec 2009) | 1 line
Changed paths:
M /branches/zip/fsp/fsp0fsp.c
branches/zip: fsp0fsp.c: Add some missing in/out and const qualifiers.
------------------------------------------------------------------------
r6285 | marko | 2009-12-09 09:24:50 +0200 (Wed, 09 Dec 2009) | 13 lines
Changed paths:
M /branches/zip/row/row0sel.c
branches/zip: row_sel_fetch_columns(): Remove redundant code that was
accidentally added in r1591, which introduced dfield_t::ext in order
to make the merge sort of fast index creation support externally
stored columns,
Initially, I tried to allocate the bit for dfield_t::ext from
dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
to something that would fit in it. Then I decided that it would be
too risky. The redundant check was part of the mapping. The
condition may have been dfield_is_null() initially.
This redundant code was noticed by Sergey Petrunya on the MySQL
internals list.
------------------------------------------------------------------------
r6288 | marko | 2009-12-09 09:51:00 +0200 (Wed, 09 Dec 2009) | 15 lines
Changed paths:
M /branches/zip/row/row0upd.c
branches/zip: row_upd_copy_columns(): Remove redundant code that was
accidentally added in r1591, which introduced dfield_t::ext in order
to make the merge sort of fast index creation support externally
stored columns.
Initially, I tried to allocate the bit for dfield_t::ext from
dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
to something that would fit in it. Then I decided that it would be
too risky. The redundant check was part of the mapping. The
condition may have been dfield_is_null() initially.
This is similar to the redundant code in row_sel_fetch_columns() that
was noticed by Sergey Petrunya on the MySQL internals list and removed
in r6285. As far as I can tell, there are no redundant UNIV_SQL_NULL
assignments remaining after this change.
------------------------------------------------------------------------
r6305 | marko | 2009-12-14 13:03:57 +0200 (Mon, 14 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/row/row0umod.c
branches/zip: row_undo_mod_del_unmark_sec_and_undo_update(): Add a missing
const qualifier.
------------------------------------------------------------------------
r6309 | marko | 2009-12-15 14:05:50 +0200 (Tue, 15 Dec 2009) | 3 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: lock_rec_insert_check_and_lock(): Avoid casting away constness.
Use page_rec_get_next_const() instead. This silences a gcc 4.2.4 warning.
Reported by Sunny Bains.
------------------------------------------------------------------------
r6312 | marko | 2009-12-16 10:10:36 +0200 (Wed, 16 Dec 2009) | 6 lines
Changed paths:
M /branches/zip/fil/fil0fil.c
branches/zip: fil_close(): Add #ifndef UNIV_HOTBACKUP around a debug
assertion on mutex.magic_n. InnoDB Hot Backup is a single-threaded
program and does not contain mutexes. This change allows InnoDB Hot
Backup to be compiled with UNIV_DEBUG.
Suggested by Michael Izioumtchenko.
------------------------------------------------------------------------
r6321 | marko | 2009-12-16 16:16:33 +0200 (Wed, 16 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/row/row0merge.c
branches/zip: row_merge_drop_temp_indexes(): Revert a hack to
transaction isolation level that was made unnecessary by r5826 (Issue #337).
When this function is called, any active data dictionary transaction
should have been rolled back.
------------------------------------------------------------------------
r6345 | marko | 2009-12-21 10:46:14 +0200 (Mon, 21 Dec 2009) | 7 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_scan_log_recs(): Non-functional change: Replace a
debug assertion ut_ad(len > 0) with ut_ad(len >= OS_FILE_LOG_BLOCK_SIZE).
This change is only for readability, for Issue #428. Another
assertion on len being an integer multiple of OS_FILE_LOG_BLOCK_SIZE
already ensured together with the old ut_ad(len > 0) that actually len
must be at least OS_FILE_LOG_BLOCK_SIZE.
------------------------------------------------------------------------
r6346 | marko | 2009-12-21 12:03:25 +0200 (Mon, 21 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_recovery_from_checkpoint_finish():
Revert a change that was accidentally committed in r6345.
------------------------------------------------------------------------
r6348 | marko | 2009-12-22 11:04:34 +0200 (Tue, 22 Dec 2009) | 37 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/ha_prototypes.h
M /branches/zip/include/trx0trx.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/trx/trx0i_s.c
M /branches/zip/trx/trx0trx.c
branches/zip: Merge a change from MySQL:
------------------------------------------------------------
revno: 3236
committer: Satya B <satya.bn@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-12-01 17:48:57 +0530
message:
merge to mysql-5.1-bugteam
------------------------------------------------------------
revno: 3234.1.1
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-12-01 14:38:40 +0400
message:
Bug #38883 (reopened): thd_security_context is not thread safe, crashes?
manual merge 5.0-->5.1, updating InnoDB plugin.
------------------------------------------------------------
revno: 1810.3968.13
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.0-bugteam
timestamp: Tue 2009-12-01 14:24:44 +0400
message:
Bug #38883 (reopened): thd_security_context is not thread safe, crashes?
The bug 38816 changed the lock that protects THD::query from
LOCK_thread_count to LOCK_thd_data, but didn't update the associated
InnoDB functions.
1. The innobase_mysql_prepare_print_arbitrary_thd and the
innobase_mysql_end_print_arbitrary_thd InnoDB functions have been
removed, since now we have a per-thread mutex: now we don't need to wrap
several inter-thread access tries to THD::query with a single global
LOCK_thread_count lock, so we can simplify the code.
2. The innobase_mysql_print_thd function has been modified to lock
LOCK_thd_data in direct way.
------------------------------------------------------------------------
r6351 | marko | 2009-12-22 11:11:18 +0200 (Tue, 22 Dec 2009) | 1 line
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Remove an obsolete declaration of LOCK_thread_count.
------------------------------------------------------------------------
r6352 | marko | 2009-12-22 12:33:01 +0200 (Tue, 22 Dec 2009) | 104 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/lock0lock.h
M /branches/zip/include/srv0srv.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/mysql-test/innodb-autoinc.result
M /branches/zip/mysql-test/innodb-autoinc.test
M /branches/zip/row/row0sel.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
branches/zip: Merge revisions 6206:6350 from branches/5.1,
except r6347, r6349, r6350 which were committed separately
to both branches, and r6310, which was backported from zip to 5.1.
------------------------------------------------------------------------
r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 3 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Non-functional change, fix formatting.
------------------------------------------------------------------------
r6230 | sunny | 2009-11-24 23:52:43 +0200 (Tue, 24 Nov 2009) | 3 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
branches/5.1: Fix autoinc failing test results.
(this should be skipped when merging 5.1 into zip)
------------------------------------------------------------------------
r6231 | sunny | 2009-11-25 10:26:27 +0200 (Wed, 25 Nov 2009) | 7 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
M /branches/5.1/row/row0sel.c
branches/5.1: Fix BUG#49032 - auto_increment field does not initialize to last value in InnoDB Storage Engine.
We use the appropriate function to read the column value for non-integer
autoinc column types, namely float and double.
rb://208. Approved by Marko.
------------------------------------------------------------------------
r6232 | sunny | 2009-11-25 10:27:39 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix white space errors.
------------------------------------------------------------------------
r6233 | sunny | 2009-11-25 10:28:35 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/include/mach0data.h
M /branches/5.1/include/mach0data.ic
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix tests and make read float/double arg const.
------------------------------------------------------------------------
r6234 | sunny | 2009-11-25 10:29:03 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix whitepsace issues.
------------------------------------------------------------------------
r6235 | sunny | 2009-11-26 01:14:42 +0200 (Thu, 26 Nov 2009) | 9 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Fix Bug#47720 - REPLACE INTO Autoincrement column with negative values.
This bug is similiar to the negative autoinc filter patch from earlier,
with the additional handling of filtering out the negative column values
set explicitly by the user.
rb://184
Approved by Heikki.
------------------------------------------------------------------------
r6242 | vasil | 2009-11-27 22:07:12 +0200 (Fri, 27 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/export.sh
branches/5.1:
Minor changes to support plugin snapshots.
------------------------------------------------------------------------
r6306 | calvin | 2009-12-14 15:12:46 +0200 (Mon, 14 Dec 2009) | 5 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: fix bug#49267: innodb-autoinc.test fails on windows
because of different case mode
There is no change to the InnoDB code, only to fix test case by
changing "T1" to "t1".
------------------------------------------------------------------------
r6324 | jyang | 2009-12-17 06:54:24 +0200 (Thu, 17 Dec 2009) | 8 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/lock0lock.h
M /branches/5.1/include/srv0srv.h
M /branches/5.1/lock/lock0lock.c
M /branches/5.1/log/log0log.c
M /branches/5.1/srv/srv0srv.c
M /branches/5.1/srv/srv0start.c
branches/5.1: Fix bug #47814 - Diagnostics are frequently not
printed after a long lock wait in InnoDB. Separate out the
lock wait timeout check thread from monitor information
printing thread.
rb://200 Approved by Marko.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6364 | marko | 2009-12-26 21:06:31 +0200 (Sat, 26 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/ibuf/ibuf0ibuf.c
branches/zip: ibuf_bitmap_get_map_page():
Define a wrapper macro that passes __FILE__, __LINE__ of the caller
to buf_page_get_gen().
This will ease the diagnosis of the likes of Issue #135.
------------------------------------------------------------------------
2009-12-26 20:17:43 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Check if there are several consecutive blocks
|
|
|
|
to read or write. Merge them if found. */
|
|
|
|
void merge()
|
|
|
|
{
|
|
|
|
/* if m_n_elems != 0, then we have assigned
|
|
|
|
something valid to consecutive_ios[0] */
|
|
|
|
ut_ad(m_n_elems != 0);
|
|
|
|
ut_ad(first_slot() != NULL);
|
branches/innodb+: Merge revisions 6130:6364 from branches/zip:
------------------------------------------------------------------------
r6130 | marko | 2009-11-02 11:42:56 +0200 (Mon, 02 Nov 2009) | 9 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/btr/btr0sea.c
M /branches/zip/buf/buf0buf.c
M /branches/zip/dict/dict0dict.c
M /branches/zip/fil/fil0fil.c
M /branches/zip/ibuf/ibuf0ibuf.c
M /branches/zip/include/btr0sea.h
M /branches/zip/include/dict0dict.h
M /branches/zip/include/fil0fil.h
M /branches/zip/include/ibuf0ibuf.h
M /branches/zip/include/lock0lock.h
M /branches/zip/include/log0log.h
M /branches/zip/include/log0recv.h
M /branches/zip/include/mem0mem.h
M /branches/zip/include/mem0pool.h
M /branches/zip/include/os0file.h
M /branches/zip/include/pars0pars.h
M /branches/zip/include/srv0srv.h
M /branches/zip/include/thr0loc.h
M /branches/zip/include/trx0i_s.h
M /branches/zip/include/trx0purge.h
M /branches/zip/include/trx0rseg.h
M /branches/zip/include/trx0sys.h
M /branches/zip/include/trx0undo.h
M /branches/zip/include/usr0sess.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/log/log0recv.c
M /branches/zip/mem/mem0dbg.c
M /branches/zip/mem/mem0pool.c
M /branches/zip/os/os0file.c
M /branches/zip/os/os0sync.c
M /branches/zip/os/os0thread.c
M /branches/zip/pars/lexyy.c
M /branches/zip/pars/pars0lex.l
M /branches/zip/que/que0que.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
M /branches/zip/sync/sync0arr.c
M /branches/zip/sync/sync0sync.c
M /branches/zip/thr/thr0loc.c
M /branches/zip/trx/trx0i_s.c
M /branches/zip/trx/trx0purge.c
M /branches/zip/trx/trx0rseg.c
M /branches/zip/trx/trx0sys.c
M /branches/zip/trx/trx0undo.c
M /branches/zip/usr/usr0sess.c
M /branches/zip/ut/ut0mem.c
branches/zip: Free all resources at shutdown. Set pointers to NULL, so
that Valgrind will not complain about freed data structures that are
reachable via pointers. This addresses Bug #45992 and Bug #46656.
This patch is mostly based on changes copied from branches/embedded-1.0,
mainly c5432, c3439, c3134, c2994, c2978, but also some other code was
copied. Some added cleanup code is specific to MySQL/InnoDB.
rb://199 approved by Sunny Bains
------------------------------------------------------------------------
r6134 | marko | 2009-11-04 09:57:29 +0200 (Wed, 04 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
branches/zip: innobase_convert_identifier(): Convert table names with
explain_filename() to address Bug #32430: 'show innodb status'
causes errors Invalid (old?) table or database name in logs.
rb://134 approved by Sunny Bains
------------------------------------------------------------------------
r6137 | marko | 2009-11-04 15:24:28 +0200 (Wed, 04 Nov 2009) | 1 line
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_index_too_big_for_undo(): Correct a typo.
------------------------------------------------------------------------
r6153 | vasil | 2009-11-10 15:33:22 +0200 (Tue, 10 Nov 2009) | 145 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Merge r6125:6152 from branches/5.1:
(everything except the last white-space change was skipped as it is already
in branches/zip)
------------------------------------------------------------------------
r6127 | vasil | 2009-10-30 11:18:25 +0200 (Fri, 30 Oct 2009) | 18 lines
Changed paths:
M /branches/5.1/Makefile.am
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1:
Backport c6121 from branches/zip:
------------------------------------------------------------------------
r6121 | sunny | 2009-10-30 01:42:11 +0200 (Fri, 30 Oct 2009) | 7 lines
Changed paths:
M /branches/zip/mysql-test/innodb-autoinc.result
branches/zip: This test has been problematic for sometime now. The underlying
bug is that the data dictionaries get out of sync. In the AUTOINC code we
try and apply salve to the symptoms. In the past MySQL made some unrelated
change and the dictionaries stopped getting out of sync and this test started
to fail. Now, it seems they have reverted that changed and the test is
passing again. I suspect this is not he last time that this test will change.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6129 | vasil | 2009-10-30 17:14:22 +0200 (Fri, 30 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/Makefile.am
branches/5.1:
Revert a change to Makefile.am that sneaked unnoticed in c6127.
------------------------------------------------------------------------
r6136 | marko | 2009-11-04 12:28:10 +0200 (Wed, 04 Nov 2009) | 15 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/ha_prototypes.h
M /branches/5.1/ut/ut0ut.c
branches/5.1: Port r6134 from branches/zip:
------------------------------------------------------------------------
r6134 | marko | 2009-11-04 07:57:29 +0000 (Wed, 04 Nov 2009) | 5 lines
branches/zip: innobase_convert_identifier(): Convert table names with
explain_filename() to address Bug #32430: 'show innodb status'
causes errors Invalid (old?) table or database name in logs.
rb://134 approved by Sunny Bains
------------------------------------------------------------------------
innobase_print_identifier(): Replace with innobase_convert_name().
innobase_convert_identifier(): New function, called by innobase_convert_name().
------------------------------------------------------------------------
r6149 | vasil | 2009-11-09 11:15:01 +0200 (Mon, 09 Nov 2009) | 5 lines
Changed paths:
M /branches/5.1/CMakeLists.txt
branches/5.1:
Followup to r5700: Adjust the changes so they are the same as in the BZR
repository.
------------------------------------------------------------------------
r6150 | vasil | 2009-11-09 11:43:31 +0200 (Mon, 09 Nov 2009) | 58 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Merge a part of r2911.5.5 from MySQL:
(the other part of this was merged in c5700)
------------------------------------------------------------
revno: 2911.5.5
committer: Vladislav Vaintroub <vvaintroub@mysql.com>
branch nick: 5.1-innodb_plugin
timestamp: Wed 2009-06-10 10:59:49 +0200
message:
Backport WL#3653 to 5.1 to enable bundled innodb plugin.
Remove custom DLL loader code from innodb plugin code, use
symbols exported from mysqld.
removed:
storage/innodb_plugin/handler/handler0vars.h
storage/innodb_plugin/handler/win_delay_loader.cc
added:
storage/mysql_storage_engine.cmake
win/create_def_file.js
modified:
CMakeLists.txt
include/m_ctype.h
include/my_global.h
include/my_sys.h
include/mysql/plugin.h
libmysqld/CMakeLists.txt
mysql-test/mysql-test-run.pl
mysql-test/t/plugin.test
mysql-test/t/plugin_load-master.opt
mysys/charset.c
sql/CMakeLists.txt
sql/handler.h
sql/mysql_priv.h
sql/mysqld.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_list.h
sql/sql_profile.h
storage/Makefile.am
storage/archive/CMakeLists.txt
storage/blackhole/CMakeLists.txt
storage/csv/CMakeLists.txt
storage/example/CMakeLists.txt
storage/federated/CMakeLists.txt
storage/heap/CMakeLists.txt
storage/innobase/CMakeLists.txt
storage/innobase/handler/ha_innodb.cc
storage/innodb_plugin/CMakeLists.txt
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/handler0alter.cc
storage/innodb_plugin/handler/i_s.cc
storage/innodb_plugin/plug.in
storage/myisam/CMakeLists.txt
storage/myisammrg/CMakeLists.txt
win/Makefile.am
win/configure.js
------------------------------------------------------------------------
r6152 | vasil | 2009-11-10 15:30:20 +0200 (Tue, 10 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
White space fixup.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6157 | jyang | 2009-11-11 14:27:09 +0200 (Wed, 11 Nov 2009) | 10 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
A /branches/zip/mysql-test/innodb_bug47167.result
A /branches/zip/mysql-test/innodb_bug47167.test
M /branches/zip/mysql-test/innodb_file_format.result
branches/zip: Fix an issue that a local variable defined
in innodb_file_format_check_validate() is being referenced
across function in innodb_file_format_check_update().
In addition, fix "set global innodb_file_format_check =
DEFAULT" call.
Bug #47167: "set global innodb_file_format_check" cannot
set value by User-Defined Variable."
rb://169 approved by Sunny Bains and Marko.
------------------------------------------------------------------------
r6159 | vasil | 2009-11-11 15:13:01 +0200 (Wed, 11 Nov 2009) | 37 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
branches/zip:
Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)
------------------------------------------------------------
revno: 3092.5.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-09-24 15:52:52 +0100
message:
BUG#42829: binlogging enabled for all schemas regardless of
binlog-db-db / binlog-ignore-db
InnoDB will return an error if statement based replication is used
along with transaction isolation level READ-COMMITTED (or weaker),
even if the statement in question is filtered out according to the
binlog-do-db rules set. In this case, an error should not be printed.
This patch addresses this issue by extending the existing check in
external_lock to take into account the filter rules before deciding to
print an error. Furthermore, it also changes decide_logging_format to
take into consideration whether the statement is filtered out from
binlog before decision is made.
added:
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
modified:
sql/sql_base.cc
sql/sql_class.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
------------------------------------------------------------------------
r6160 | vasil | 2009-11-11 15:33:49 +0200 (Wed, 11 Nov 2009) | 72 lines
Changed paths:
M /branches/zip/include/os0file.h
M /branches/zip/os/os0file.c
branches/zip: Merge r6152:6159 from branches/5.1:
(r6158 was skipped as an equivallent change has already been merged from MySQL)
------------------------------------------------------------------------
r6154 | calvin | 2009-11-11 02:51:17 +0200 (Wed, 11 Nov 2009) | 17 lines
Changed paths:
M /branches/5.1/include/os0file.h
M /branches/5.1/os/os0file.c
branches/5.1: fix bug#3139: Mysql crashes: 'windows error 995'
after several selects on a large DB
During stress environment, Windows AIO may fail with error code
ERROR_OPERATION_ABORTED. InnoDB does not handle the error, rather
crashes. The cause of the error is unknown, but likely due to
faulty hardware or driver.
This patch introduces a new error code OS_FILE_OPERATION_ABORTED,
which maps to Windows ERROR_OPERATION_ABORTED (995). When the error
is detected during AIO, the InnoDB will issue a synchronous retry
(read/write).
This patch has been extensively tested by MySQL support.
Approved by: Marko
rb://196
------------------------------------------------------------------------
r6158 | vasil | 2009-11-11 14:52:14 +0200 (Wed, 11 Nov 2009) | 37 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/handler/ha_innodb.h
branches/5.1:
Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)
------------------------------------------------------------
revno: 3092.5.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-09-24 15:52:52 +0100
message:
BUG#42829: binlogging enabled for all schemas regardless of
binlog-db-db / binlog-ignore-db
InnoDB will return an error if statement based replication is used
along with transaction isolation level READ-COMMITTED (or weaker),
even if the statement in question is filtered out according to the
binlog-do-db rules set. In this case, an error should not be printed.
This patch addresses this issue by extending the existing check in
external_lock to take into account the filter rules before deciding to
print an error. Furthermore, it also changes decide_logging_format to
take into consideration whether the statement is filtered out from
binlog before decision is made.
added:
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
modified:
sql/sql_base.cc
sql/sql_class.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
------------------------------------------------------------------------
------------------------------------------------------------------------
r6161 | vasil | 2009-11-11 15:36:16 +0200 (Wed, 11 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add changelog entry for r6160.
------------------------------------------------------------------------
r6162 | vasil | 2009-11-11 16:00:12 +0200 (Wed, 11 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog for r6157.
------------------------------------------------------------------------
r6163 | calvin | 2009-11-11 17:53:20 +0200 (Wed, 11 Nov 2009) | 8 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
branches/zip: Exclude thd_binlog_filter_ok() when building
with older version of MySQL.
thd_binlog_filter_ok() is introduced in MySQL 5.1.41. But the
plugin can be built with MySQL prior to 5.1.41.
Approved by Heikki (on IM).
------------------------------------------------------------------------
r6169 | calvin | 2009-11-12 14:40:43 +0200 (Thu, 12 Nov 2009) | 6 lines
Changed paths:
A /branches/zip/mysql-test/innodb_bug46676.result
A /branches/zip/mysql-test/innodb_bug46676.test
branches/zip: add test case for bug#46676
This crash is reproducible with InnoDB plugin 1.0.4 + MySQL 5.1.37.
But no longer reproducible after MySQL 5.1.38 (with plugin 1.0.5).
Add test case to catch future regression.
------------------------------------------------------------------------
r6170 | marko | 2009-11-12 15:49:08 +0200 (Thu, 12 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/db0err.h
M /branches/zip/row/row0merge.c
M /branches/zip/row/row0mysql.c
branches/zip: Allow CREATE INDEX to be interrupted. (Issue #354)
rb://183 approved by Heikki Tuuri
------------------------------------------------------------------------
r6175 | vasil | 2009-11-16 20:07:39 +0200 (Mon, 16 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Wrap line at 78th char in the ChangeLog
------------------------------------------------------------------------
r6177 | calvin | 2009-11-16 20:20:38 +0200 (Mon, 16 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip: add an entry to ChangeLog for r6065
------------------------------------------------------------------------
r6179 | marko | 2009-11-17 10:19:34 +0200 (Tue, 17 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: ha_innobase::change_active_index(): When the history is
missing, report it to the client, not to the error log.
------------------------------------------------------------------------
r6181 | vasil | 2009-11-17 12:21:41 +0200 (Tue, 17 Nov 2009) | 33 lines
Changed paths:
M /branches/zip/mysql-test/innodb-index.test
branches/zip:
At the end of innodb-index.test: restore the environment as it was before
the test was started to silence this warning:
MTR's internal check of the test case 'main.innodb-index' failed.
This means that the test case does not preserve the state that existed
before the test case was executed. Most likely the test case did not
do a proper clean-up.
This is the diff of the states of the servers before and after the
test case was executed:
mysqltest: Logging to '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.log'.
mysqltest: Results saved in '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result'.
mysqltest: Connecting to server localhost:13000 (socket /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/mysqld.1.sock) as 'root', connection 'default', attempt 0 ...
mysqltest: ... Connected.
mysqltest: Start processing test commands from './include/check-testcase.test' ...
mysqltest: ... Done processing test commands.
--- /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result 2009-11-17 13:10:40.000000000 +0300
+++ /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.reject 2009-11-17 13:10:54.000000000 +0300
@@ -84,7 +84,7 @@
INNODB_DOUBLEWRITE ON
INNODB_FAST_SHUTDOWN 1
INNODB_FILE_FORMAT Antelope
-INNODB_FILE_FORMAT_CHECK Antelope
+INNODB_FILE_FORMAT_CHECK Barracuda
INNODB_FILE_PER_TABLE OFF
INNODB_FLUSH_LOG_AT_TRX_COMMIT 1
INNODB_FLUSH_METHOD
mysqltest: Result content mismatch
not ok
------------------------------------------------------------------------
r6182 | marko | 2009-11-17 13:49:15 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-consistent-master.opt
M /branches/zip/mysql-test/innodb-consistent.result
M /branches/zip/mysql-test/innodb-consistent.test
M /branches/zip/mysql-test/innodb-use-sys-malloc-master.opt
M /branches/zip/mysql-test/innodb-use-sys-malloc.result
M /branches/zip/mysql-test/innodb-use-sys-malloc.test
M /branches/zip/mysql-test/innodb_bug21704.result
M /branches/zip/mysql-test/innodb_bug21704.test
M /branches/zip/mysql-test/innodb_bug40360.test
M /branches/zip/mysql-test/innodb_bug40565.result
M /branches/zip/mysql-test/innodb_bug40565.test
M /branches/zip/mysql-test/innodb_bug41904.result
M /branches/zip/mysql-test/innodb_bug41904.test
M /branches/zip/mysql-test/innodb_bug42101-nonzero-master.opt
M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
M /branches/zip/mysql-test/innodb_bug42101.result
M /branches/zip/mysql-test/innodb_bug42101.test
M /branches/zip/mysql-test/innodb_bug44032.result
M /branches/zip/mysql-test/innodb_bug44032.test
M /branches/zip/mysql-test/innodb_bug44369.result
M /branches/zip/mysql-test/innodb_bug44369.test
M /branches/zip/mysql-test/innodb_bug44571.result
M /branches/zip/mysql-test/innodb_bug44571.test
M /branches/zip/mysql-test/innodb_bug45357.test
M /branches/zip/mysql-test/innodb_bug46000.result
M /branches/zip/mysql-test/innodb_bug46000.test
M /branches/zip/mysql-test/innodb_bug46676.result
M /branches/zip/mysql-test/innodb_bug46676.test
M /branches/zip/mysql-test/innodb_bug47167.result
M /branches/zip/mysql-test/innodb_bug47167.test
M /branches/zip/mysql-test/innodb_bug47777.result
M /branches/zip/mysql-test/innodb_bug47777.test
M /branches/zip/mysql-test/innodb_file_format.result
M /branches/zip/mysql-test/innodb_file_format.test
branches/zip: Set svn:eol-style on mysql-test files.
------------------------------------------------------------------------
r6183 | marko | 2009-11-17 13:51:16 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-consistent-master.opt
M /branches/zip/mysql-test/innodb-master.opt
M /branches/zip/mysql-test/innodb-semi-consistent-master.opt
M /branches/zip/mysql-test/innodb-use-sys-malloc-master.opt
M /branches/zip/mysql-test/innodb_bug42101-nonzero-master.opt
branches/zip: Prepend loose_ to plugin-only mysql-test options.
------------------------------------------------------------------------
r6184 | marko | 2009-11-17 13:52:01 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-index.result
M /branches/zip/mysql-test/innodb-index.test
branches/zip: innodb-index.test: Restore innodb_file_format_check.
------------------------------------------------------------------------
r6185 | marko | 2009-11-17 16:44:20 +0200 (Tue, 17 Nov 2009) | 16 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/mysql-test/innodb.result
M /branches/zip/mysql-test/innodb.test
M /branches/zip/mysql-test/innodb_bug44369.result
M /branches/zip/mysql-test/innodb_bug44369.test
D /branches/zip/mysql-test/patches/innodb-index.diff
M /branches/zip/row/row0mysql.c
branches/zip: Report duplicate table names
to the client connection, not to the error log. This change will allow
innodb-index.test to be re-enabled. It was previously disabled, because
mysql-test-run does not like output in the error log.
row_create_table_for_mysql(): Do not output anything to the error log
when reporting DB_DUPLICATE_KEY. Let the caller report the error.
Add a TODO comment that the dict_table_t object is apparently not freed
when an error occurs.
create_table_def(): Convert InnoDB table names to the character set
of the client connection for reporting. Use my_error(ER_WRONG_COLUMN_NAME)
for reporting reserved column names. Report my_error(ER_TABLE_EXISTS_ERROR)
when row_create_table_for_mysql() returns DB_DUPLICATE_KEY.
rb://206
------------------------------------------------------------------------
r6186 | vasil | 2009-11-17 16:48:14 +0200 (Tue, 17 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for r6185.
------------------------------------------------------------------------
r6189 | marko | 2009-11-18 11:36:18 +0200 (Wed, 18 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): When creating the primary key
and the table is being locked by another transaction,
do not attempt to drop the table. (Bug #48782)
Approved by Sunny Bains over IM
------------------------------------------------------------------------
r6194 | vasil | 2009-11-19 09:24:45 +0200 (Thu, 19 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/include/univ.i
branches/zip:
Increment version number from 1.0.5 to 1.0.6 since 1.0.5 was just released
by MySQL and we will soon release 1.0.6.
------------------------------------------------------------------------
r6197 | calvin | 2009-11-19 09:32:55 +0200 (Thu, 19 Nov 2009) | 6 lines
Changed paths:
M /branches/zip/CMakeLists.txt
branches/zip: merge the fix of bug#48317 (CMake file)
Due to MySQL changes to the CMake, it is no longer able
to build InnoDB plugin as a static library on Windows.
The fix is proposed by Vlad of MySQL.
------------------------------------------------------------------------
r6198 | vasil | 2009-11-19 09:44:31 +0200 (Thu, 19 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for r6197.
------------------------------------------------------------------------
r6199 | vasil | 2009-11-19 12:10:12 +0200 (Thu, 19 Nov 2009) | 31 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/btr/btr0btr.c
M /branches/zip/data/data0type.c
branches/zip: Merge r6159:6198 from branches/5.1:
------------------------------------------------------------------------
r6187 | jyang | 2009-11-18 05:27:30 +0200 (Wed, 18 Nov 2009) | 9 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1: Fix bug #48469 "when innodb tablespace is
configured too small, crash and corruption!". Function
btr_create() did not check the return status of fseg_create(),
and continue the index creation even there is no sufficient
space.
rb://205 Approved by Marko
------------------------------------------------------------------------
r6188 | jyang | 2009-11-18 07:14:23 +0200 (Wed, 18 Nov 2009) | 8 lines
Changed paths:
M /branches/5.1/data/data0type.c
branches/5.1: Fix bug #48526 "Data type for float and
double is incorrectly reported in InnoDB table monitor".
Certain datatypes are not printed correctly in
dtype_print().
rb://204 Approved by Marko.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6201 | marko | 2009-11-19 14:09:11 +0200 (Thu, 19 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): Clarify the comment
on orphaned tables when creating a primary key.
------------------------------------------------------------------------
r6202 | jyang | 2009-11-19 15:01:00 +0200 (Thu, 19 Nov 2009) | 8 lines
Changed paths:
M /branches/zip/btr/btr0btr.c
branches/zip: Function fseg_free() is no longer defined
in branches/zip. To port fix for bug #48469 to zip,
we can use btr_free_root() which frees the page,
and also does not require mini-transaction.
Approved by Marko.
------------------------------------------------------------------------
r6207 | vasil | 2009-11-20 10:19:14 +0200 (Fri, 20 Nov 2009) | 54 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Merge r6198:6206 from branches/5.1:
(r6203 was skipped as it is already in branches/zip)
------------------------------------------------------------------------
r6200 | vasil | 2009-11-19 12:14:23 +0200 (Thu, 19 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1:
White space fixup - indent under the opening (
------------------------------------------------------------------------
r6203 | jyang | 2009-11-19 15:12:22 +0200 (Thu, 19 Nov 2009) | 8 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1: Use btr_free_root() instead of fseg_free() for
the fix of bug #48469, because fseg_free() is not defined
in the zip branch. And we could save one mini-trasaction started
by fseg_free().
Approved by Marko.
------------------------------------------------------------------------
r6205 | jyang | 2009-11-20 07:55:48 +0200 (Fri, 20 Nov 2009) | 11 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Add a special case to handle the Duplicated Key error
and return DB_ERROR instead. This is to avoid a possible SIGSEGV
by mysql error handling re-entering the storage layer for dup key
info without proper table handle.
This is to prevent a server crash when error situation in bug
#45961 "DDL on partitioned innodb tables leaves data dictionary
in an inconsistent state" happens.
rb://157 approved by Sunny Bains.
------------------------------------------------------------------------
r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 5 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Fix a minor code formating issue for
the parenthesis iplacement of the if condition in
rename_table().
------------------------------------------------------------------------
------------------------------------------------------------------------
r6208 | vasil | 2009-11-20 10:49:24 +0200 (Fri, 20 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for c6207.
------------------------------------------------------------------------
r6210 | vasil | 2009-11-20 23:39:48 +0200 (Fri, 20 Nov 2009) | 3 lines
Changed paths:
M /branches/zip/trx/trx0i_s.c
branches/zip:
Whitespace fixup.
------------------------------------------------------------------------
r6248 | marko | 2009-11-30 12:19:50 +0200 (Mon, 30 Nov 2009) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: ChangeLog: Document r4922 that was forgotten.
------------------------------------------------------------------------
r6252 | marko | 2009-11-30 12:50:11 +0200 (Mon, 30 Nov 2009) | 23 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/dict/dict0boot.c
M /branches/zip/dict/dict0crea.c
M /branches/zip/dict/dict0load.c
M /branches/zip/dict/dict0mem.c
M /branches/zip/fil/fil0fil.c
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/dict0mem.h
M /branches/zip/row/row0mysql.c
branches/zip: Suppress errors about non-found temporary tables.
Write the is_temp flag to SYS_TABLES.MIX_LEN.
dict_table_t::flags: Add a flag for is_temporary, DICT_TF2_TEMPORARY.
Unlike other flags, this will not be written to the tablespace flags
or SYS_TABLES.TYPE, but only to SYS_TABLES.MIX_LEN.
dict_build_table_def_step(): Only pass DICT_TF_BITS to tablespaces.
dict_check_tablespaces_and_store_max_id(), dict_load_table():
Suppress errors about temporary tables not being found.
dict_create_sys_tables_tuple(): Write the DICT_TF2_TEMPORARY flag
to SYS_TABLES.MIX_LEN.
fil_space_create(), fil_create_new_single_table_tablespace(): Add assertions
about space->flags.
row_drop_table_for_mysql(): Do not complain about non-found temporary tables.
rb://160 approved by Heikki Tuuri. This addresses the second part of
Bug #41609 Crash recovery does not work for InnoDB temporary tables.
------------------------------------------------------------------------
r6263 | vasil | 2009-12-01 14:49:05 +0200 (Tue, 01 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/include/univ.i
branches/zip: Increment version number from 1.0.6 to 1.0.7
1.0.6 has been released
------------------------------------------------------------------------
r6264 | vasil | 2009-12-01 16:19:44 +0200 (Tue, 01 Dec 2009) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: Add ChangeLog entry for the release of 1.0.6.
------------------------------------------------------------------------
r6269 | marko | 2009-12-02 11:35:22 +0200 (Wed, 02 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/srv/srv0start.c
branches/zip: innobase_start_or_create_for_mysql(): UNIV_IBUF_DEBUG
should not break crash recovery, but UNIV_IBUF_COUNT_DEBUG will.
------------------------------------------------------------------------
r6270 | marko | 2009-12-02 11:36:47 +0200 (Wed, 02 Dec 2009) | 1 line
Changed paths:
M /branches/zip/srv/srv0start.c
branches/zip: innobase_start_or_create_for_mysql(): Log the zlib version.
------------------------------------------------------------------------
r6271 | marko | 2009-12-02 11:43:49 +0200 (Wed, 02 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/Makefile.am
M /branches/zip/include/univ.i
M /branches/zip/plug.in
branches/zip: ChangeLog: Document that since r6270, the zlib version number
will be displayed at start-up.
------------------------------------------------------------------------
r6272 | marko | 2009-12-02 11:46:05 +0200 (Wed, 02 Dec 2009) | 1 line
Changed paths:
M /branches/zip/Makefile.am
M /branches/zip/include/univ.i
M /branches/zip/plug.in
branches/zip: Revert changes that were accidentally committed in r6271.
------------------------------------------------------------------------
r6274 | marko | 2009-12-03 14:47:12 +0200 (Thu, 03 Dec 2009) | 6 lines
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_table_check_for_dup_indexes(): Assert that the
data dictionary mutex is being held while table->indexes is accessed.
This is already the case.
Currently, only dict_table_get_next_index() and dict_table_get_first_index()
are being invoked without holding dict_sys->mutex.
------------------------------------------------------------------------
r6275 | pekka | 2009-12-03 18:32:47 +0200 (Thu, 03 Dec 2009) | 10 lines
Changed paths:
M /branches/zip/include/log0recv.h
M /branches/zip/include/trx0sys.h
M /branches/zip/log/log0recv.c
M /branches/zip/trx/trx0sys.c
branches/zip: Minor changes which allow build with UNIV_HOTBACKUP
defined to succeed:
include/trx0sys.h: Allow Hot Backup build to see some
TRX_SYS_DOUBLEWRITE_... macros.
trx/trx0sys.c: Exclude trx_sys_close() function from Hot Backup build.
log/log0recv.[ch]: Exclude recv_sys_var_init() function from Hot Backup build.
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r6277 | marko | 2009-12-08 11:13:36 +0200 (Tue, 08 Dec 2009) | 1 line
Changed paths:
M /branches/zip/fsp/fsp0fsp.c
branches/zip: fsp0fsp.c: Add some missing in/out and const qualifiers.
------------------------------------------------------------------------
r6285 | marko | 2009-12-09 09:24:50 +0200 (Wed, 09 Dec 2009) | 13 lines
Changed paths:
M /branches/zip/row/row0sel.c
branches/zip: row_sel_fetch_columns(): Remove redundant code that was
accidentally added in r1591, which introduced dfield_t::ext in order
to make the merge sort of fast index creation support externally
stored columns,
Initially, I tried to allocate the bit for dfield_t::ext from
dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
to something that would fit in it. Then I decided that it would be
too risky. The redundant check was part of the mapping. The
condition may have been dfield_is_null() initially.
This redundant code was noticed by Sergey Petrunya on the MySQL
internals list.
------------------------------------------------------------------------
r6288 | marko | 2009-12-09 09:51:00 +0200 (Wed, 09 Dec 2009) | 15 lines
Changed paths:
M /branches/zip/row/row0upd.c
branches/zip: row_upd_copy_columns(): Remove redundant code that was
accidentally added in r1591, which introduced dfield_t::ext in order
to make the merge sort of fast index creation support externally
stored columns.
Initially, I tried to allocate the bit for dfield_t::ext from
dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
to something that would fit in it. Then I decided that it would be
too risky. The redundant check was part of the mapping. The
condition may have been dfield_is_null() initially.
This is similar to the redundant code in row_sel_fetch_columns() that
was noticed by Sergey Petrunya on the MySQL internals list and removed
in r6285. As far as I can tell, there are no redundant UNIV_SQL_NULL
assignments remaining after this change.
------------------------------------------------------------------------
r6305 | marko | 2009-12-14 13:03:57 +0200 (Mon, 14 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/row/row0umod.c
branches/zip: row_undo_mod_del_unmark_sec_and_undo_update(): Add a missing
const qualifier.
------------------------------------------------------------------------
r6309 | marko | 2009-12-15 14:05:50 +0200 (Tue, 15 Dec 2009) | 3 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: lock_rec_insert_check_and_lock(): Avoid casting away constness.
Use page_rec_get_next_const() instead. This silences a gcc 4.2.4 warning.
Reported by Sunny Bains.
------------------------------------------------------------------------
r6312 | marko | 2009-12-16 10:10:36 +0200 (Wed, 16 Dec 2009) | 6 lines
Changed paths:
M /branches/zip/fil/fil0fil.c
branches/zip: fil_close(): Add #ifndef UNIV_HOTBACKUP around a debug
assertion on mutex.magic_n. InnoDB Hot Backup is a single-threaded
program and does not contain mutexes. This change allows InnoDB Hot
Backup to be compiled with UNIV_DEBUG.
Suggested by Michael Izioumtchenko.
------------------------------------------------------------------------
r6321 | marko | 2009-12-16 16:16:33 +0200 (Wed, 16 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/row/row0merge.c
branches/zip: row_merge_drop_temp_indexes(): Revert a hack to
transaction isolation level that was made unnecessary by r5826 (Issue #337).
When this function is called, any active data dictionary transaction
should have been rolled back.
------------------------------------------------------------------------
r6345 | marko | 2009-12-21 10:46:14 +0200 (Mon, 21 Dec 2009) | 7 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_scan_log_recs(): Non-functional change: Replace a
debug assertion ut_ad(len > 0) with ut_ad(len >= OS_FILE_LOG_BLOCK_SIZE).
This change is only for readability, for Issue #428. Another
assertion on len being an integer multiple of OS_FILE_LOG_BLOCK_SIZE
already ensured together with the old ut_ad(len > 0) that actually len
must be at least OS_FILE_LOG_BLOCK_SIZE.
------------------------------------------------------------------------
r6346 | marko | 2009-12-21 12:03:25 +0200 (Mon, 21 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_recovery_from_checkpoint_finish():
Revert a change that was accidentally committed in r6345.
------------------------------------------------------------------------
r6348 | marko | 2009-12-22 11:04:34 +0200 (Tue, 22 Dec 2009) | 37 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/ha_prototypes.h
M /branches/zip/include/trx0trx.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/trx/trx0i_s.c
M /branches/zip/trx/trx0trx.c
branches/zip: Merge a change from MySQL:
------------------------------------------------------------
revno: 3236
committer: Satya B <satya.bn@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-12-01 17:48:57 +0530
message:
merge to mysql-5.1-bugteam
------------------------------------------------------------
revno: 3234.1.1
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-12-01 14:38:40 +0400
message:
Bug #38883 (reopened): thd_security_context is not thread safe, crashes?
manual merge 5.0-->5.1, updating InnoDB plugin.
------------------------------------------------------------
revno: 1810.3968.13
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.0-bugteam
timestamp: Tue 2009-12-01 14:24:44 +0400
message:
Bug #38883 (reopened): thd_security_context is not thread safe, crashes?
The bug 38816 changed the lock that protects THD::query from
LOCK_thread_count to LOCK_thd_data, but didn't update the associated
InnoDB functions.
1. The innobase_mysql_prepare_print_arbitrary_thd and the
innobase_mysql_end_print_arbitrary_thd InnoDB functions have been
removed, since now we have a per-thread mutex: now we don't need to wrap
several inter-thread access tries to THD::query with a single global
LOCK_thread_count lock, so we can simplify the code.
2. The innobase_mysql_print_thd function has been modified to lock
LOCK_thd_data in direct way.
------------------------------------------------------------------------
r6351 | marko | 2009-12-22 11:11:18 +0200 (Tue, 22 Dec 2009) | 1 line
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Remove an obsolete declaration of LOCK_thread_count.
------------------------------------------------------------------------
r6352 | marko | 2009-12-22 12:33:01 +0200 (Tue, 22 Dec 2009) | 104 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/lock0lock.h
M /branches/zip/include/srv0srv.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/mysql-test/innodb-autoinc.result
M /branches/zip/mysql-test/innodb-autoinc.test
M /branches/zip/row/row0sel.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
branches/zip: Merge revisions 6206:6350 from branches/5.1,
except r6347, r6349, r6350 which were committed separately
to both branches, and r6310, which was backported from zip to 5.1.
------------------------------------------------------------------------
r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 3 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Non-functional change, fix formatting.
------------------------------------------------------------------------
r6230 | sunny | 2009-11-24 23:52:43 +0200 (Tue, 24 Nov 2009) | 3 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
branches/5.1: Fix autoinc failing test results.
(this should be skipped when merging 5.1 into zip)
------------------------------------------------------------------------
r6231 | sunny | 2009-11-25 10:26:27 +0200 (Wed, 25 Nov 2009) | 7 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
M /branches/5.1/row/row0sel.c
branches/5.1: Fix BUG#49032 - auto_increment field does not initialize to last value in InnoDB Storage Engine.
We use the appropriate function to read the column value for non-integer
autoinc column types, namely float and double.
rb://208. Approved by Marko.
------------------------------------------------------------------------
r6232 | sunny | 2009-11-25 10:27:39 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix white space errors.
------------------------------------------------------------------------
r6233 | sunny | 2009-11-25 10:28:35 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/include/mach0data.h
M /branches/5.1/include/mach0data.ic
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix tests and make read float/double arg const.
------------------------------------------------------------------------
r6234 | sunny | 2009-11-25 10:29:03 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix whitepsace issues.
------------------------------------------------------------------------
r6235 | sunny | 2009-11-26 01:14:42 +0200 (Thu, 26 Nov 2009) | 9 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Fix Bug#47720 - REPLACE INTO Autoincrement column with negative values.
This bug is similiar to the negative autoinc filter patch from earlier,
with the additional handling of filtering out the negative column values
set explicitly by the user.
rb://184
Approved by Heikki.
------------------------------------------------------------------------
r6242 | vasil | 2009-11-27 22:07:12 +0200 (Fri, 27 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/export.sh
branches/5.1:
Minor changes to support plugin snapshots.
------------------------------------------------------------------------
r6306 | calvin | 2009-12-14 15:12:46 +0200 (Mon, 14 Dec 2009) | 5 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: fix bug#49267: innodb-autoinc.test fails on windows
because of different case mode
There is no change to the InnoDB code, only to fix test case by
changing "T1" to "t1".
------------------------------------------------------------------------
r6324 | jyang | 2009-12-17 06:54:24 +0200 (Thu, 17 Dec 2009) | 8 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/lock0lock.h
M /branches/5.1/include/srv0srv.h
M /branches/5.1/lock/lock0lock.c
M /branches/5.1/log/log0log.c
M /branches/5.1/srv/srv0srv.c
M /branches/5.1/srv/srv0start.c
branches/5.1: Fix bug #47814 - Diagnostics are frequently not
printed after a long lock wait in InnoDB. Separate out the
lock wait timeout check thread from monitor information
printing thread.
rb://200 Approved by Marko.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6364 | marko | 2009-12-26 21:06:31 +0200 (Sat, 26 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/ibuf/ibuf0ibuf.c
branches/zip: ibuf_bitmap_get_map_page():
Define a wrapper macro that passes __FILE__, __LINE__ of the caller
to buf_page_get_gen().
This will ease the diagnosis of the likes of Issue #135.
------------------------------------------------------------------------
2009-12-26 20:17:43 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
Slot* slot = first_slot();
|
branches/innodb+: Merge revisions 6130:6364 from branches/zip:
------------------------------------------------------------------------
r6130 | marko | 2009-11-02 11:42:56 +0200 (Mon, 02 Nov 2009) | 9 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/btr/btr0sea.c
M /branches/zip/buf/buf0buf.c
M /branches/zip/dict/dict0dict.c
M /branches/zip/fil/fil0fil.c
M /branches/zip/ibuf/ibuf0ibuf.c
M /branches/zip/include/btr0sea.h
M /branches/zip/include/dict0dict.h
M /branches/zip/include/fil0fil.h
M /branches/zip/include/ibuf0ibuf.h
M /branches/zip/include/lock0lock.h
M /branches/zip/include/log0log.h
M /branches/zip/include/log0recv.h
M /branches/zip/include/mem0mem.h
M /branches/zip/include/mem0pool.h
M /branches/zip/include/os0file.h
M /branches/zip/include/pars0pars.h
M /branches/zip/include/srv0srv.h
M /branches/zip/include/thr0loc.h
M /branches/zip/include/trx0i_s.h
M /branches/zip/include/trx0purge.h
M /branches/zip/include/trx0rseg.h
M /branches/zip/include/trx0sys.h
M /branches/zip/include/trx0undo.h
M /branches/zip/include/usr0sess.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/log/log0recv.c
M /branches/zip/mem/mem0dbg.c
M /branches/zip/mem/mem0pool.c
M /branches/zip/os/os0file.c
M /branches/zip/os/os0sync.c
M /branches/zip/os/os0thread.c
M /branches/zip/pars/lexyy.c
M /branches/zip/pars/pars0lex.l
M /branches/zip/que/que0que.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
M /branches/zip/sync/sync0arr.c
M /branches/zip/sync/sync0sync.c
M /branches/zip/thr/thr0loc.c
M /branches/zip/trx/trx0i_s.c
M /branches/zip/trx/trx0purge.c
M /branches/zip/trx/trx0rseg.c
M /branches/zip/trx/trx0sys.c
M /branches/zip/trx/trx0undo.c
M /branches/zip/usr/usr0sess.c
M /branches/zip/ut/ut0mem.c
branches/zip: Free all resources at shutdown. Set pointers to NULL, so
that Valgrind will not complain about freed data structures that are
reachable via pointers. This addresses Bug #45992 and Bug #46656.
This patch is mostly based on changes copied from branches/embedded-1.0,
mainly c5432, c3439, c3134, c2994, c2978, but also some other code was
copied. Some added cleanup code is specific to MySQL/InnoDB.
rb://199 approved by Sunny Bains
------------------------------------------------------------------------
r6134 | marko | 2009-11-04 09:57:29 +0200 (Wed, 04 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
branches/zip: innobase_convert_identifier(): Convert table names with
explain_filename() to address Bug #32430: 'show innodb status'
causes errors Invalid (old?) table or database name in logs.
rb://134 approved by Sunny Bains
------------------------------------------------------------------------
r6137 | marko | 2009-11-04 15:24:28 +0200 (Wed, 04 Nov 2009) | 1 line
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_index_too_big_for_undo(): Correct a typo.
------------------------------------------------------------------------
r6153 | vasil | 2009-11-10 15:33:22 +0200 (Tue, 10 Nov 2009) | 145 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Merge r6125:6152 from branches/5.1:
(everything except the last white-space change was skipped as it is already
in branches/zip)
------------------------------------------------------------------------
r6127 | vasil | 2009-10-30 11:18:25 +0200 (Fri, 30 Oct 2009) | 18 lines
Changed paths:
M /branches/5.1/Makefile.am
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1:
Backport c6121 from branches/zip:
------------------------------------------------------------------------
r6121 | sunny | 2009-10-30 01:42:11 +0200 (Fri, 30 Oct 2009) | 7 lines
Changed paths:
M /branches/zip/mysql-test/innodb-autoinc.result
branches/zip: This test has been problematic for sometime now. The underlying
bug is that the data dictionaries get out of sync. In the AUTOINC code we
try and apply salve to the symptoms. In the past MySQL made some unrelated
change and the dictionaries stopped getting out of sync and this test started
to fail. Now, it seems they have reverted that changed and the test is
passing again. I suspect this is not he last time that this test will change.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6129 | vasil | 2009-10-30 17:14:22 +0200 (Fri, 30 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/Makefile.am
branches/5.1:
Revert a change to Makefile.am that sneaked unnoticed in c6127.
------------------------------------------------------------------------
r6136 | marko | 2009-11-04 12:28:10 +0200 (Wed, 04 Nov 2009) | 15 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/ha_prototypes.h
M /branches/5.1/ut/ut0ut.c
branches/5.1: Port r6134 from branches/zip:
------------------------------------------------------------------------
r6134 | marko | 2009-11-04 07:57:29 +0000 (Wed, 04 Nov 2009) | 5 lines
branches/zip: innobase_convert_identifier(): Convert table names with
explain_filename() to address Bug #32430: 'show innodb status'
causes errors Invalid (old?) table or database name in logs.
rb://134 approved by Sunny Bains
------------------------------------------------------------------------
innobase_print_identifier(): Replace with innobase_convert_name().
innobase_convert_identifier(): New function, called by innobase_convert_name().
------------------------------------------------------------------------
r6149 | vasil | 2009-11-09 11:15:01 +0200 (Mon, 09 Nov 2009) | 5 lines
Changed paths:
M /branches/5.1/CMakeLists.txt
branches/5.1:
Followup to r5700: Adjust the changes so they are the same as in the BZR
repository.
------------------------------------------------------------------------
r6150 | vasil | 2009-11-09 11:43:31 +0200 (Mon, 09 Nov 2009) | 58 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Merge a part of r2911.5.5 from MySQL:
(the other part of this was merged in c5700)
------------------------------------------------------------
revno: 2911.5.5
committer: Vladislav Vaintroub <vvaintroub@mysql.com>
branch nick: 5.1-innodb_plugin
timestamp: Wed 2009-06-10 10:59:49 +0200
message:
Backport WL#3653 to 5.1 to enable bundled innodb plugin.
Remove custom DLL loader code from innodb plugin code, use
symbols exported from mysqld.
removed:
storage/innodb_plugin/handler/handler0vars.h
storage/innodb_plugin/handler/win_delay_loader.cc
added:
storage/mysql_storage_engine.cmake
win/create_def_file.js
modified:
CMakeLists.txt
include/m_ctype.h
include/my_global.h
include/my_sys.h
include/mysql/plugin.h
libmysqld/CMakeLists.txt
mysql-test/mysql-test-run.pl
mysql-test/t/plugin.test
mysql-test/t/plugin_load-master.opt
mysys/charset.c
sql/CMakeLists.txt
sql/handler.h
sql/mysql_priv.h
sql/mysqld.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_list.h
sql/sql_profile.h
storage/Makefile.am
storage/archive/CMakeLists.txt
storage/blackhole/CMakeLists.txt
storage/csv/CMakeLists.txt
storage/example/CMakeLists.txt
storage/federated/CMakeLists.txt
storage/heap/CMakeLists.txt
storage/innobase/CMakeLists.txt
storage/innobase/handler/ha_innodb.cc
storage/innodb_plugin/CMakeLists.txt
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/handler0alter.cc
storage/innodb_plugin/handler/i_s.cc
storage/innodb_plugin/plug.in
storage/myisam/CMakeLists.txt
storage/myisammrg/CMakeLists.txt
win/Makefile.am
win/configure.js
------------------------------------------------------------------------
r6152 | vasil | 2009-11-10 15:30:20 +0200 (Tue, 10 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
White space fixup.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6157 | jyang | 2009-11-11 14:27:09 +0200 (Wed, 11 Nov 2009) | 10 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
A /branches/zip/mysql-test/innodb_bug47167.result
A /branches/zip/mysql-test/innodb_bug47167.test
M /branches/zip/mysql-test/innodb_file_format.result
branches/zip: Fix an issue that a local variable defined
in innodb_file_format_check_validate() is being referenced
across function in innodb_file_format_check_update().
In addition, fix "set global innodb_file_format_check =
DEFAULT" call.
Bug #47167: "set global innodb_file_format_check" cannot
set value by User-Defined Variable."
rb://169 approved by Sunny Bains and Marko.
------------------------------------------------------------------------
r6159 | vasil | 2009-11-11 15:13:01 +0200 (Wed, 11 Nov 2009) | 37 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
branches/zip:
Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)
------------------------------------------------------------
revno: 3092.5.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-09-24 15:52:52 +0100
message:
BUG#42829: binlogging enabled for all schemas regardless of
binlog-db-db / binlog-ignore-db
InnoDB will return an error if statement based replication is used
along with transaction isolation level READ-COMMITTED (or weaker),
even if the statement in question is filtered out according to the
binlog-do-db rules set. In this case, an error should not be printed.
This patch addresses this issue by extending the existing check in
external_lock to take into account the filter rules before deciding to
print an error. Furthermore, it also changes decide_logging_format to
take into consideration whether the statement is filtered out from
binlog before decision is made.
added:
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
modified:
sql/sql_base.cc
sql/sql_class.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
------------------------------------------------------------------------
r6160 | vasil | 2009-11-11 15:33:49 +0200 (Wed, 11 Nov 2009) | 72 lines
Changed paths:
M /branches/zip/include/os0file.h
M /branches/zip/os/os0file.c
branches/zip: Merge r6152:6159 from branches/5.1:
(r6158 was skipped as an equivallent change has already been merged from MySQL)
------------------------------------------------------------------------
r6154 | calvin | 2009-11-11 02:51:17 +0200 (Wed, 11 Nov 2009) | 17 lines
Changed paths:
M /branches/5.1/include/os0file.h
M /branches/5.1/os/os0file.c
branches/5.1: fix bug#3139: Mysql crashes: 'windows error 995'
after several selects on a large DB
During stress environment, Windows AIO may fail with error code
ERROR_OPERATION_ABORTED. InnoDB does not handle the error, rather
crashes. The cause of the error is unknown, but likely due to
faulty hardware or driver.
This patch introduces a new error code OS_FILE_OPERATION_ABORTED,
which maps to Windows ERROR_OPERATION_ABORTED (995). When the error
is detected during AIO, the InnoDB will issue a synchronous retry
(read/write).
This patch has been extensively tested by MySQL support.
Approved by: Marko
rb://196
------------------------------------------------------------------------
r6158 | vasil | 2009-11-11 14:52:14 +0200 (Wed, 11 Nov 2009) | 37 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/handler/ha_innodb.h
branches/5.1:
Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)
------------------------------------------------------------
revno: 3092.5.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-09-24 15:52:52 +0100
message:
BUG#42829: binlogging enabled for all schemas regardless of
binlog-db-db / binlog-ignore-db
InnoDB will return an error if statement based replication is used
along with transaction isolation level READ-COMMITTED (or weaker),
even if the statement in question is filtered out according to the
binlog-do-db rules set. In this case, an error should not be printed.
This patch addresses this issue by extending the existing check in
external_lock to take into account the filter rules before deciding to
print an error. Furthermore, it also changes decide_logging_format to
take into consideration whether the statement is filtered out from
binlog before decision is made.
added:
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
modified:
sql/sql_base.cc
sql/sql_class.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
------------------------------------------------------------------------
------------------------------------------------------------------------
r6161 | vasil | 2009-11-11 15:36:16 +0200 (Wed, 11 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add changelog entry for r6160.
------------------------------------------------------------------------
r6162 | vasil | 2009-11-11 16:00:12 +0200 (Wed, 11 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog for r6157.
------------------------------------------------------------------------
r6163 | calvin | 2009-11-11 17:53:20 +0200 (Wed, 11 Nov 2009) | 8 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
branches/zip: Exclude thd_binlog_filter_ok() when building
with older version of MySQL.
thd_binlog_filter_ok() is introduced in MySQL 5.1.41. But the
plugin can be built with MySQL prior to 5.1.41.
Approved by Heikki (on IM).
------------------------------------------------------------------------
r6169 | calvin | 2009-11-12 14:40:43 +0200 (Thu, 12 Nov 2009) | 6 lines
Changed paths:
A /branches/zip/mysql-test/innodb_bug46676.result
A /branches/zip/mysql-test/innodb_bug46676.test
branches/zip: add test case for bug#46676
This crash is reproducible with InnoDB plugin 1.0.4 + MySQL 5.1.37.
But no longer reproducible after MySQL 5.1.38 (with plugin 1.0.5).
Add test case to catch future regression.
------------------------------------------------------------------------
r6170 | marko | 2009-11-12 15:49:08 +0200 (Thu, 12 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/db0err.h
M /branches/zip/row/row0merge.c
M /branches/zip/row/row0mysql.c
branches/zip: Allow CREATE INDEX to be interrupted. (Issue #354)
rb://183 approved by Heikki Tuuri
------------------------------------------------------------------------
r6175 | vasil | 2009-11-16 20:07:39 +0200 (Mon, 16 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Wrap line at 78th char in the ChangeLog
------------------------------------------------------------------------
r6177 | calvin | 2009-11-16 20:20:38 +0200 (Mon, 16 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip: add an entry to ChangeLog for r6065
------------------------------------------------------------------------
r6179 | marko | 2009-11-17 10:19:34 +0200 (Tue, 17 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: ha_innobase::change_active_index(): When the history is
missing, report it to the client, not to the error log.
------------------------------------------------------------------------
r6181 | vasil | 2009-11-17 12:21:41 +0200 (Tue, 17 Nov 2009) | 33 lines
Changed paths:
M /branches/zip/mysql-test/innodb-index.test
branches/zip:
At the end of innodb-index.test: restore the environment as it was before
the test was started to silence this warning:
MTR's internal check of the test case 'main.innodb-index' failed.
This means that the test case does not preserve the state that existed
before the test case was executed. Most likely the test case did not
do a proper clean-up.
This is the diff of the states of the servers before and after the
test case was executed:
mysqltest: Logging to '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.log'.
mysqltest: Results saved in '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result'.
mysqltest: Connecting to server localhost:13000 (socket /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/mysqld.1.sock) as 'root', connection 'default', attempt 0 ...
mysqltest: ... Connected.
mysqltest: Start processing test commands from './include/check-testcase.test' ...
mysqltest: ... Done processing test commands.
--- /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result 2009-11-17 13:10:40.000000000 +0300
+++ /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.reject 2009-11-17 13:10:54.000000000 +0300
@@ -84,7 +84,7 @@
INNODB_DOUBLEWRITE ON
INNODB_FAST_SHUTDOWN 1
INNODB_FILE_FORMAT Antelope
-INNODB_FILE_FORMAT_CHECK Antelope
+INNODB_FILE_FORMAT_CHECK Barracuda
INNODB_FILE_PER_TABLE OFF
INNODB_FLUSH_LOG_AT_TRX_COMMIT 1
INNODB_FLUSH_METHOD
mysqltest: Result content mismatch
not ok
------------------------------------------------------------------------
r6182 | marko | 2009-11-17 13:49:15 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-consistent-master.opt
M /branches/zip/mysql-test/innodb-consistent.result
M /branches/zip/mysql-test/innodb-consistent.test
M /branches/zip/mysql-test/innodb-use-sys-malloc-master.opt
M /branches/zip/mysql-test/innodb-use-sys-malloc.result
M /branches/zip/mysql-test/innodb-use-sys-malloc.test
M /branches/zip/mysql-test/innodb_bug21704.result
M /branches/zip/mysql-test/innodb_bug21704.test
M /branches/zip/mysql-test/innodb_bug40360.test
M /branches/zip/mysql-test/innodb_bug40565.result
M /branches/zip/mysql-test/innodb_bug40565.test
M /branches/zip/mysql-test/innodb_bug41904.result
M /branches/zip/mysql-test/innodb_bug41904.test
M /branches/zip/mysql-test/innodb_bug42101-nonzero-master.opt
M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
M /branches/zip/mysql-test/innodb_bug42101.result
M /branches/zip/mysql-test/innodb_bug42101.test
M /branches/zip/mysql-test/innodb_bug44032.result
M /branches/zip/mysql-test/innodb_bug44032.test
M /branches/zip/mysql-test/innodb_bug44369.result
M /branches/zip/mysql-test/innodb_bug44369.test
M /branches/zip/mysql-test/innodb_bug44571.result
M /branches/zip/mysql-test/innodb_bug44571.test
M /branches/zip/mysql-test/innodb_bug45357.test
M /branches/zip/mysql-test/innodb_bug46000.result
M /branches/zip/mysql-test/innodb_bug46000.test
M /branches/zip/mysql-test/innodb_bug46676.result
M /branches/zip/mysql-test/innodb_bug46676.test
M /branches/zip/mysql-test/innodb_bug47167.result
M /branches/zip/mysql-test/innodb_bug47167.test
M /branches/zip/mysql-test/innodb_bug47777.result
M /branches/zip/mysql-test/innodb_bug47777.test
M /branches/zip/mysql-test/innodb_file_format.result
M /branches/zip/mysql-test/innodb_file_format.test
branches/zip: Set svn:eol-style on mysql-test files.
------------------------------------------------------------------------
r6183 | marko | 2009-11-17 13:51:16 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-consistent-master.opt
M /branches/zip/mysql-test/innodb-master.opt
M /branches/zip/mysql-test/innodb-semi-consistent-master.opt
M /branches/zip/mysql-test/innodb-use-sys-malloc-master.opt
M /branches/zip/mysql-test/innodb_bug42101-nonzero-master.opt
branches/zip: Prepend loose_ to plugin-only mysql-test options.
------------------------------------------------------------------------
r6184 | marko | 2009-11-17 13:52:01 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-index.result
M /branches/zip/mysql-test/innodb-index.test
branches/zip: innodb-index.test: Restore innodb_file_format_check.
------------------------------------------------------------------------
r6185 | marko | 2009-11-17 16:44:20 +0200 (Tue, 17 Nov 2009) | 16 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/mysql-test/innodb.result
M /branches/zip/mysql-test/innodb.test
M /branches/zip/mysql-test/innodb_bug44369.result
M /branches/zip/mysql-test/innodb_bug44369.test
D /branches/zip/mysql-test/patches/innodb-index.diff
M /branches/zip/row/row0mysql.c
branches/zip: Report duplicate table names
to the client connection, not to the error log. This change will allow
innodb-index.test to be re-enabled. It was previously disabled, because
mysql-test-run does not like output in the error log.
row_create_table_for_mysql(): Do not output anything to the error log
when reporting DB_DUPLICATE_KEY. Let the caller report the error.
Add a TODO comment that the dict_table_t object is apparently not freed
when an error occurs.
create_table_def(): Convert InnoDB table names to the character set
of the client connection for reporting. Use my_error(ER_WRONG_COLUMN_NAME)
for reporting reserved column names. Report my_error(ER_TABLE_EXISTS_ERROR)
when row_create_table_for_mysql() returns DB_DUPLICATE_KEY.
rb://206
------------------------------------------------------------------------
r6186 | vasil | 2009-11-17 16:48:14 +0200 (Tue, 17 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for r6185.
------------------------------------------------------------------------
r6189 | marko | 2009-11-18 11:36:18 +0200 (Wed, 18 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): When creating the primary key
and the table is being locked by another transaction,
do not attempt to drop the table. (Bug #48782)
Approved by Sunny Bains over IM
------------------------------------------------------------------------
r6194 | vasil | 2009-11-19 09:24:45 +0200 (Thu, 19 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/include/univ.i
branches/zip:
Increment version number from 1.0.5 to 1.0.6 since 1.0.5 was just released
by MySQL and we will soon release 1.0.6.
------------------------------------------------------------------------
r6197 | calvin | 2009-11-19 09:32:55 +0200 (Thu, 19 Nov 2009) | 6 lines
Changed paths:
M /branches/zip/CMakeLists.txt
branches/zip: merge the fix of bug#48317 (CMake file)
Due to MySQL changes to the CMake, it is no longer able
to build InnoDB plugin as a static library on Windows.
The fix is proposed by Vlad of MySQL.
------------------------------------------------------------------------
r6198 | vasil | 2009-11-19 09:44:31 +0200 (Thu, 19 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for r6197.
------------------------------------------------------------------------
r6199 | vasil | 2009-11-19 12:10:12 +0200 (Thu, 19 Nov 2009) | 31 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/btr/btr0btr.c
M /branches/zip/data/data0type.c
branches/zip: Merge r6159:6198 from branches/5.1:
------------------------------------------------------------------------
r6187 | jyang | 2009-11-18 05:27:30 +0200 (Wed, 18 Nov 2009) | 9 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1: Fix bug #48469 "when innodb tablespace is
configured too small, crash and corruption!". Function
btr_create() did not check the return status of fseg_create(),
and continue the index creation even there is no sufficient
space.
rb://205 Approved by Marko
------------------------------------------------------------------------
r6188 | jyang | 2009-11-18 07:14:23 +0200 (Wed, 18 Nov 2009) | 8 lines
Changed paths:
M /branches/5.1/data/data0type.c
branches/5.1: Fix bug #48526 "Data type for float and
double is incorrectly reported in InnoDB table monitor".
Certain datatypes are not printed correctly in
dtype_print().
rb://204 Approved by Marko.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6201 | marko | 2009-11-19 14:09:11 +0200 (Thu, 19 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): Clarify the comment
on orphaned tables when creating a primary key.
------------------------------------------------------------------------
r6202 | jyang | 2009-11-19 15:01:00 +0200 (Thu, 19 Nov 2009) | 8 lines
Changed paths:
M /branches/zip/btr/btr0btr.c
branches/zip: Function fseg_free() is no longer defined
in branches/zip. To port fix for bug #48469 to zip,
we can use btr_free_root() which frees the page,
and also does not require mini-transaction.
Approved by Marko.
------------------------------------------------------------------------
r6207 | vasil | 2009-11-20 10:19:14 +0200 (Fri, 20 Nov 2009) | 54 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Merge r6198:6206 from branches/5.1:
(r6203 was skipped as it is already in branches/zip)
------------------------------------------------------------------------
r6200 | vasil | 2009-11-19 12:14:23 +0200 (Thu, 19 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1:
White space fixup - indent under the opening (
------------------------------------------------------------------------
r6203 | jyang | 2009-11-19 15:12:22 +0200 (Thu, 19 Nov 2009) | 8 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1: Use btr_free_root() instead of fseg_free() for
the fix of bug #48469, because fseg_free() is not defined
in the zip branch. And we could save one mini-trasaction started
by fseg_free().
Approved by Marko.
------------------------------------------------------------------------
r6205 | jyang | 2009-11-20 07:55:48 +0200 (Fri, 20 Nov 2009) | 11 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Add a special case to handle the Duplicated Key error
and return DB_ERROR instead. This is to avoid a possible SIGSEGV
by mysql error handling re-entering the storage layer for dup key
info without proper table handle.
This is to prevent a server crash when error situation in bug
#45961 "DDL on partitioned innodb tables leaves data dictionary
in an inconsistent state" happens.
rb://157 approved by Sunny Bains.
------------------------------------------------------------------------
r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 5 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Fix a minor code formating issue for
the parenthesis iplacement of the if condition in
rename_table().
------------------------------------------------------------------------
------------------------------------------------------------------------
r6208 | vasil | 2009-11-20 10:49:24 +0200 (Fri, 20 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for c6207.
------------------------------------------------------------------------
r6210 | vasil | 2009-11-20 23:39:48 +0200 (Fri, 20 Nov 2009) | 3 lines
Changed paths:
M /branches/zip/trx/trx0i_s.c
branches/zip:
Whitespace fixup.
------------------------------------------------------------------------
r6248 | marko | 2009-11-30 12:19:50 +0200 (Mon, 30 Nov 2009) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: ChangeLog: Document r4922 that was forgotten.
------------------------------------------------------------------------
r6252 | marko | 2009-11-30 12:50:11 +0200 (Mon, 30 Nov 2009) | 23 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/dict/dict0boot.c
M /branches/zip/dict/dict0crea.c
M /branches/zip/dict/dict0load.c
M /branches/zip/dict/dict0mem.c
M /branches/zip/fil/fil0fil.c
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/dict0mem.h
M /branches/zip/row/row0mysql.c
branches/zip: Suppress errors about non-found temporary tables.
Write the is_temp flag to SYS_TABLES.MIX_LEN.
dict_table_t::flags: Add a flag for is_temporary, DICT_TF2_TEMPORARY.
Unlike other flags, this will not be written to the tablespace flags
or SYS_TABLES.TYPE, but only to SYS_TABLES.MIX_LEN.
dict_build_table_def_step(): Only pass DICT_TF_BITS to tablespaces.
dict_check_tablespaces_and_store_max_id(), dict_load_table():
Suppress errors about temporary tables not being found.
dict_create_sys_tables_tuple(): Write the DICT_TF2_TEMPORARY flag
to SYS_TABLES.MIX_LEN.
fil_space_create(), fil_create_new_single_table_tablespace(): Add assertions
about space->flags.
row_drop_table_for_mysql(): Do not complain about non-found temporary tables.
rb://160 approved by Heikki Tuuri. This addresses the second part of
Bug #41609 Crash recovery does not work for InnoDB temporary tables.
------------------------------------------------------------------------
r6263 | vasil | 2009-12-01 14:49:05 +0200 (Tue, 01 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/include/univ.i
branches/zip: Increment version number from 1.0.6 to 1.0.7
1.0.6 has been released
------------------------------------------------------------------------
r6264 | vasil | 2009-12-01 16:19:44 +0200 (Tue, 01 Dec 2009) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: Add ChangeLog entry for the release of 1.0.6.
------------------------------------------------------------------------
r6269 | marko | 2009-12-02 11:35:22 +0200 (Wed, 02 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/srv/srv0start.c
branches/zip: innobase_start_or_create_for_mysql(): UNIV_IBUF_DEBUG
should not break crash recovery, but UNIV_IBUF_COUNT_DEBUG will.
------------------------------------------------------------------------
r6270 | marko | 2009-12-02 11:36:47 +0200 (Wed, 02 Dec 2009) | 1 line
Changed paths:
M /branches/zip/srv/srv0start.c
branches/zip: innobase_start_or_create_for_mysql(): Log the zlib version.
------------------------------------------------------------------------
r6271 | marko | 2009-12-02 11:43:49 +0200 (Wed, 02 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/Makefile.am
M /branches/zip/include/univ.i
M /branches/zip/plug.in
branches/zip: ChangeLog: Document that since r6270, the zlib version number
will be displayed at start-up.
------------------------------------------------------------------------
r6272 | marko | 2009-12-02 11:46:05 +0200 (Wed, 02 Dec 2009) | 1 line
Changed paths:
M /branches/zip/Makefile.am
M /branches/zip/include/univ.i
M /branches/zip/plug.in
branches/zip: Revert changes that were accidentally committed in r6271.
------------------------------------------------------------------------
r6274 | marko | 2009-12-03 14:47:12 +0200 (Thu, 03 Dec 2009) | 6 lines
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_table_check_for_dup_indexes(): Assert that the
data dictionary mutex is being held while table->indexes is accessed.
This is already the case.
Currently, only dict_table_get_next_index() and dict_table_get_first_index()
are being invoked without holding dict_sys->mutex.
------------------------------------------------------------------------
r6275 | pekka | 2009-12-03 18:32:47 +0200 (Thu, 03 Dec 2009) | 10 lines
Changed paths:
M /branches/zip/include/log0recv.h
M /branches/zip/include/trx0sys.h
M /branches/zip/log/log0recv.c
M /branches/zip/trx/trx0sys.c
branches/zip: Minor changes which allow build with UNIV_HOTBACKUP
defined to succeed:
include/trx0sys.h: Allow Hot Backup build to see some
TRX_SYS_DOUBLEWRITE_... macros.
trx/trx0sys.c: Exclude trx_sys_close() function from Hot Backup build.
log/log0recv.[ch]: Exclude recv_sys_var_init() function from Hot Backup build.
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r6277 | marko | 2009-12-08 11:13:36 +0200 (Tue, 08 Dec 2009) | 1 line
Changed paths:
M /branches/zip/fsp/fsp0fsp.c
branches/zip: fsp0fsp.c: Add some missing in/out and const qualifiers.
------------------------------------------------------------------------
r6285 | marko | 2009-12-09 09:24:50 +0200 (Wed, 09 Dec 2009) | 13 lines
Changed paths:
M /branches/zip/row/row0sel.c
branches/zip: row_sel_fetch_columns(): Remove redundant code that was
accidentally added in r1591, which introduced dfield_t::ext in order
to make the merge sort of fast index creation support externally
stored columns,
Initially, I tried to allocate the bit for dfield_t::ext from
dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
to something that would fit in it. Then I decided that it would be
too risky. The redundant check was part of the mapping. The
condition may have been dfield_is_null() initially.
This redundant code was noticed by Sergey Petrunya on the MySQL
internals list.
------------------------------------------------------------------------
r6288 | marko | 2009-12-09 09:51:00 +0200 (Wed, 09 Dec 2009) | 15 lines
Changed paths:
M /branches/zip/row/row0upd.c
branches/zip: row_upd_copy_columns(): Remove redundant code that was
accidentally added in r1591, which introduced dfield_t::ext in order
to make the merge sort of fast index creation support externally
stored columns.
Initially, I tried to allocate the bit for dfield_t::ext from
dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
to something that would fit in it. Then I decided that it would be
too risky. The redundant check was part of the mapping. The
condition may have been dfield_is_null() initially.
This is similar to the redundant code in row_sel_fetch_columns() that
was noticed by Sergey Petrunya on the MySQL internals list and removed
in r6285. As far as I can tell, there are no redundant UNIV_SQL_NULL
assignments remaining after this change.
------------------------------------------------------------------------
r6305 | marko | 2009-12-14 13:03:57 +0200 (Mon, 14 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/row/row0umod.c
branches/zip: row_undo_mod_del_unmark_sec_and_undo_update(): Add a missing
const qualifier.
------------------------------------------------------------------------
r6309 | marko | 2009-12-15 14:05:50 +0200 (Tue, 15 Dec 2009) | 3 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: lock_rec_insert_check_and_lock(): Avoid casting away constness.
Use page_rec_get_next_const() instead. This silences a gcc 4.2.4 warning.
Reported by Sunny Bains.
------------------------------------------------------------------------
r6312 | marko | 2009-12-16 10:10:36 +0200 (Wed, 16 Dec 2009) | 6 lines
Changed paths:
M /branches/zip/fil/fil0fil.c
branches/zip: fil_close(): Add #ifndef UNIV_HOTBACKUP around a debug
assertion on mutex.magic_n. InnoDB Hot Backup is a single-threaded
program and does not contain mutexes. This change allows InnoDB Hot
Backup to be compiled with UNIV_DEBUG.
Suggested by Michael Izioumtchenko.
------------------------------------------------------------------------
r6321 | marko | 2009-12-16 16:16:33 +0200 (Wed, 16 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/row/row0merge.c
branches/zip: row_merge_drop_temp_indexes(): Revert a hack to
transaction isolation level that was made unnecessary by r5826 (Issue #337).
When this function is called, any active data dictionary transaction
should have been rolled back.
------------------------------------------------------------------------
r6345 | marko | 2009-12-21 10:46:14 +0200 (Mon, 21 Dec 2009) | 7 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_scan_log_recs(): Non-functional change: Replace a
debug assertion ut_ad(len > 0) with ut_ad(len >= OS_FILE_LOG_BLOCK_SIZE).
This change is only for readability, for Issue #428. Another
assertion on len being an integer multiple of OS_FILE_LOG_BLOCK_SIZE
already ensured together with the old ut_ad(len > 0) that actually len
must be at least OS_FILE_LOG_BLOCK_SIZE.
------------------------------------------------------------------------
r6346 | marko | 2009-12-21 12:03:25 +0200 (Mon, 21 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_recovery_from_checkpoint_finish():
Revert a change that was accidentally committed in r6345.
------------------------------------------------------------------------
r6348 | marko | 2009-12-22 11:04:34 +0200 (Tue, 22 Dec 2009) | 37 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/ha_prototypes.h
M /branches/zip/include/trx0trx.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/trx/trx0i_s.c
M /branches/zip/trx/trx0trx.c
branches/zip: Merge a change from MySQL:
------------------------------------------------------------
revno: 3236
committer: Satya B <satya.bn@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-12-01 17:48:57 +0530
message:
merge to mysql-5.1-bugteam
------------------------------------------------------------
revno: 3234.1.1
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-12-01 14:38:40 +0400
message:
Bug #38883 (reopened): thd_security_context is not thread safe, crashes?
manual merge 5.0-->5.1, updating InnoDB plugin.
------------------------------------------------------------
revno: 1810.3968.13
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.0-bugteam
timestamp: Tue 2009-12-01 14:24:44 +0400
message:
Bug #38883 (reopened): thd_security_context is not thread safe, crashes?
The bug 38816 changed the lock that protects THD::query from
LOCK_thread_count to LOCK_thd_data, but didn't update the associated
InnoDB functions.
1. The innobase_mysql_prepare_print_arbitrary_thd and the
innobase_mysql_end_print_arbitrary_thd InnoDB functions have been
removed, since now we have a per-thread mutex: now we don't need to wrap
several inter-thread access tries to THD::query with a single global
LOCK_thread_count lock, so we can simplify the code.
2. The innobase_mysql_print_thd function has been modified to lock
LOCK_thd_data in direct way.
------------------------------------------------------------------------
r6351 | marko | 2009-12-22 11:11:18 +0200 (Tue, 22 Dec 2009) | 1 line
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Remove an obsolete declaration of LOCK_thread_count.
------------------------------------------------------------------------
r6352 | marko | 2009-12-22 12:33:01 +0200 (Tue, 22 Dec 2009) | 104 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/lock0lock.h
M /branches/zip/include/srv0srv.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/mysql-test/innodb-autoinc.result
M /branches/zip/mysql-test/innodb-autoinc.test
M /branches/zip/row/row0sel.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
branches/zip: Merge revisions 6206:6350 from branches/5.1,
except r6347, r6349, r6350 which were committed separately
to both branches, and r6310, which was backported from zip to 5.1.
------------------------------------------------------------------------
r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 3 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Non-functional change, fix formatting.
------------------------------------------------------------------------
r6230 | sunny | 2009-11-24 23:52:43 +0200 (Tue, 24 Nov 2009) | 3 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
branches/5.1: Fix autoinc failing test results.
(this should be skipped when merging 5.1 into zip)
------------------------------------------------------------------------
r6231 | sunny | 2009-11-25 10:26:27 +0200 (Wed, 25 Nov 2009) | 7 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
M /branches/5.1/row/row0sel.c
branches/5.1: Fix BUG#49032 - auto_increment field does not initialize to last value in InnoDB Storage Engine.
We use the appropriate function to read the column value for non-integer
autoinc column types, namely float and double.
rb://208. Approved by Marko.
------------------------------------------------------------------------
r6232 | sunny | 2009-11-25 10:27:39 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix white space errors.
------------------------------------------------------------------------
r6233 | sunny | 2009-11-25 10:28:35 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/include/mach0data.h
M /branches/5.1/include/mach0data.ic
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix tests and make read float/double arg const.
------------------------------------------------------------------------
r6234 | sunny | 2009-11-25 10:29:03 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix whitepsace issues.
------------------------------------------------------------------------
r6235 | sunny | 2009-11-26 01:14:42 +0200 (Thu, 26 Nov 2009) | 9 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Fix Bug#47720 - REPLACE INTO Autoincrement column with negative values.
This bug is similiar to the negative autoinc filter patch from earlier,
with the additional handling of filtering out the negative column values
set explicitly by the user.
rb://184
Approved by Heikki.
------------------------------------------------------------------------
r6242 | vasil | 2009-11-27 22:07:12 +0200 (Fri, 27 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/export.sh
branches/5.1:
Minor changes to support plugin snapshots.
------------------------------------------------------------------------
r6306 | calvin | 2009-12-14 15:12:46 +0200 (Mon, 14 Dec 2009) | 5 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: fix bug#49267: innodb-autoinc.test fails on windows
because of different case mode
There is no change to the InnoDB code, only to fix test case by
changing "T1" to "t1".
------------------------------------------------------------------------
r6324 | jyang | 2009-12-17 06:54:24 +0200 (Thu, 17 Dec 2009) | 8 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/lock0lock.h
M /branches/5.1/include/srv0srv.h
M /branches/5.1/lock/lock0lock.c
M /branches/5.1/log/log0log.c
M /branches/5.1/srv/srv0srv.c
M /branches/5.1/srv/srv0start.c
branches/5.1: Fix bug #47814 - Diagnostics are frequently not
printed after a long lock wait in InnoDB. Separate out the
lock wait timeout check thread from monitor information
printing thread.
rb://200 Approved by Marko.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6364 | marko | 2009-12-26 21:06:31 +0200 (Sat, 26 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/ibuf/ibuf0ibuf.c
branches/zip: ibuf_bitmap_get_map_page():
Define a wrapper macro that passes __FILE__, __LINE__ of the caller
to buf_page_get_gen().
This will ease the diagnosis of the likes of Issue #135.
------------------------------------------------------------------------
2009-12-26 20:17:43 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
while (!merge_adjacent(slot)) {
|
|
|
|
/* No op */
|
|
|
|
}
|
2013-12-19 13:36:38 +01:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** We have now collected n_consecutive I/O requests
|
|
|
|
in the array; allocate a single buffer which can hold
|
|
|
|
all data, and perform the I/O
|
|
|
|
@return the length of the buffer */
|
|
|
|
ulint allocate_buffer()
|
2016-09-06 08:43:16 +02:00
|
|
|
MY_ATTRIBUTE((warn_unused_result))
|
2016-08-12 10:17:45 +02:00
|
|
|
{
|
|
|
|
ulint len;
|
|
|
|
Slot* slot = first_slot();
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_ad(m_ptr == NULL);
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (slot->type.is_read() && m_n_elems > 1) {
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
len = 0;
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
for (ulint i = 0; i < m_n_elems; ++i) {
|
|
|
|
len += m_slots[i]->len;
|
|
|
|
}
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
m_ptr = static_cast<byte*>(
|
|
|
|
ut_malloc_nokey(len + UNIV_PAGE_SIZE));
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
m_buf = static_cast<byte*>(
|
|
|
|
ut_align(m_ptr, UNIV_PAGE_SIZE));
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
} else {
|
|
|
|
len = first_slot()->len;
|
|
|
|
m_buf = first_slot()->buf;
|
|
|
|
}
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(len);
|
|
|
|
}
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** We have to compress the individual pages and punch
|
|
|
|
holes in them on a page by page basis when writing to
|
|
|
|
tables that can be compresed at the IO level.
|
|
|
|
@param[in] len Value returned by allocate_buffer */
|
|
|
|
void copy_to_buffer(ulint len)
|
|
|
|
{
|
|
|
|
Slot* slot = first_slot();
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (len > slot->len && slot->type.is_write()) {
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
byte* ptr = m_buf;
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_ad(ptr != slot->buf);
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Copy the buffers to the combined buffer */
|
|
|
|
for (ulint i = 0; i < m_n_elems; ++i) {
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
slot = m_slots[i];
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
memmove(ptr, slot->buf, slot->len);
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ptr += slot->len;
|
2013-12-19 13:36:38 +01:00
|
|
|
}
|
2011-04-05 09:37:58 +02:00
|
|
|
}
|
|
|
|
}
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Do the I/O with ordinary, synchronous i/o functions:
|
|
|
|
@param[in] len Length of buffer for IO */
|
|
|
|
void io()
|
|
|
|
{
|
|
|
|
if (first_slot()->type.is_write()) {
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
for (ulint i = 0; i < m_n_elems; ++i) {
|
|
|
|
write(m_slots[i]);
|
|
|
|
}
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
} else {
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
for (ulint i = 0; i < m_n_elems; ++i) {
|
|
|
|
read(m_slots[i]);
|
2009-01-13 19:20:49 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Mark the i/os done in slots */
|
|
|
|
void done()
|
|
|
|
{
|
|
|
|
for (ulint i = 0; i < m_n_elems; ++i) {
|
|
|
|
m_slots[i]->io_already_done = true;
|
2013-12-19 13:36:38 +01:00
|
|
|
}
|
2009-01-13 19:20:49 +01:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** @return the first slot in the consecutive array */
|
|
|
|
Slot* first_slot()
|
2016-09-06 08:43:16 +02:00
|
|
|
MY_ATTRIBUTE((warn_unused_result))
|
2016-08-12 10:17:45 +02:00
|
|
|
{
|
|
|
|
ut_a(m_n_elems > 0);
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(m_slots[0]);
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Wait for I/O requests
|
|
|
|
@param[in] global_segment The global segment
|
|
|
|
@param[in,out] event Wait on event if no active requests
|
|
|
|
@return the number of slots */
|
|
|
|
ulint check_pending(
|
|
|
|
ulint global_segment,
|
|
|
|
os_event_t event)
|
2016-09-06 08:43:16 +02:00
|
|
|
MY_ATTRIBUTE((warn_unused_result));
|
2016-08-12 10:17:45 +02:00
|
|
|
private:
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Do the file read
|
|
|
|
@param[in,out] slot Slot that has the IO context */
|
|
|
|
void read(Slot* slot)
|
|
|
|
{
|
|
|
|
dberr_t err = os_file_read(
|
|
|
|
slot->type,
|
|
|
|
slot->file,
|
|
|
|
slot->ptr,
|
|
|
|
slot->offset,
|
|
|
|
slot->len);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_a(err == DB_SUCCESS);
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Do the file read
|
|
|
|
@param[in,out] slot Slot that has the IO context */
|
|
|
|
void write(Slot* slot)
|
|
|
|
{
|
|
|
|
dberr_t err = os_file_write(
|
|
|
|
slot->type,
|
|
|
|
slot->name,
|
|
|
|
slot->file,
|
|
|
|
slot->ptr,
|
|
|
|
slot->offset,
|
|
|
|
slot->len);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2017-01-16 13:03:36 +01:00
|
|
|
ut_a(err == DB_SUCCESS);
|
2016-08-12 10:17:45 +02:00
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** @return true if the slots are adjacent and can be merged */
|
|
|
|
bool adjacent(const Slot* s1, const Slot* s2) const
|
|
|
|
{
|
|
|
|
return(s1 != s2
|
|
|
|
&& s1->file == s2->file
|
|
|
|
&& s2->offset == s1->offset + s1->len
|
|
|
|
&& s1->type == s2->type);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** @return true if merge limit reached or no adjacent slots found. */
|
|
|
|
bool merge_adjacent(Slot*& current)
|
|
|
|
{
|
|
|
|
Slot* slot;
|
|
|
|
ulint offset = m_segment * m_n_slots;
|
|
|
|
|
|
|
|
slot = m_array->at(offset);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
for (ulint i = 0; i < m_n_slots; ++i, ++slot) {
|
2011-04-05 09:37:58 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (slot->is_reserved && adjacent(current, slot)) {
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
current = slot;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Found a consecutive i/o request */
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
m_slots[m_n_elems] = slot;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
++m_n_elems;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(m_n_elems >= m_slots.capacity());
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(true);
|
2011-04-05 09:37:58 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** There were no old requests. Look for an I/O request at the lowest
|
|
|
|
offset in the array (we ignore the high 32 bits of the offset in these
|
|
|
|
heuristics) */
|
|
|
|
bool select_lowest_offset()
|
|
|
|
{
|
|
|
|
ut_ad(m_n_elems == 0);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ulint offset = m_segment * m_n_slots;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
m_lowest_offset = IB_UINT64_MAX;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
for (ulint i = 0; i < m_n_slots; ++i) {
|
|
|
|
Slot* slot;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
slot = m_array->at(i + offset);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (slot->is_reserved
|
|
|
|
&& slot->offset < m_lowest_offset) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2006-02-23 20:25:29 +01:00
|
|
|
/* Found an i/o request */
|
2016-08-12 10:17:45 +02:00
|
|
|
m_slots[0] = slot;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
m_n_elems = 1;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
m_lowest_offset = slot->offset;
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
}
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
return(m_n_elems > 0);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Select the slot if it is older than the current oldest slot.
|
|
|
|
@param[in] slot The slot to check */
|
|
|
|
void select_if_older(Slot* slot)
|
|
|
|
{
|
|
|
|
ulint age;
|
|
|
|
|
|
|
|
age = (ulint) difftime(ut_time(), slot->reservation_time);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if ((age >= 2 && age > m_oldest)
|
|
|
|
|| (age >= 2
|
|
|
|
&& age == m_oldest
|
|
|
|
&& slot->offset < m_lowest_offset)) {
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Found an i/o request */
|
|
|
|
m_slots[0] = slot;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
m_n_elems = 1;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
m_oldest = age;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
m_lowest_offset = slot->offset;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Select th oldest slot in the array
|
|
|
|
@return true if oldest slot found */
|
|
|
|
bool select_oldest()
|
|
|
|
{
|
|
|
|
ut_ad(m_n_elems == 0);
|
|
|
|
|
|
|
|
Slot* slot;
|
|
|
|
ulint offset = m_n_slots * m_segment;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
slot = m_array->at(offset);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
for (ulint i = 0; i < m_n_slots; ++i, ++slot) {
|
|
|
|
|
|
|
|
if (slot->is_reserved) {
|
|
|
|
select_if_older(slot);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
}
|
2016-08-12 10:17:45 +02:00
|
|
|
|
|
|
|
return(m_n_elems > 0);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
typedef std::vector<Slot*> slots_t;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
private:
|
|
|
|
ulint m_oldest;
|
|
|
|
ulint m_n_elems;
|
|
|
|
os_offset_t m_lowest_offset;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
AIO* m_array;
|
|
|
|
ulint m_n_slots;
|
|
|
|
ulint m_segment;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
slots_t m_slots;
|
2010-05-27 19:30:08 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
byte* m_ptr;
|
|
|
|
byte* m_buf;
|
|
|
|
};
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Wait for I/O requests
|
|
|
|
@return the number of slots */
|
|
|
|
ulint
|
|
|
|
SimulatedAIOHandler::check_pending(
|
|
|
|
ulint global_segment,
|
|
|
|
os_event_t event)
|
|
|
|
{
|
|
|
|
/* NOTE! We only access constant fields in os_aio_array.
|
|
|
|
Therefore we do not have to acquire the protecting mutex yet */
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_ad(os_aio_validate_skip());
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_ad(m_segment < m_array->get_n_segments());
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Look through n slots after the segment * n'th slot */
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (AIO::is_read(m_array)
|
|
|
|
&& os_aio_recommend_sleep_for_read_threads) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Give other threads chance to add several
|
|
|
|
I/Os to the array at once. */
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
srv_set_io_thread_op_info(
|
|
|
|
global_segment, "waiting for i/o request");
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
os_event_wait(event);
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(0);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(m_array->slots_per_segment());
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Does simulated AIO. This function should be called by an i/o-handler
|
|
|
|
thread.
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
@param[in] segment The number of the segment in the aio arrays to wait
|
|
|
|
for; segment 0 is the ibuf i/o thread, segment 1 the
|
|
|
|
log i/o thread, then follow the non-ibuf read threads,
|
|
|
|
and as the last are the non-ibuf write threads
|
|
|
|
@param[out] m1 the messages passed with the AIO request; note that
|
|
|
|
also in the case where the AIO operation failed, these
|
|
|
|
output parameters are valid and can be used to restart
|
|
|
|
the operation, for example
|
|
|
|
@param[out] m2 Callback argument
|
|
|
|
@param[in] type IO context
|
|
|
|
@return DB_SUCCESS or error code */
|
|
|
|
static
|
|
|
|
dberr_t
|
|
|
|
os_aio_simulated_handler(
|
|
|
|
ulint global_segment,
|
|
|
|
fil_node_t** m1,
|
|
|
|
void** m2,
|
|
|
|
IORequest* type)
|
|
|
|
{
|
|
|
|
Slot* slot;
|
|
|
|
AIO* array;
|
|
|
|
ulint segment;
|
|
|
|
os_event_t event = os_aio_segment_wait_events[global_segment];
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
segment = AIO::get_array_and_local_segment(&array, global_segment);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
SimulatedAIOHandler handler(array, segment);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
for (;;) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
srv_set_io_thread_op_info(
|
|
|
|
global_segment, "looking for i/o requests (a)");
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ulint n_slots = handler.check_pending(global_segment, event);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (n_slots == 0) {
|
|
|
|
continue;
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
handler.init(n_slots);
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
srv_set_io_thread_op_info(
|
|
|
|
global_segment, "looking for i/o requests (b)");
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
array->acquire();
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ulint n_reserved;
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
slot = handler.check_completed(&n_reserved);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (slot != NULL) {
|
2015-03-09 17:21:48 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
break;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
} else if (n_reserved == 0
|
|
|
|
&& !buf_page_cleaner_is_active
|
|
|
|
&& srv_shutdown_state == SRV_SHUTDOWN_EXIT_THREADS) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* There is no completed request. If there
|
|
|
|
are no pending request at all, and the system
|
|
|
|
is being shut down, exit. */
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
array->release();
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
*m1 = NULL;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
*m2 = NULL;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(DB_SUCCESS);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
} else if (handler.select()) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
break;
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* No I/O requested at the moment */
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
srv_set_io_thread_op_info(
|
|
|
|
global_segment, "resetting wait event");
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* We wait here until tbere are more IO requests
|
|
|
|
for this segment. */
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
os_event_reset(event);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
array->release();
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
srv_set_io_thread_op_info(
|
|
|
|
global_segment, "waiting for i/o request");
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
os_event_wait(event);
|
|
|
|
}
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Found a slot that has already completed its IO */
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (slot == NULL) {
|
|
|
|
/* Merge adjacent requests */
|
|
|
|
handler.merge();
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* Check if there are several consecutive blocks
|
|
|
|
to read or write */
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
srv_set_io_thread_op_info(
|
|
|
|
global_segment, "consecutive i/o requests");
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
// Note: We don't support write combining for simulated AIO.
|
|
|
|
//ulint total_len = handler.allocate_buffer();
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/* We release the array mutex for the time of the I/O: NOTE that
|
|
|
|
this assumes that there is just one i/o-handler thread serving
|
|
|
|
a single segment of slots! */
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
array->release();
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
// Note: We don't support write combining for simulated AIO.
|
|
|
|
//handler.copy_to_buffer(total_len);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
srv_set_io_thread_op_info(global_segment, "doing file i/o");
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
handler.io();
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
srv_set_io_thread_op_info(global_segment, "file i/o done");
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
array->acquire();
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
handler.done();
|
|
|
|
|
|
|
|
/* We return the messages for the first slot now, and if there
|
|
|
|
were several slots, the messages will be returned with
|
|
|
|
subsequent calls of this function */
|
|
|
|
|
|
|
|
slot = handler.first_slot();
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_ad(slot->is_reserved);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
*m1 = slot->m1;
|
|
|
|
*m2 = slot->m2;
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
*type = slot->type;
|
|
|
|
|
|
|
|
array->release(slot);
|
|
|
|
|
|
|
|
array->release();
|
|
|
|
|
|
|
|
return(DB_SUCCESS);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Get the total number of pending IOs
|
|
|
|
@return the total number of pending IOs */
|
|
|
|
ulint
|
|
|
|
AIO::total_pending_io_count()
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
2016-08-12 10:17:45 +02:00
|
|
|
ulint count = s_reads->pending_io_count();
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (s_writes != NULL) {
|
|
|
|
count += s_writes->pending_io_count();
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (s_ibuf != NULL) {
|
|
|
|
count += s_ibuf->pending_io_count();
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (s_log != NULL) {
|
|
|
|
count += s_log->pending_io_count();
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (s_sync != NULL) {
|
|
|
|
count += s_sync->pending_io_count();
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
return(count);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Validates the consistency the aio system.
|
|
|
|
@return true if ok */
|
|
|
|
static
|
|
|
|
bool
|
|
|
|
os_aio_validate()
|
|
|
|
{
|
|
|
|
/* The methods countds and validates, we ignore the count. */
|
|
|
|
AIO::total_pending_io_count();
|
|
|
|
|
|
|
|
return(true);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Prints pending IO requests per segment of an aio array.
|
2009-01-13 19:20:49 +01:00
|
|
|
We probably don't need per segment statistics but they can help us
|
|
|
|
during development phase to see if the IO requests are being
|
2016-08-12 10:17:45 +02:00
|
|
|
distributed as expected.
|
|
|
|
@param[in,out] file File where to print
|
|
|
|
@param[in] segments Pending IO array */
|
2009-01-13 19:20:49 +01:00
|
|
|
void
|
2016-08-12 10:17:45 +02:00
|
|
|
AIO::print_segment_info(
|
|
|
|
FILE* file,
|
|
|
|
const ulint* segments)
|
2009-01-13 19:20:49 +01:00
|
|
|
{
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_ad(m_n_segments > 0);
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (m_n_segments > 1) {
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
fprintf(file, " [");
|
|
|
|
|
|
|
|
for (ulint i = 0; i < m_n_segments; ++i, ++segments) {
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (i != 0) {
|
|
|
|
fprintf(file, ", ");
|
|
|
|
}
|
|
|
|
|
|
|
|
fprintf(file, "%lu", *segments);
|
2009-01-13 19:20:49 +01:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
fprintf(file, "] ");
|
2009-01-13 19:20:49 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Prints info about the aio array.
|
|
|
|
@param[in,out] file Where to print */
|
2005-10-27 09:29:40 +02:00
|
|
|
void
|
2016-08-12 10:17:45 +02:00
|
|
|
AIO::print(FILE* file)
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
2016-08-12 10:17:45 +02:00
|
|
|
ulint count = 0;
|
|
|
|
ulint n_res_seg[SRV_MAX_N_IO_THREADS];
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
mutex_enter(&m_mutex);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_a(!m_slots.empty());
|
|
|
|
ut_a(m_n_segments > 0);
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2009-01-13 19:20:49 +01:00
|
|
|
memset(n_res_seg, 0x0, sizeof(n_res_seg));
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
for (ulint i = 0; i < m_slots.size(); ++i) {
|
|
|
|
Slot& slot = m_slots[i];
|
|
|
|
ulint segment = (i * m_n_segments) / m_slots.size();
|
2009-10-14 18:16:14 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (slot.is_reserved) {
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
++count;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
++n_res_seg[segment];
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_a(slot.len > 0);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
ut_a(m_n_reserved == count);
|
|
|
|
|
|
|
|
print_segment_info(file, n_res_seg);
|
|
|
|
|
|
|
|
mutex_exit(&m_mutex);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Print all the AIO segments
|
|
|
|
@param[in,out] file Where to print */
|
|
|
|
void
|
|
|
|
AIO::print_all(FILE* file)
|
|
|
|
{
|
|
|
|
s_reads->print(file);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (s_writes != NULL) {
|
|
|
|
fputs(", aio writes:", file);
|
|
|
|
s_writes->print(file);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (s_ibuf != NULL) {
|
|
|
|
fputs(",\n ibuf aio reads:", file);
|
|
|
|
s_ibuf->print(file);
|
|
|
|
}
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (s_log != NULL) {
|
|
|
|
fputs(", log i/o's:", file);
|
|
|
|
s_log->print(file);
|
|
|
|
}
|
2009-01-13 19:20:49 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (s_sync != NULL) {
|
|
|
|
fputs(", sync i/o's:", file);
|
|
|
|
s_sync->print(file);
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Prints info of the aio arrays.
|
|
|
|
@param[in,out] file file where to print */
|
2013-03-25 23:03:13 +01:00
|
|
|
void
|
2016-08-12 10:17:45 +02:00
|
|
|
os_aio_print(FILE* file)
|
2013-03-25 23:03:13 +01:00
|
|
|
{
|
|
|
|
time_t current_time;
|
|
|
|
double time_elapsed;
|
|
|
|
double avg_bytes_read;
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
for (ulint i = 0; i < srv_n_file_io_threads; ++i) {
|
|
|
|
fprintf(file, "I/O thread %lu state: %s (%s)",
|
2016-09-06 08:43:16 +02:00
|
|
|
(ulint) i,
|
2013-03-25 23:03:13 +01:00
|
|
|
srv_io_thread_op_info[i],
|
|
|
|
srv_io_thread_function[i]);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#ifndef _WIN32
|
2017-02-17 09:32:21 +01:00
|
|
|
if (!srv_use_native_aio
|
|
|
|
&& os_event_is_set(os_aio_segment_wait_events[i])) {
|
2013-03-25 23:03:13 +01:00
|
|
|
fprintf(file, " ev set");
|
|
|
|
}
|
2016-08-12 10:17:45 +02:00
|
|
|
#endif /* _WIN32 */
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
fprintf(file, "\n");
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
fputs("Pending normal aio reads:", file);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
AIO::print_all(file);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
|
|
|
putc('\n', file);
|
2013-03-25 23:03:13 +01:00
|
|
|
current_time = ut_time();
|
2005-10-27 09:29:40 +02:00
|
|
|
time_elapsed = 0.001 + difftime(current_time, os_last_printout);
|
|
|
|
|
|
|
|
fprintf(file,
|
|
|
|
"Pending flushes (fsync) log: %lu; buffer pool: %lu\n"
|
|
|
|
"%lu OS file reads, %lu OS file writes, %lu OS fsyncs\n",
|
2016-09-06 08:43:16 +02:00
|
|
|
(ulint) fil_n_pending_log_flushes,
|
|
|
|
(ulint) fil_n_pending_tablespace_flushes,
|
|
|
|
(ulint) os_n_file_reads,
|
|
|
|
(ulint) os_n_file_writes,
|
|
|
|
(ulint) os_n_fsyncs);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (os_n_pending_writes != 0 || os_n_pending_reads != 0) {
|
2005-10-27 09:29:40 +02:00
|
|
|
fprintf(file,
|
2006-02-23 20:25:29 +01:00
|
|
|
"%lu pending preads, %lu pending pwrites\n",
|
2016-08-12 10:17:45 +02:00
|
|
|
(ulint) os_n_pending_reads,
|
2016-09-06 08:43:16 +02:00
|
|
|
(ulint) os_n_pending_writes);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (os_n_file_reads == os_n_file_reads_old) {
|
|
|
|
avg_bytes_read = 0.0;
|
|
|
|
} else {
|
2006-08-29 11:30:31 +02:00
|
|
|
avg_bytes_read = (double) os_bytes_read_since_printout
|
|
|
|
/ (os_n_file_reads - os_n_file_reads_old);
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
fprintf(file,
|
2006-08-29 11:30:31 +02:00
|
|
|
"%.2f reads/s, %lu avg bytes/read,"
|
|
|
|
" %.2f writes/s, %.2f fsyncs/s\n",
|
2005-10-27 09:29:40 +02:00
|
|
|
(os_n_file_reads - os_n_file_reads_old)
|
|
|
|
/ time_elapsed,
|
2016-09-06 08:43:16 +02:00
|
|
|
(ulint) avg_bytes_read,
|
2005-10-27 09:29:40 +02:00
|
|
|
(os_n_file_writes - os_n_file_writes_old)
|
|
|
|
/ time_elapsed,
|
|
|
|
(os_n_fsyncs - os_n_fsyncs_old)
|
|
|
|
/ time_elapsed);
|
|
|
|
|
|
|
|
os_n_file_reads_old = os_n_file_reads;
|
|
|
|
os_n_file_writes_old = os_n_file_writes;
|
|
|
|
os_n_fsyncs_old = os_n_fsyncs;
|
|
|
|
os_bytes_read_since_printout = 0;
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2005-10-27 09:29:40 +02:00
|
|
|
os_last_printout = current_time;
|
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Refreshes the statistics used to print per-second averages. */
|
2005-10-27 09:29:40 +02:00
|
|
|
void
|
2016-08-12 10:17:45 +02:00
|
|
|
os_aio_refresh_stats()
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
2016-08-12 10:17:45 +02:00
|
|
|
os_n_fsyncs_old = os_n_fsyncs;
|
|
|
|
|
|
|
|
os_bytes_read_since_printout = 0;
|
|
|
|
|
2005-10-27 09:29:40 +02:00
|
|
|
os_n_file_reads_old = os_n_file_reads;
|
2016-08-12 10:17:45 +02:00
|
|
|
|
2005-10-27 09:29:40 +02:00
|
|
|
os_n_file_writes_old = os_n_file_writes;
|
2016-08-12 10:17:45 +02:00
|
|
|
|
2005-10-27 09:29:40 +02:00
|
|
|
os_n_fsyncs_old = os_n_fsyncs;
|
2016-08-12 10:17:45 +02:00
|
|
|
|
2005-10-27 09:29:40 +02:00
|
|
|
os_bytes_read_since_printout = 0;
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
os_last_printout = ut_time();
|
2005-10-27 09:29:40 +02:00
|
|
|
}
|
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Checks that all slots in the system have been freed, that is, there are
|
2009-05-25 08:46:10 +02:00
|
|
|
no pending io operations.
|
2016-08-12 10:17:45 +02:00
|
|
|
@return true if all free */
|
|
|
|
bool
|
|
|
|
os_aio_all_slots_free()
|
2005-10-27 09:29:40 +02:00
|
|
|
{
|
2016-08-12 10:17:45 +02:00
|
|
|
return(AIO::total_pending_io_count() == 0);
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
/** Prints all pending IO for the array
|
|
|
|
@param[in] file file where to print
|
|
|
|
@param[in] array array to process */
|
|
|
|
void
|
|
|
|
AIO::to_file(FILE* file) const
|
|
|
|
{
|
|
|
|
acquire();
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
fprintf(file, " %lu\n", static_cast<ulint>(m_n_reserved));
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
for (ulint i = 0; i < m_slots.size(); ++i) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
const Slot& slot = m_slots[i];
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (slot.is_reserved) {
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
fprintf(file,
|
|
|
|
"%s IO for %s (offset=" UINT64PF
|
|
|
|
", size=%lu)\n",
|
|
|
|
slot.type.is_read() ? "read" : "write",
|
|
|
|
slot.name, slot.offset, slot.len);
|
|
|
|
}
|
|
|
|
}
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
release();
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Print pending IOs for all arrays */
|
|
|
|
void
|
|
|
|
AIO::print_to_file(FILE* file)
|
|
|
|
{
|
|
|
|
fprintf(file, "Pending normal aio reads:");
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
s_reads->to_file(file);
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (s_writes != NULL) {
|
|
|
|
fprintf(file, "Pending normal aio writes:");
|
|
|
|
s_writes->to_file(file);
|
|
|
|
}
|
2006-02-23 20:25:29 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (s_ibuf != NULL) {
|
|
|
|
fprintf(file, "Pending ibuf aio reads:");
|
|
|
|
s_ibuf->to_file(file);
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (s_log != NULL) {
|
|
|
|
fprintf(file, "Pending log i/o's:");
|
|
|
|
s_log->to_file(file);
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
if (s_sync != NULL) {
|
|
|
|
fprintf(file, "Pending sync i/o's:");
|
|
|
|
s_sync->to_file(file);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2016-08-12 10:17:45 +02:00
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Prints all pending IO
|
|
|
|
@param[in] file File where to print */
|
|
|
|
void
|
|
|
|
os_aio_print_pending_io(
|
|
|
|
FILE* file)
|
|
|
|
{
|
|
|
|
AIO::print_to_file(file);
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#endif /* UNIV_DEBUG */
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/**
|
|
|
|
Set the file create umask
|
|
|
|
@param[in] umask The umask to use for file creation. */
|
|
|
|
void
|
|
|
|
os_file_set_umask(ulint umask)
|
|
|
|
{
|
|
|
|
os_innodb_umask = umask;
|
|
|
|
}
|
2005-10-27 09:29:40 +02:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
#else
|
|
|
|
#include "univ.i"
|
|
|
|
#endif /* !UNIV_INNOCHECKSUM */
|
2014-10-28 11:49:31 +01:00
|
|
|
|
2016-08-12 10:17:45 +02:00
|
|
|
/** Normalizes a directory path for the current OS:
|
|
|
|
On Windows, we convert '/' to '\', else we convert '\' to '/'.
|
|
|
|
@param[in,out] str A null-terminated directory and file path */
|
|
|
|
void
|
|
|
|
os_normalize_path(
|
|
|
|
char* str)
|
|
|
|
{
|
|
|
|
if (str != NULL) {
|
|
|
|
for (; *str; str++) {
|
|
|
|
if (*str == OS_PATH_SEPARATOR_ALT) {
|
|
|
|
*str = OS_PATH_SEPARATOR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2014-10-28 11:49:31 +01:00
|
|
|
}
|