mariadb

Tree: 70f1128619

Author	SHA1	Message	Date
marko	a980b544cd	branches/innodb+: Merge revisions 2774:2799 from branches/zip: ------------------------------------------------------------------------ r2781 \| marko \| 2008-10-13 13:40:57 +0300 (Mon, 13 Oct 2008) \| 1 line branches/zip: page_cur_delete_rec(): Call page_zip_validate_low(). ------------------------------------------------------------------------ r2783 \| vasil \| 2008-10-13 18:34:34 +0300 (Mon, 13 Oct 2008) \| 9 lines branches/zip: Remove mysql-test/patches/bug37312.diff because MySQL "fixed" Bug#37312 by removing the test. http://bugs.mysql.com/37312 http://lists.mysql.com/commits/54462 ------------------------------------------------------------------------ r2784 \| marko \| 2008-10-13 21:35:30 +0300 (Mon, 13 Oct 2008) \| 1 line branches/zip: Add missing NULL check to the assertion added in r2781. ------------------------------------------------------------------------ r2785 \| marko \| 2008-10-13 22:29:12 +0300 (Mon, 13 Oct 2008) \| 2 lines branches/zip: page_cur_delete_rec(): Remove the bogus page_zip_validate_low() assertion that was added in r2781 and explain why it was bogus. ------------------------------------------------------------------------ r2786 \| calvin \| 2008-10-14 19:14:47 +0300 (Tue, 14 Oct 2008) \| 7 lines branches/zip: fix Mantis issue #96 Problem compiling ha_innodb.cc on 64-bit Windows Change the definition of srv_replication_delay from ulint to ulong. ulint is 64-bit on Win64. Approved by: Heikki (on IM) ------------------------------------------------------------------------ r2787 \| calvin \| 2008-10-14 19:19:41 +0300 (Tue, 14 Oct 2008) \| 7 lines branches/zip: fix compiler warning Change the definition of add_on from ulint to ullint, to eliminate the warning in .\btr\btr0cur.c: conversion from 'ullint' to 'ulint', possible loss of data Approved by: Heikki (on IM) ------------------------------------------------------------------------ r2793 \| marko \| 2008-10-15 10:00:06 +0300 (Wed, 15 Oct 2008) \| 2 lines branches/zip: row_create_table_for_mysql(), row_create_index_for_mysql(): Note that the dictionary object will be freed. ------------------------------------------------------------------------ r2794 \| marko \| 2008-10-15 10:32:40 +0300 (Wed, 15 Oct 2008) \| 9 lines branches/zip: When invoking page_zip_copy_recs(), update the lock table and the adaptive hash index. This should fix Issue #95 and Issue #87. page_zip_copy_recs(): Copy PAGE_MAX_TRX_ID as well, to have similar behavior to page_copy_rec_list_start() and page_copy_rec_list_end(). btr_root_raise_and_insert(), btr_page_split_and_insert(), btr_lift_page_up(): Update the lock table and the adaptive hash index. ------------------------------------------------------------------------ r2797 \| marko \| 2008-10-15 13:21:54 +0300 (Wed, 15 Oct 2008) \| 3 lines branches/zip: Introduce UNIV_ZIP_COPY for invoking page_zip_copy_recs() more often in B-tree operations. ------------------------------------------------------------------------ r2799 \| marko \| 2008-10-15 14:27:42 +0300 (Wed, 15 Oct 2008) \| 25 lines branches/zip: When the server crashes while freeing an externally stored column of a compressed table, the BTR_EXTERN_LEN field in the BLOB pointer will be written as 0. Tolerate this in the functions that deal with externally stored columns. This fixes Issue #80 and was posted at rb://26. Note that the clustered index record is always deleted or purged last, after any secondary index records referring to it have been deleted. btr_free_externally_stored_field(): On an uncompressed table, zero out the BTR_EXTERN_LEN, so that half-deleted BLOBs can be detected after crash recovery. btr_copy_externally_stored_field_prefix(): Return 0 if the BLOB has been half-deleted. row_upd_ext_fetch(): Assert that the externally stored column exists. row_ext_cache_fill(): Allow btr_copy_externally_stored_field_prefix() to return 0. row_sel_sec_rec_is_for_blob(): Return FALSE if the BLOB has been half-deleted. This is correct, because the clustered index record would have been deleted or purged last, after any secondary index records referring to it had been deleted. ------------------------------------------------------------------------	17 years ago
marko	c766390485	branches/innodb+: Undo the partial introduction of UNIV_UNUSED, to reduce differences from branches/zip. The __attribute__((unused)) should work on all platforms. When compiled with something else than GCC, MySQL supposedly does #define __attribute__(x) /* empty */ so that the attributes will be ignored.	17 years ago
marko	0c4879da3d	branches/innodb+: Revert some changes that make the code differ from branches/zip. btr_cur_optimistic_delete(): Split a too long line in the way it is split in branches/zip. buf_page_get_gen(): Add missing space in the function comment. buf_print_io(): Restoer a removed space to the printout. univ.i: Remove C++-style (or C99-style) comments. buf0buf.h: Undo the white-space changes to the wrapper macros of buf_page_get_gen(). ibuf_update_free_bits_low(): Revert the changes. Restore the assertion that this function must not be invoked on compressed pages. The function ibuf_update_free_bits_zip() is for compressed pages. ibuf_insert_to_index_page(): Undo a white-space change.	17 years ago
marko	8638150c6c	branches/innodb+: Merge 2579:2637 from branches/zip.	17 years ago
inaam	c5dacc2914	branches/innodb+: Merge revisions 2344:2454 from branches/zip	18 years ago
marko	5cf58ce919	branches/innodb+: Merge revisions 2322:2340 from branches/zip	18 years ago
sunny	fceb78e698	branches/innodb+: Delete buffer port from branches/fts:r2283	18 years ago
marko	2c521319f2	branches/zip: Remove innodb_redefine.h and all references to it. The file has been redundant since r2278. include/innodb_redefine.h: Remove. include/sync0sync.h: Remove the definition of mutex_free that was added because of innodb_redefine.h. include/univ.i: Remove references to innodb_redefine.h. Explain why the C++ classes need to be renamed. scripts/build-plugin.sh: Build InnoDB only once. The file innodb_redefine.h is no longer needed.	18 years ago
marko	1d1dc31a06	branches/zip: Introduce UNIV_INTERN, a linkage specifier for InnoDB-global symbols. Use it for all definitions of non-static variables and functions. lexyy.c, make_flex.sh: Declare yylex as UNIV_INTERN, not static. It is referenced from pars0grm.c. Actually, according to nm .libs/ha_innodb.so\|grep -w '[ABCE-TVXYZ]' the following symbols are still global: * The vtable for class ha_innodb * pars0grm.c: The function yyparse() and the variables yychar, yylval, yynerrs The required changes to the Bison-generated file pars0grm.c will be addressed in a separate commit, which will add a script similar to make_flex.sh. The class ha_innodb is renamed from class ha_innobase by a #define. Thus, there will be no clash with the builtin InnoDB. However, there will be some overhead for invoking virtual methods of class ha_innodb. Ideas for making the vtable hidden are welcome. -fvisibility=hidden is not available in GCC 3.	18 years ago
marko	5c7fb88749	branches/zip: Allow the uncompressed page size to be settable by setting just one parameter: UNIV_PAGE_SIZE_SHIFT. UNIV_PAGE_SIZE, BUF_BUDDY_SIZES: Define in terms of UNIV_PAGE_SIZE_SHIFT. BUF_BUDDY_LOW_SHIFT: New macro, to simplify the definition of BUF_BUDDY_LOW and BUF_BUDDY_SIZES. PAGE_ZIP_DIR_SLOT_MASK: Relax the compile-time check. This bitmask must be one less than a power of two, and at least UNIV_PAGE_SIZE - 1.	18 years ago
marko	962ed52317	branches/zip: Clean up after r2129: univ.i: Do not define UNIV_DEBUG, UNIV_ZIP_DEBUG. btr_cur_del_unmark_for_ibuf(): Use the same comment in both btr0cur.c and btr0cur.h. Wrap long lines.	18 years ago
sunny	eca3cb2378	branches/zip: Fix a bug where the zipped page and the uncompressed page contents end up with conflicting versions of a record's state. The zipped page record was not being marked as "(un)deleted" because we were not passing the zipped page contents to the (un)delete function, which first (un)delete marks the uncompressed version and then based on whether page_zip is NULL or not (un)delete marks the record in the compressed page.	18 years ago
marko	cf98f66049	branches/zip: Allow the symbols in the dynamic InnoDB plugin to be redefined so that the dynamic plugin can replace the builtin InnoDB in MySQL 5.1. ha_innodb.cc, handler0alter.cc: #include "univ.i" before any other InnoDB header files or before defining any symbols innodb_redefine.h: New file, to contain a mapping of symbols. The idea is that this file will be replaced in the build process; because this is a large file that can be generated automatically, it does not make sense to keep it under version control. univ.i: #include "innodb_redefine.h" and #define ha_innobase ha_innodb Makefile.am (ha_innodb_la_CXXFLAGS): Remove -Dha_innobase=ha_innodb NOTE: there are still some issues in the source code. One known issue is the #undef mutex_free in sync0sync.h, which will cause the plugin to call the function mutex_free in the builtin InnoDB. The preprocessor symbols defined in innodb_redefine.h must not be undefined or redefined anywhere in the code.	18 years ago
vasil	0028e8d1ee	branches/zip: Add innodb_locks.lock_data column and some relevant tests. For record locks this column represents the ordering fields of the locked row in a human readable, SQL-valid, format. Approved by: Marko	18 years ago
marko	0d6bfafd6c	branches/zip: Merge 1937:2015 from trunk.	18 years ago
marko	5f51afe264	branches/zip: Merge 1894:1918 from trunk.	18 years ago
marko	57afe1d5d2	branches/zip: Merge 1809:1830 from trunk.	18 years ago
marko	313dabb919	branches/zip: UNIV_MEM_ASSERT_AND_FREE(): Use UNIV_MEM_ASSERT_W() instead of UNIV_MEM_ASSERT_RW(). The memory area need not be initialized. This mistake was made in r1815.	18 years ago
marko	f449682428	branches/zip: univ.i: Remove the duplicate UNIV_MEM_DEBUG that was accidentally added in r1815.	18 years ago
marko	ddc116e14a	branches/zip: Improve Valgrind instrumentation. UNIV_MEM_ASSERT_RW(): New macro, to check that the contents of a memory area is defined. UNIV_MEM_ASSERT_W(): New macro, to check that a memory area is writable. UNIV_MEM_ASSERT_AND_FREE(): New macro, to check that the memory is writable before declaring it free (unwritable). This replaces UNIV_MEM_FREE() in many places. mem_init_buf(): Declare the memory undefined. mem_erase_buf(): Declare the memory freed.	18 years ago
marko	0a780db994	branches/zip: Merge 1575:1664 from trunk.	19 years ago
marko	8b40a79c64	branches/zip: Enable calls to inlined InnoDB functions in ha_innodb.cc, now that all of InnoDB code is built from a single Makefile and it should not be possible to build the modules with mutually incompatible options. #define INSIDE_HA_INNOBASE_CC: Remove. srv_sizeof_trx_t_in_ha_innodb_cc: Remove. dict_table_get_low_noninlined(): Remove. This function was unused. Remove all _noninline functions. Remove the _noninline suffix from all function calls in ha_innodb.cc.	19 years ago
marko	2af559b6ca	branches/zip: Improve the documentation of UNIV_DEBUG.	19 years ago
marko	9b765549b4	branches/zip: Merge revisions 1271:1322 from trunk.	19 years ago
marko	eddd572abd	branches/zip: Split UNIV_IBUF_COUNT_DEBUG from UNIV_IBUF_DEBUG.	19 years ago
marko	73bb34156f	branches/zip: Add UNIV_HASH_DEBUG for detecting multiple invocations of HASH_DELETE(). HASH_ASSERT_VALID(), HASH_INVALIDATE(): New macros, used in HASH_DELETE() and HASH_SEARCH(). buf_page_init_low(): Add HASH_INVALIDATE(bpage, hash); buf_page_init(): Call buf_page_init_low() before HASH_INSERT(), so that bpage->hash will not be invalidated.	19 years ago
marko	2b82ae8cb4	branches/zip: Improve Valgrind instrumentation of allocated memory. UNIV_MEM_FREE(): Declare a memory area free. UNIV_MEM_ALLOC(): Declare a memory area allocated (but uninitialized). UNIV_MEM_DESC(): Associate a memory area with a control block. UNIV_MEM_UNDESC(): Unassociate a control block. trx_sys_create_doublewrite_buf(): Clear the buffer with memset(). buf_page_init(): Add a bogus UNIV_MEM_VALID(block->frame) to silence valid warnings about InnoDB data pages containing uninitialized data. buf_LRU_get_free_only(): Add UNIV_MEM_ALLOC(block->frame). buf_LRU_get_free_block(): Add UNIV_MEM_DESC(block->page.zip.data, block). buf_LRU_free_block(): Add UNIV_MEM_DESC(b->zip.data, b) when allocating a compressed-only control block for a compressed page. buf_LRU_block_free_non_file_page(): Replace UNIV_MEM_INVALID() with UNIV_MEM_FREE(). buf_LRU_block_remove_hashed_page(): Add UNIV_MEM_UNDESC(bpage) when deallocating a compressed-only control block. Add UNIV_MEM_INVALID(block->frame). (The frame should be flagged free by buf_LRU_block_free_non_file_page() moments later.) buf0buddy.c: Disable some extra checks in Valgrind-instrumented builds. Add UNIV_MEM_VALID(), UNIV_MEM_INVALID(), UNIV_MEM_FREE(), UNIV_MEM_ALLOC() as necessary.	19 years ago
marko	91c87cd343	branches/zip: Allow dirty blocks to be relocated. Allow a transition to BUF_BLOCK_ZIP_DIRTY (discarding the uncompressed page corresponding to a modified compressed page that has not been flushed to disk). buf_page_can_relocate(): New function, modelled after buf_flush_ready_for_replace(). buf_LRU_free_block(): Allow the transition to BUF_BLOCK_ZIP_DIRTY. buf_flush_insert_into_flush_list(): Make the prototype public. buf_buddy_relocate(): Remove an unnecessary switch statement. Use buf_page_can_relocate() instead of buf_flush_ready_for_replace(). buf_page_peek(): Made UNIV_INLINE. Document UNIV_ZIP_DEBUG.	19 years ago
marko	7fbc4f2bc0	branches/zip: Merge revisions 1009:1165 from trunk.	19 years ago
marko	329a29c2fb	branches/zip: Replace ib_ulonglong with ib_uint64_t, since we want exactly 64 bits. "long long" might be longer than 64 bits on some systems.	19 years ago
marko	7593a465db	branches/zip: Introduce the unsigned 64-bit data type ib_ulonglong for log sequence numbers, to replace dulint.	19 years ago
marko	03bdaaf509	branches/zip: Introduce a new preprocessor symbol, UNIV_BUF_DEBUG, and enclose buf_validate() and friends in it.	19 years ago
marko	97b49ef91f	branches/zip: Add #define UNIV_DEBUG_FILE_ACCESSES to univ.i and enclose all related debug code in #ifdef UNIV_DEBUG_FILE_ACCESSES. This should have no effect on the behaviour, as the symbol is not defined by default. It only reduces the size of buf_block_t and removes some assignments and debug functions.	19 years ago
marko	19420d4621	branches/zip: Merge revisions 968:1009 from trunk.	19 years ago
marko	42bd3289a3	branches/zip: os_mem_alloc_large(), os_mem_free_large(): On POSIX, use mmap() and munmap(). On Windows, use VirtualAlloc() and VirtualFree(). Only on Netware, use ut_malloc_low() and ut_free(). The lower-level functions on POSIX and Windows allow InnoDB to return memory to the operating system when the buffer pool is shrunk.	19 years ago
marko	8df8b91977	branches/zip: Merge revisions 887:934 from trunk.	19 years ago
marko	ff0acd76af	branches/zip: Instrument the buffer pool allocator and deallocator for more accurate Valgrind debugging. univ.i: Introduce UNIV_DEBUG_VALGRIND, UNIV_MEM_VALID, and UNIV_MEM_INVALID. buf_LRU_block_free_non_file_page(): Invalidate the buffer frame with UNIV_MEM_INVALID(). buf_LRU_get_free_block(): Declare the buffer frame valid with UNIV_MEM_VALID(). Other memory is allocated and deallocated via malloc() and free(), which are already overridden by Valgrind. Without the added instrumentation, accesses to free pages in the buffer pool cannot be caught. The diagnostics could probably be improved further by declaring all non-latched buffer frames invalid.	19 years ago
marko	68a65c142c	branches/zip: Merge revisions 804:838 from trunk.	19 years ago
marko	d4d321ad85	branches/zip: Merge revisions 767:789 from trunk.	19 years ago
marko	96826e51c0	branches/zip: Introduce the symbol UNIV_DEBUG_PRINT for enabling debug print functions. buf_LRU_print(), buf_print(): Replace #ifdef UNIV_DEBUG with #ifdef UNIV_DEBUG_PRINT.	20 years ago
marko	24dce67db4	branches/zip: Merge revisions 558:560 from trunk.	20 years ago
marko	d30e44bc32	branches/zip: Merge revisions 465:532 from trunk.	20 years ago
marko	0c4dfda3be	branches/zip: Merge revisions 265:459 from trunk.	20 years ago
marko	40b0bf7807	branches/zip: Merge revisions 236:247 from trunk.	20 years ago
marko	747c8fad44	branches/zip: Merge revisions 200:236 from trunk.	20 years ago
marko	dcfc19c47c	branches/zip: Merge revisions 79:200 from trunk.	20 years ago
marko	82c74a7535	branches/zip: Minor improvements for debugging and testing purposes. buf_flush_init_for_writing(): Improve the diagnostics and make the condition for skipping pages accurate. univ.i: Introduce UNIV_ZIP_DEBUG for enabling some page_zip_validate() tests. page0zip.h, page0zip.c: Define and use page_zip_validate() in page_zip_compress() and page_zip_write() if UNIV_ZIP_DEBUG or UNIV_DEBUG is defined.	20 years ago
osku	2903c72469	Import 5.0 code.	20 years ago

48 Commits (70f11286199f48ca7f354bd2af37c23913f127e2)