mariadb

Tree: 9542de298e

marko d118d29eb3 branches/innodb+: Merge revisions 4006:4060 from branches/zip: ------------------------------------------------------------------------ r4008 \| vasil \| 2009-01-20 17:01:08 +0200 (Tue, 20 Jan 2009) \| 4 lines branches/zip: Add ChangeLog entries for the bugfixes in r4004 and r4005. ------------------------------------------------------------------------ r4027 \| marko \| 2009-01-23 11:04:49 +0200 (Fri, 23 Jan 2009) \| 1 line branches/zip: Remove some redundant #include statements. ------------------------------------------------------------------------ r4028 \| marko \| 2009-01-23 11:26:10 +0200 (Fri, 23 Jan 2009) \| 13 lines branches/zip: Enclose some more unused code in #ifdef UNIV_LOG_ARCHIVE. This will help trim the dependencies of InnoDB Hot Backup. recv_recovery_from_checkpoint_start(): Rename to recv_recovery_from_checkpoint_start_func(), and remove the two first parameters unless UNIV_LOG_ARCHIVE is defined. Define and use the auxiliary macros TYPE_CHECKPOINT and LIMIT_LSN in the function. struct recv_sys_struct: Remove archive_group unless UNIV_LOG_ARCHIVE is defined. Do not define LOG_ARCHIVE unless UNIV_LOG_ARCHIVE is defined. ------------------------------------------------------------------------ r4029 \| marko \| 2009-01-23 14:07:38 +0200 (Fri, 23 Jan 2009) \| 1 line branches/zip: Remove some redundant #include directives. ------------------------------------------------------------------------ r4030 \| marko \| 2009-01-23 15:31:36 +0200 (Fri, 23 Jan 2009) \| 2 lines branches/zip: buf_page_get_gen(): Remove the unused mode BUF_GET_NOWAIT. This was noticed while investigating Issue #160. ------------------------------------------------------------------------ r4033 \| marko \| 2009-01-23 15:49:04 +0200 (Fri, 23 Jan 2009) \| 16 lines branches/zip: Merge revisions 4005:4032 from branches/5.1: ------------------------------------------------------------------------ r4032 \| marko \| 2009-01-23 15:43:51 +0200 (Fri, 23 Jan 2009) \| 10 lines branches/5.1: Merge r4031 from branches/5.0: btr_search_drop_page_hash_when_freed(): Check if buf_page_get_gen() returns NULL. The page may have been evicted from the buffer pool between buf_page_peek_if_search_hashed() and buf_page_get_gen(), because the buffer pool mutex will be released between these two calls. (Bug #42279, Issue #160) rb://82 approved by Heikki Tuuri ------------------------------------------------------------------------ ------------------------------------------------------------------------ r4034 \| marko \| 2009-01-26 16:16:39 +0200 (Mon, 26 Jan 2009) \| 2 lines branches/zip: buf_page_get_gen(): Fix a "possibly uninitialized" warning that was introduced in r4030. ------------------------------------------------------------------------ r4036 \| marko \| 2009-01-26 22:33:20 +0200 (Mon, 26 Jan 2009) \| 22 lines branches/zip: In r988, the function buf_block_align() was enclosed within UNIV_DEBUG. The two remaining callers in non-debug builds, btr_search_guess_on_hash() and btr_search_validate(), were rewritten to call buf_page_hash_get(). To implement support for a resizeable buffer pool, the function buf_block_align() had been rewritten to perform a page hash lookup in the buffer pool. The caller was also made responsible for holding the buffer pool mutex. Because the page hash lookup is expensive and it has to be done while holding the buffer pool mutex, implement buf_block_align() by pointer arithmetics again, and make btr_search_guess_on_hash() call it. Note that this will have to be adjusted if the interface to the resizeable buffer pool is actually implemented. rb://83 approved by Heikki Tuuri, to address Issue #161. As a deviation from the approved patch, this patch also makes btr_search_validate() (invoked by CHECK TABLE) check that buf_pool->page_hash is consistent with buf_block_align(). ------------------------------------------------------------------------ r4039 \| vasil \| 2009-01-27 08:04:17 +0200 (Tue, 27 Jan 2009) \| 5 lines branches/zip: Adjust the paths in innodb_file_per_table.diff with a recent rename of the test/result files in the MySQL tree. ------------------------------------------------------------------------ r4042 \| marko \| 2009-01-27 10:05:24 +0200 (Tue, 27 Jan 2009) \| 2 lines branches/zip: buf_LRU_invalidate_tablespace(): Fix a race condition: read zip_size while still holding block_mutex. ------------------------------------------------------------------------ r4045 \| marko \| 2009-01-28 00:31:17 +0200 (Wed, 28 Jan 2009) \| 8 lines branches/zip: btr_search_validate(): Fix a bogus UNIV_DEBUG assertion failure that was accidentally introduced in r4036. Instead of calling buf_block_get_frame(), which asserts that the block must be buffer-fixed, access block->frame directly. That is safe, because changes of block->page.state are protected by the buffer pool mutex, which we are holding. This bug was reported by Michael. ------------------------------------------------------------------------ r4046 \| marko \| 2009-01-28 00:33:20 +0200 (Wed, 28 Jan 2009) \| 2 lines branches/zip: Revert the change to univ.i that was accidentally committed in r4045. ------------------------------------------------------------------------ r4047 \| marko \| 2009-01-28 00:46:13 +0200 (Wed, 28 Jan 2009) \| 6 lines branches/zip: btr_search_validate(): Fix an assertion failure that was introduced in r4036. Do not call buf_block_get_space(), buf_block_get_page_no() unless the block state is BUF_BLOCK_FILE_PAGE. This bug was reported by Michael. ------------------------------------------------------------------------ r4050 \| vasil \| 2009-01-28 08:21:44 +0200 (Wed, 28 Jan 2009) \| 5 lines branches/zip: Adjust the paths in innodb_lock_wait_timeout.diff with a recent rename of the test/result files in the MySQL tree. ------------------------------------------------------------------------ r4051 \| marko \| 2009-01-28 14:35:49 +0200 (Wed, 28 Jan 2009) \| 1 line branches/zip: trx0sys.ic: Remove unnecessary #include <data0type.h>. ------------------------------------------------------------------------ r4052 \| marko \| 2009-01-28 15:21:45 +0200 (Wed, 28 Jan 2009) \| 5 lines branches/zip: Enclose some functions inside #ifdef UNIV_HOTBACKUP: ut_sprintf_timestamp_without_extra_chars(), ut_get_year_month_day(), log_reset_first_header_and_checkpoint(): These functions are only used in InnoDB Hot Backup. ------------------------------------------------------------------------ r4056 \| calvin \| 2009-01-29 03:06:41 +0200 (Thu, 29 Jan 2009) \| 33 lines branches/zip: Merge revisions 4032:4035 from branches/5.1 All InnoDB related tests passed on Windows, except known failure in partition_innodb_semi_consistent. The inadvertent change to btr0sea.c in this commit is reverted in r4060. ------------------------------------------------------------------------ r4035 \| vasil \| 2009-01-26 09:26:25 -0600 (Mon, 26 Jan 2009) \| 23 lines branches/5.1: Merge a change from MySQL: ------------------------------------------------------------ revno: 2646.161.4 committer: Tatiana A. Nurnberg <azundris@mysql.com> branch nick: 51-31177v2 timestamp: Mon 2009-01-12 06:32:49 +0100 message: Bug#31177: Server variables can't be set to their current values Bounds-checks and blocksize corrections were applied to user-input, but constants in the server were trusted implicitly. If these values did not actually meet the requirements, the user could not set change a variable, then set it back to the (wonky) factory default or maximum by explicitly specifying it (SET <var>=<value> vs SET <var>=DEFAULT). Now checks also apply to the server's presets. Wonky values and maxima get corrected at startup. Consequently all non-offsetted values the user sees are valid, and users can set the variable to that exact value if they so desire. ------------------------------------------------------------------------ r4060 \| marko \| 2009-01-29 09:39:04 +0200 (Thu, 29 Jan 2009) \| 1 line branches/zip: btr0sea.c: Revert the inadvertent change made in r4056. ------------------------------------------------------------------------		17 years ago
..
btr0btr.c	branches/innodb+: Merge revisions 3602:3608 from branches/zip:	17 years ago
btr0cur.c	branches/innodb+: Merge revisions 3541:3544 from branches/zip:	17 years ago
btr0pcur.c	branches/innodb+: Merge 2637:2660 from branches/zip.	17 years ago
btr0sea.c	branches/innodb+: Merge revisions 4006:4060 from branches/zip:	17 years ago