An error occurred fetching the project authors.
  1. 16 Jul, 2010 1 commit
    • Michael Widenius's avatar
      mysql client: Ignore --comments at start of command line. This allows one to... · 9f96097a
      Michael Widenius authored
      mysql client: Ignore --comments at start of command line. This allows one to more easily run mysqltest tests trough the command line.
      Fixed bug: LP#603026 RQG: pagecache_read: Assertion `pageno < ((1ULL) << 40)' on OPTIMIZE TABLE of a Maria table  
      
      client/mysql.cc:
        Removed Oracle copyright from stdout, as Oracle doesn't have copyright to all code in this file.
        Ignore --comments at start of command line. This allows one to more easily run mysqltest tests trough the command line.
      mysql-test/suite/maria/r/optimize.result:
        Added test for LP#603026
      mysql-test/suite/maria/t/optimize.test:
        Added test for LP#603026
      sql/net_serv.cc:
        Removed DBUG_ASSERT(), as this code can happen during testing.
      storage/maria/ma_check.c:
        Fixed bug: LP#603026 RQG: pagecache_read: Assertion `pageno < ((1ULL) << 40)' on OPTIMIZE TABLE of a Maria table  
        The problem was duplicated memory usage with long packed keys.
      9f96097a
  2. 14 Jan, 2010 1 commit
    • Michael Widenius's avatar
      Fix for compiler warnings on windows · d121e663
      Michael Widenius authored
      Fix wrong cast of time()
      
      include/my_pthread.h:
        Safety fix that also removes compiler warnings
      sql/handler.h:
        Changed timestamp columns to be of type time_t
      storage/maria/ma_check.c:
        Removed wrong cast
      storage/maria/ma_create.c:
        Removed wrong cast
      storage/myisam/mi_check.c:
        Removed wrong cast
      storage/myisam/mi_create.c:
        Removed wrong cast
      storage/xtradb/handler/ha_innodb.cc:
        Removed compiler warning on windows
      d121e663
  3. 29 Nov, 2009 1 commit
    • Michael Widenius's avatar
      Remove compiler warnings (Including some warnings from -Wstrict-aliasing) · d13c5435
      Michael Widenius authored
      Don't use static link by default (in compile-pentium) as some new systems doesn't have all static libraries available
      Change type for functions in plugin.h:str_mysql_ftparser_param() to const unsigned char and string lengths to size_t.
      One effect of the above change is that one needs to include mysql_global.h or define size_t before including plugin.h
      This fixes a case where mysql_client_test failed with newer gcc that enables strict-aliasing by default
      
      
      BUILD/compile-pentium:
        Don't use static link by default as some new systems doesn't have all static libraries available
      client/mysql_upgrade.c:
        Remove not used variable
      cmd-line-utils/readline/config_readline.h:
        Define some constants to get rid of compiler warnings on Linux
      cmd-line-utils/readline/display.c:
        Get rid of compiler warnings
      cmd-line-utils/readline/history.c:
        Got rid of compiler warnings:
        - Defining some strings as const
        - Added cast
      cmd-line-utils/readline/rlmbutil.h:
        Added cast to get rid of compiler warnings
      cmd-line-utils/readline/text.c:
        Remove not needed initialization to get rid of compiler warnings
      cmd-line-utils/readline/xmalloc.c:
        Changed types to 'const char* to get rid of compiler warnings
      configure.in:
        Ensure that we use MariaDB as suffix
      include/mysql/plugin.h:
        Changed types to 'const unsigned char* to get rid of compiler warnings (in other parts of the code)
        Change length for not \0 terminated string to size_t
      include/mysql/plugin.h.pp:
        Update related to plugin.h
      libmysql/libmysql.c:
        Fixed bug that caused core dump with newer gcc when strict aliasing is not turned off
      mysql-test/t/information_schema.test:
        Test is depending on innodb
      mysql-test/t/not_partition.test:
        Fixed wrong directory name
        (Not noticed before as we don't ususally run this test)
      mysys/lf_hash.c:
        Got rid of compiler warnings from -Wstrict-aliasing
      mysys/my_redel.c:
        Removed not used variable
      regex/engine.c:
        Changed types to 'const char* to get rid of compiler warnings
      regex/engine.ih:
        Changed types to 'const char* to get rid of compiler warnings
      sql/sp_head.cc:
        Got rid of compiler warning from -Wstrict-aliasing
      sql/sql_base.cc:
        Got rid of compiler warnings from -Wstrict-aliasing
        (The original code was probably wrong as nj_col->table_field was
      sql/sql_builtin.cc.in:
        plugin.h needs to have size_t defined
      sql/sql_parse.cc:
        Remove used variable
      sql/sql_select.cc:
        Got rid of compiler warnings from -Wstrict-aliasing
      sql/sql_show.cc:
        Added #ifdef to get rid of compiler warning when not using partition engine
      sql/table.cc:
        Got rid of compiler warning from -Wstrict-aliasing
      storage/maria/ha_maria.cc:
        Got rid of compiler warnings from -Wstrict-aliasing:
        - Use the thd_killed() API function
      storage/maria/lockman.c:
        Got rid of compiler warnings from -Wstrict-aliasing
      storage/maria/ma_check.c:
        Got rid of compiler warnings from -Wstrict-aliasing
        Change to use new version of _ma_killed_ptr; Don't call it as often as before
      storage/maria/ma_check_standalone.h:
        Update to compatible _ma_killed_ptr() from ha_maria.cc
      storage/maria/ma_ft_boolean_search.c:
        Changed pointers from char -> const char* and length to size_t (to get rid of compiler warnings and casts)
      storage/maria/ma_ft_nlq_search.c:
        Got rid of compiler warnings from -Wstrict-aliasing
        Ensure that 'subkeys' is 32 bit
      storage/maria/ma_ft_parser.c:
        Changed pointers from char -> const char* and length to size_t (to get rid of compiler warnings and casts)
      storage/maria/ma_ftdefs.h:
        Changed pointers from char -> const char* and length to size_t (to get rid of compiler warnings and casts)
      storage/maria/ma_sort.c:
        Change to use new version of _ma_killed_ptr; Don't call it as often as before
      storage/maria/ma_state.c:
        Got rid of compiler warnings from -Wstrict-aliasing
      storage/maria/maria_def.h:
        Redefine ma_killed_ptr()
      storage/maria/maria_ftdump.c:
        Got rid of compiler warnings from -Wstrict-aliasing
      storage/maria/trnman.c:
        Got rid of compiler warnings from -Wstrict-aliasing
      storage/myisam/ft_boolean_search.c:
        Changed pointers from char -> const char* and length to size_t (to get rid of compiler warnings and casts)
      storage/myisam/ft_nlq_search.c:
        Got rid of compiler warnings from -Wstrict-aliasing
      storage/myisam/ft_parser.c:
        Changed pointers from char -> const char* and length to size_t (to get rid of compiler warnings and casts)
      storage/myisam/ft_stopwords.c:
        Changed pointers from char -> const char* and length to size_t (to get rid of compiler warnings and casts)
      storage/myisam/ftdefs.h:
        Changed pointers from char -> const char* and length to size_t (to get rid of compiler warnings and casts)
      storage/myisam/ha_myisam.cc:
        Got rid of compiler warnings from -Wstrict-aliasing:
        - Use the thd_killed() API function
      storage/myisam/mi_check.c:
        Use new killed_ptr() function
      storage/myisam/myisam_ftdump.c:
        Got rid of compiler warnings from -Wstrict-aliasing
      storage/myisam/myisamchk.c:
        Update to compatible killed_ptr() from ha_myisam.cc
      storage/myisam/myisamdef.h:
        Redefine killed_ptr()
      storage/myisam/myisamlog.c:
        Got rid of compiler warnings from -Wstrict-aliasing
      storage/myisam/sort.c:
        Change to use new version of killed_ptr; Don't call it as often as before
      storage/xtradb/fil/fil0fil.c:
        Fixedc ompiler warning
      storage/xtradb/trx/trx0i_s.c:
        Include mysql_plugin.h later to ensure that size_t is defined
      d13c5435
  4. 06 May, 2009 1 commit
    • unknown's avatar
      We are now using Valgrind rather than purify, and have for quite some time. · b125770a
      unknown authored
      Consequently, rename HAVE_purify to HAVE_valgrind, and related changes.
      Leave some comments about purify when not clear that they apply also to Valgrind.
      Fix redundant IF_VALGRIND declaration.
      
      Misc. small fixes:
       - Fixes for pool-of-threads patch.
       - Fixes for push of PBXT storage engine.
       - mysql-test-run.pl fix.
       - Fix build problem in compile-pentium64-max.
      
      
      BUILD/SETUP.sh:
        Rename purify -> valgrind.
      BUILD/build_mccge.sh:
        Rename purify -> valgrind.
      BUILD/compile-dist:
        Fix that PBXT was missing in source tarball after `BUILD/compile-dist && make dist`
      BUILD/compile-pentium64-max:
        Fix a build problem with BUILD/compile-pentium64-max on CentOS/Fedora Core 10 amd64.
              
        On these systems, there is libz.so but no libz.a. Finding libz.so, ./configure decides
        to use system zlib. But since BUILD/compile-pentium64-max builds a fully static binary
        with -all-static, the link of mysqld fails due to missing libz.a.
              
        Fix by using bundled zlib in the build script.
      BUILD/compile-solaris-sparc-purify:
        Rename purify -> valgrind.
      include/m_string.h:
        Rename purify -> valgrind.
      include/my_global.h:
        Rename purify -> valgrind.
      mysql-test/Makefile.am:
        Fix that PBXT test suite was missing from `make dist` source tarball.
      mysql-test/lib/mtr_unique.pm:
        Better fix to avoid races when chmod'ing the semaphore file.
        (Though using chmod 666 shared files in /tmp/ is still not a very good solution).
      mysql-test/t/pool_of_threads.cnf:
        Fix that test case pool_of_threads fails if run on mysqld with no --with-libevent support.
      mysys/mf_qsort.c:
        Rename purify -> valgrind.
      mysys/my_alloc.c:
        Rename purify -> valgrind.
      mysys/my_init.c:
        Rename purify -> valgrind.
      mysys/my_rnd.c:
        Rename purify -> valgrind.
      mysys/safemalloc.c:
        Rename purify -> valgrind.
      scripts/mysql_config.pl.in:
        Rename purify -> valgrind.
      scripts/mysql_config.sh:
        Rename purify -> valgrind.
      sql/field_conv.cc:
        Rename purify -> valgrind.
      sql/filesort.cc:
        Rename purify -> valgrind.
      sql/ha_partition.cc:
        Rename purify -> valgrind.
      sql/hostname.cc:
        Rename purify -> valgrind.
      sql/item_timefunc.cc:
        Rename purify -> valgrind.
      sql/log_event.cc:
        Rename purify -> valgrind.
      sql/log_event_old.cc:
        Rename purify -> valgrind.
      sql/my_decimal.h:
        Rename purify -> valgrind.
      sql/mysqld.cc:
        Rename purify -> valgrind.
        Fix redundant IF_VALGRIND declaration.
      sql/opt_range.cc:
        Rename purify -> valgrind.
      sql/opt_range.h:
        Rename purify -> valgrind.
      sql/records.cc:
        Rename purify -> valgrind.
      sql/rpl_rli.cc:
        Rename purify -> valgrind.
      sql/rpl_rli.h:
        Rename purify -> valgrind.
      sql/set_var.cc:
        Fix missing static declaration on pool_of_threads.
      sql/slave.cc:
        Rename purify -> valgrind.
      sql/sql_base.cc:
        Rename purify -> valgrind.
      sql/sql_binlog.cc:
        Rename purify -> valgrind.
      sql/sql_class.cc:
        Rename purify -> valgrind.
      sql/sql_list.h:
        Rename purify -> valgrind.
      sql/sql_load.cc:
        Rename purify -> valgrind.
      sql/sql_select.cc:
        Rename purify -> valgrind.
      sql/table.cc:
        Rename purify -> valgrind.
      storage/archive/azio.c:
        Rename purify -> valgrind.
      storage/innobase/buf/buf0buf.c:
        Rename purify -> valgrind.
      storage/innobase/include/univ.i:
        Rename purify -> valgrind.
      storage/innobase/srv/srv0start.c:
        Rename purify -> valgrind.
      storage/maria/ha_maria.cc:
        Rename purify -> valgrind.
      storage/maria/ma_blockrec.c:
        Rename purify -> valgrind.
      storage/maria/ma_check.c:
        Rename purify -> valgrind.
      storage/maria/ma_loghandler.c:
        Rename purify -> valgrind.
      storage/maria/ma_packrec.c:
        Rename purify -> valgrind.
      storage/maria/ma_page.c:
        Rename purify -> valgrind.
      storage/maria/ma_pagecrc.c:
        Rename purify -> valgrind.
      storage/maria/ma_search.c:
        Rename purify -> valgrind.
      storage/myisam/mi_check.c:
        Rename purify -> valgrind.
      storage/myisam/mi_page.c:
        Rename purify -> valgrind.
      storage/myisam/mi_search.c:
        Rename purify -> valgrind.
      storage/myisammrg/ha_myisammrg.cc:
        Rename purify -> valgrind.
      strings/bcmp.c:
        Rename purify -> valgrind.
      strings/decimal.c:
        Rename purify -> valgrind.
      strings/strmake.c:
        Rename purify -> valgrind.
      b125770a
  5. 12 Feb, 2009 1 commit
  6. 09 Jan, 2009 1 commit
    • Michael Widenius's avatar
      Code cleanup: · 7eda7f13
      Michael Widenius authored
      - Removed not needed casts
      - Indentation fixes
      - Changed some buffer variables to uchar, to be able to remove casts
      
      
      storage/maria/ma_bitmap.c:
        Removed not needed casts
      storage/maria/ma_blockrec.c:
        Removed not needed casts
      storage/maria/ma_check.c:
        Removed not needed casts.
        Changed type of buffers to be able to remove casts
      storage/maria/ma_create.c:
        Removed not needed casts
      storage/maria/ma_delete.c:
        Removed not needed casts
      storage/maria/ma_dynrec.c:
        Removed not needed casts
      storage/maria/ma_extra.c:
        Removed not needed casts
      storage/maria/ma_ft_boolean_search.c:
        Removed not needed casts
      storage/maria/ma_ft_nlq_search.c:
        Removed not needed casts
      storage/maria/ma_ft_parser.c:
        Removed not needed casts
      storage/maria/ma_loghandler.c:
        Removed not needed casts
      storage/maria/ma_open.c:
        Removed not needed casts
      storage/maria/ma_packrec.c:
        Removed not needed casts
      storage/maria/ma_pagecache.c:
        Removed not needed casts
      storage/maria/ma_preload.c:
        Removed not needed casts
        Removed not needed initialization
      storage/maria/ma_rnext_same.c:
        Removed not needed casts
      storage/maria/ma_rt_index.c:
        Removed not needed casts
      storage/maria/ma_search.c:
        Removed not needed casts
      storage/maria/ma_sort.c:
        Removed not needed casts
        Removed not needed if
        Fixed indentation
      storage/maria/ma_statrec.c:
        Removed not needed casts
      storage/maria/ma_test2.c:
        Removed not needed casts
      storage/maria/ma_write.c:
        Removed not needed casts
        Indentation fixes
      storage/maria/maria_chk.c:
        Removed not needed casts
      storage/maria/maria_pack.c:
        Removed not needed casts
      7eda7f13
  7. 08 Jan, 2009 1 commit
  8. 27 Dec, 2008 1 commit
    • Michael Widenius's avatar
      Fixed bugs found by pushbuild · 910284e6
      Michael Widenius authored
      Added code to detect and give error when doing an insert into a view where we accessed fields in a not yet read table
      Disabled test in subselect.test as the CHECK_OPTION for views doesn't work for insert.
      This needs to be fixed properly later.
      
      The problem with views are described in Bug #41760 Inserting into multiple-table views is not working
      
      mysql-test/r/insert.result:
        Fixed wrong usage of insert into view.
      mysql-test/r/subselect.result:
        Disabled wrong test (temporary)
      mysql-test/suite/maria/r/maria.result:
        Added test of size of table
      mysql-test/suite/maria/t/maria.test:
        Added test of size of table
      mysql-test/t/insert.test:
        Fixed wrong usage of insert into view
        The bug is that during insert/update we currently don't read any of the referenced tables of the view.
        This means that we can't get a value from another table to use as part of the update.
      mysql-test/t/subselect.test:
        Disabled not working test until someone has time to fix insert into view properly
        Here we where refering to last used value in t2, which is wrong.
      sql/sql_insert.cc:
        Detect if we are trying to update one table in a view based on value in another, not yet read, table.
        This fixes the problem discovered in insert.test
      storage/maria/ma_blockrec.c:
        Don't ignore not critical changes to the last page in the table.
        We need to write the last page as otherwise we can during aborting of a row with a duplicate key get
        state.data_file_length and the real length of file out of sync
      storage/maria/ma_check.c:
        Flush the page cache even if we got an error during zerofill.
        (This fixes a call to assert() in case of a too short data file)
      storage/maria/ma_pagecache.c:
        Mark page as read when we do a write of a full page.
        This fixes a bug when we got an error during read and then used direct write to page to update it
      storage/maria/ma_state.c:
        Restore info->lock.type after call to maria_versioning.
        Fixed crash in maria_recover.test
      storage/maria/maria_read_log.c:
        Don't write thread id in debug log. (Not needed as maria_read_log is a single treaded program)
      910284e6
  9. 14 Oct, 2008 2 commits
    • Michael Widenius's avatar
      Merging of changes from myisam -> maria missing in last 5.1 - 5.1->maria merge · 32718418
      Michael Widenius authored
      MARIA_MAX_MSG_BUF -> HA_MAX_MSG_BUF
      
      include/maria.h:
        Remove MARIA_MAX_MSG_BUF; We are now using HA_MAX_MSG_BUF
        Added maria_test_invalid_symlink
      storage/maria/ha_maria.cc:
        MARIA_MAX_MSG_BUF -> HA_MAX_MSG_BUF
      storage/maria/ma_check.c:
        Removed tab in string constant
        Add extra argument to ma_open_datafile()
      storage/maria/ma_create.c:
        Set error number if table is in use
      storage/maria/ma_open.c:
        Added name argument to open functions for security check if filename is linked to another file in database directory
      storage/maria/ma_static.c:
        Default functions for checking if wrong symlink
      storage/maria/maria_chk.c:
        Add extra argument to _ma_open_datafile()
      storage/maria/maria_def.h:
        Add extra argument to _ma_open_datafile()
      32718418
    • Guilhem Bichot's avatar
      _ma_bitmap_unpin_all() needs to unpin not-locked pages which were pinned by other threads · 8ecda6cd
      Guilhem Bichot authored
      in write_changed_bitmap(), and page cache forbids that. Here we make the page
      cache more relaxed. Original patch by Sanja, simplified by me as limited to
      not-locked. See comment of ma_bitmap.c.
      With that, maria_stress.yy runs until hitting BUG 39665.
      
      storage/maria/ma_bitmap.c:
        A thread which unpins bitmap pages in _ma_bitmap_unpin_all() sometimes
        hit an assertion in the page cache (info!=0 in remove_pin()) which states
        that you can unpin/unlock only what *you* have pinned/locked.
        Fixed by setting the new last parameter of pagecache_unlock_by_link()
        to TRUE in _ma_bitmap_unpin_all().
      storage/maria/ma_blockrec.c:
        new prototype and splitting assertion in three (3rd one fires: BUG 39665)
      storage/maria/ma_check.c:
        new prototype
      storage/maria/ma_key_recover.c:
        new prototype
      storage/maria/ma_loghandler.c:
        new prototype
      storage/maria/ma_pagecache.c:
        Allow a thread to unpin, with pagecache_unlock_by_link(), a non-locked page pinned by others.
        This is a hack for _ma_bitmap_unpin_all() which needs to unpin pages which were
        pinned by other threads in write_changed_bitmap().
      storage/maria/ma_pagecache.h:
        new prototype
      storage/maria/ma_preload.c:
        new prototype
      storage/maria/unittest/ma_pagecache_rwconsist.c:
        new prototype
      storage/maria/unittest/ma_pagecache_single.c:
        new prototype
      8ecda6cd
  10. 01 Sep, 2008 1 commit
    • Michael Widenius's avatar
      Added MARIA_PAGE structure to keep all information about a maria key page. · d6bdf033
      Michael Widenius authored
      This allowed me to remove a lot of parameters to functions, local variables,
      duplicate code and identical constructs.  It should also make the code easier
      to read.
      Changed all marking of page as changed to use offset instead of pointers; This removed
      one theoretical problem where dynamic_array may have been moved between two calls.
      In addition I changed some functions from return my_bool
      
      
      include/maria.h:
        Changes to use MARIA_PAGE
      storage/maria/ma_check.c:
        Changes to use MARIA_PAGE
        Folded lines longer > 79 characters
      storage/maria/ma_delete.c:
        Changes to use MARIA_PAGE
        Changed _ma_ck_delete(), ma_log_delete(), ma_write_undo_key_delete() and _ma_ck_real_delete() to return type my_bool
        Removed some calls to maria_print_error() as the caller (maria_delete() and maria_write()) also prints the error
      storage/maria/ma_ft_update.c:
        Fix needed as _ma_ck_delete() now returns my_bool
        New parameter for ma_write_keypage.
      storage/maria/ma_key_recover.c:
        Changes to use MARIA_PAGE
      storage/maria/ma_key_recover.h:
        Updated function prototypes
      storage/maria/ma_page.c:
        Changes to use MARIA_PAGE
        Added _ma_page_setup() for old functions that doesn't (yet) use MARIA_PAGE natively
      storage/maria/ma_range.c:
        Changes to use MARIA_PAGE
      storage/maria/ma_rt_index.c:
        Changes to use MARIA_PAGE
        Changed maria_rtree_delete() and maria_rtree_real_delete() to return type my_bool
        Removed one 'if (node_flag) as this was always true
        Changed lable 'err1' to 'err' as there was no other error lables
        Moved allocation of page_buff outside of loop for fewer alloc/free calls
        Changed n_pages and m_pages to uint as 65000 pages is more than enough
      storage/maria/ma_rt_index.h:
        Updated function prototypes
      storage/maria/ma_rt_key.c:
        Changes to use MARIA_PAGE
      storage/maria/ma_rt_key.h:
        Updated function prototypes
      storage/maria/ma_rt_mbr.c:
        Changes to use MARIA_PAGE
      storage/maria/ma_rt_mbr.h:
        Updated function prototypes
      storage/maria/ma_rt_split.c:
        Changes to use MARIA_PAGE
      storage/maria/ma_search.c:
        Changes to use MARIA_PAGE
      storage/maria/ma_write.c:
        Changes to use MARIA_PAGE
        Changed _ma_ck_write_btree_with_log(), _ma_ck_real_write_btree(), ma_enlarge_root() to use return type my_bool
        Don't set *root to HA_OFFSET_ERROR in case of error
        Removed maria_print_error() calls as caller will do this
        Simplified logic in balance_page by introducing pointers to left and right pages
      storage/maria/maria_chk.c:
        Changes to use MARIA_PAGE
      storage/maria/maria_def.h:
        Changes to use MARIA_PAGE
        Removed some not used macros
        Added macros for MARIA_PAGE handling
      d6bdf033
  11. 25 Aug, 2008 1 commit
    • Michael Widenius's avatar
      Changed all file names in maria to LEX_STRING and removed some calls to strlen() · 1a5de5bc
      Michael Widenius authored
      Ensure that pagecache gives correct error number even if error for block happend
      
      
      mysys/my_pread.c:
        Indentation fix
      storage/maria/ha_maria.cc:
        filenames changed to be of type LEX_STRING
      storage/maria/ma_check.c:
        filenames changed to be of type LEX_STRING
      storage/maria/ma_checkpoint.c:
        filenames changed to be of type LEX_STRING
      storage/maria/ma_create.c:
        filenames changed to be of type LEX_STRING
      storage/maria/ma_dbug.c:
        filenames changed to be of type LEX_STRING
      storage/maria/ma_delete.c:
        filenames changed to be of type LEX_STRING
      storage/maria/ma_info.c:
        filenames changed to be of type LEX_STRING
      storage/maria/ma_keycache.c:
        filenames changed to be of type LEX_STRING
      storage/maria/ma_locking.c:
        filenames changed to be of type LEX_STRING
      storage/maria/ma_loghandler.c:
        filenames changed to be of type LEX_STRING
      storage/maria/ma_open.c:
        filenames changed to be of type LEX_STRING
      storage/maria/ma_pagecache.c:
        Store error number for last failed operation in the page block
        This should fix some asserts() when errno was not properly set after failure to read block in another thread
      storage/maria/ma_recovery.c:
        filenames changed to be of type LEX_STRING
      storage/maria/ma_update.c:
        filenames changed to be of type LEX_STRING
      storage/maria/ma_write.c:
        filenames changed to be of type LEX_STRING
      storage/maria/maria_def.h:
        filenames changed to be of type LEX_STRING
      storage/maria/maria_ftdump.c:
        filenames changed to be of type LEX_STRING
      storage/maria/maria_pack.c:
        filenames changed to be of type LEX_STRING
      1a5de5bc
  12. 10 Jul, 2008 1 commit
  13. 09 Jul, 2008 1 commit
    • Guilhem Bichot's avatar
      Fix for BUG#37876 "Importing Maria table from other server via binary copy does not work": · 60b88ce4
      Guilhem Bichot authored
      - after auto-zerofill (ha_maria::check_and_repair()) kepts its state's LSNs unchanged, which could
      be the same as the create_rename_lsn of another pre-existing table, which would break versioning as this LSN
      serves as unique identifier in the versioning code (in maria_open()). Even the state pieces which
      maria_zerofill() did change were lost (because they didn't go to disk).
      - after this fix, if two tables were auto-zerofilled at the same time (by _ma_mark_changed())
      they could receive the same create_rename_lsn, which would break versioning again. Fix is to write a log
      record each time a table is imported.
      - Print state's LSNs (create_rename_lsn, is_of_horizon, skip_redo_lsn) and UUID in maria_chk -dvv.
      
      mysql-test/r/maria-autozerofill.result:
        result
      mysql-test/t/maria-autozerofill.test:
        Test for auto-zerofilling
      storage/maria/ha_maria.cc:
        The state changes done by auto-zerofilling never reached disk.
      storage/maria/ma_check.c:
        When zerofilling a table, including its pages' LSNs, new state LSNs are needed next time the table
        is imported into a Maria instance.
      storage/maria/ma_create.c:
        Write LOGREC_IMPORTED_TABLE when importing a table. This is informative and ensures
        that the table gets a unique create_rename_lsn even though multiple tables
        are imported by concurrent threads (it advances the log's end LSN).
      storage/maria/ma_key_recover.c:
        comment
      storage/maria/ma_locking.c:
        instead of using translog_get_horizon() for state's LSNs of imported table,
        use the LSN of to-be-written LOGREC_IMPORTED_TABLE.
      storage/maria/ma_loghandler.c:
        New type of log record
      storage/maria/ma_loghandler.h:
        New type of log record
      storage/maria/ma_loghandler_lsn.h:
        New name for constant as can be used not only by maria_chk but auto-zerofill now too.
      storage/maria/ma_open.c:
        instead of using translog_get_horizon() for state's LSNs of imported table,
        use the LSN of to-be-written LOGREC_IMPORTED_TABLE.
      storage/maria/ma_recovery.c:
        print content of LOGREC_IMPORTED_TABLE in maria_read_log.
      storage/maria/maria_chk.c:
        print info about LSNs of the table's state, and UUID, when maria_chk -dvv
      storage/maria/maria_pack.c:
        new name for constant
      storage/maria/unittest/ma_test_recovery.pl:
        Now that maria_chk -dvv shows state LSNs and UUID those need to be filtered out,
        as maria_read_log -a does not use the same as at original run.
      60b88ce4
  14. 05 Jul, 2008 1 commit
    • Michael Widenius's avatar
      Bug#37276 maria crash on insert around the time check table is run · 82d79389
      Michael Widenius authored
      Fixed several (but not all) issues found by the test program:
      - ASSERT on row_length in ma_blockrec.c::_ma_compact_block_page()
      - Fixed bug when splitting node pages
      - Fixed hang in 'closeing tables' (conflicting mutex order) by ensuring we first take trnman lock and then share->intern_lock
      
      storage/maria/ma_blockrec.c:
        When compacting a row page when allocating space for a new row, the min length of a the new block may be temporarly smaller than 'min_block_length'.
      storage/maria/ma_check.c:
        More DBUG output
      storage/maria/ma_checkpoint.c:
        Call new function _ma_remove_not_visible_states_with_lock() to ensure we first take lock on trnman and then on share->intern_lock
        +
      storage/maria/ma_close.c:
        Added comment
      storage/maria/ma_open.c:
        Added comment
      storage/maria/ma_search.c:
        Copy also node data; Caused bug when splitting node pages
      storage/maria/ma_state.c:
        Added _ma_remove_not_visible_states_with_lock() to ensure we take locks in right order
      storage/maria/ma_state.h:
        Added new prototype
      storage/maria/trnman.c:
        Added trnman_lock() and trnman_unlock().
        Needed by _ma_remove_not_visible_states_with_lock() to get mutex in right order
      storage/maria/trnman_public.h:
        Added new prototypes
      82d79389
  15. 30 Jun, 2008 2 commits
  16. 28 Jun, 2008 1 commit
    • Michael Widenius's avatar
      Fix for Bug #36578 Maria: maria-recover may fail to autorepair a table · 9f589947
      Michael Widenius authored
      Fixed also some similar issues in MyISAM. This was not noticed before as MyISAM did a second retry without key cache (which just made the second repair attempty slower)
      
      storage/maria/ha_maria.cc:
        Print information if we retry without quick in case of CHECK TABLE table_name QUICK
        Remove T_QUICK flag when retrying repair, but set T_SAFE_REPAIR to ensure we don't loose any rows
        Remember T_RETRY_WITH_QUICK flag when restoring repair flags
        Don't print 'checking table' if we are not checking table in auto-repair
        Don't use T_QUICK in auto repair (safer)
        Changed parameter of type HA_PARAM &param to HA_PARAM *param
      storage/maria/ha_maria.h:
        Changed parameter of type HA_PARAM &param to HA_PARAM *param
      storage/maria/ma_check.c:
        Added retry without T_QUICK if there is a problem reading a row in BLOCK_RECORD
      storage/myisam/ha_myisam.cc:
        Remove T_QUICK flag when retrying repair, but set T_SAFE_REPAIR to ensure we don't loose any rows
        Remember T_RETRY_WITH_QUICK flag when restoring repair flags
      9f589947
  17. 26 Jun, 2008 2 commits
    • Guilhem Bichot's avatar
      Fixes for build errors under Windows and compiler warning under Linux · f0c53638
      Guilhem Bichot authored
      include/m_string.h:
        new macro like LINT_INIT but for struct. In m_string.h because bzero() becomes available only there
      storage/maria/ma_check.c:
        compiler error under Windows (declaration after statements...)
      storage/maria/ma_key.c:
        trnman.h is not in include/ but in storage/maria
      storage/maria/ma_sp_key.c:
        trnman.h is not in include/ but in storage/maria
      storage/maria/ma_write.c:
        avoid compiler warning (org_key.flag may be used uninitialized)
      f0c53638
    • Michael Widenius's avatar
      Added versioning of Maria index · 52cb0c24
      Michael Widenius authored
      Store max_trid in index file as state.create_trid. This is used to pack all transids in the index pages relative to max possible transid for file.
      Enable versioning for transactional tables with index. Tables with an auto-increment key, rtree or fulltext keys are not versioned.
      Changed info->lastkey to type MARIA_KEY. Removed info->lastkey_length as this is now part of info->lastkey
      Renamed old info->lastkey to info->lastkey_buff
      Use exact key lenghts for keys, not USE_WHOLE_KEY
      For partial key searches, use SEARCH_PART_KEY
      When searching to insert new key on page, use SEARCH_INSERT to mark that key has rowid
      
      Changes done in a lot of files:
      - Modified functions to use MARIA_KEY instead of key pointer and key length
      - Use keyinfo->root_lock instead of share->key_root_lock[keynr]
      - Simplify code by using local variable keyinfo instead if share->keyinfo[i]
      - Added #fdef EXTERNAL_LOCKING around removed state elements
      - HA_MAX_KEY_BUFF -> MARIA_MAX_KEY_BUFF (to reserve space for transid)
      - Changed type of 'nextflag' to uint32 to ensure all SEARCH_xxx flags fits into it
      
      .bzrignore:
        Added missing temporary directory
      extra/Makefile.am:
        comp_err is now deleted on make distclean
      include/maria.h:
        Added structure MARIA_KEY, which is used for intern key objects in Maria.
        Changed functions to take MARIA_KEY as an argument instead of pointer to packed key.
        Changed some functions that always return true or false to my_bool.
        Added virtual function make_key() to avoid if in _ma_make_key()
        Moved rw_lock_t for locking trees from share->key_root_lock to MARIA_KEYDEF. This makes usage of the locks simpler and faster
      include/my_base.h:
        Added HA_RTREE_INDEX flag to mark rtree index. Used for easier checks in ma_check()
        Added SEARCH_INSERT to be used when inserting new keys
        Added SEARCH_PART_KEY for partial searches
        Added SEARCH_USER_KEY_HAS_TRANSID to be used when key we use for searching in btree has a TRANSID
        Added SEARCH_PAGE_KEY_HAS_TRANSID to be used when key we found in btree has a transid
      include/my_handler.h:
        Make next_flag 32 bit to make sure we can handle all SEARCH_ bits
      mysql-test/include/maria_empty_logs.inc:
        Read and restore current database; Don't assume we are using mysqltest.
        Don't log use databasename to log. Using this include should not cause any result changes.
      mysql-test/r/maria-gis-rtree-dynamic.result:
        Updated results after adding some check table commands to help pinpoint errors
      mysql-test/r/maria-mvcc.result:
        New tests
      mysql-test/r/maria-purge.result:
        New result after adding removal of logs
      mysql-test/r/maria-recovery-big.result:
        maria_empty_logs doesn't log 'use mysqltest' anymore
      mysql-test/r/maria-recovery-bitmap.result:
        maria_empty_logs doesn't log 'use mysqltest' anymore
      mysql-test/r/maria-recovery-rtree-ft.result:
        maria_empty_logs doesn't log 'use mysqltest' anymore
      mysql-test/r/maria-recovery.result:
        maria_empty_logs doesn't log 'use mysqltest' anymore
      mysql-test/r/maria.result:
        New tests
      mysql-test/r/variables-big.result:
        Don't log id as it's not predictable
      mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result:
        Updated results to new binlog results. (Test has not been run in a long time as it requires --big)
      mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt:
        Moved file to ndb replication test directory
      mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test:
        Fixed wrong path to included tests
      mysql-test/t/maria-gis-rtree-dynamic.test:
        Added some check table commands to help pinpoint errors
      mysql-test/t/maria-mvcc.test:
        New tests
      mysql-test/t/maria-purge.test:
        Remove logs to make test results predictable
      mysql-test/t/maria.test:
        New tests for some possible problems
      mysql-test/t/variables-big.test:
        Don't log id as it's not predictable
      mysys/my_handler.c:
        Updated function comment to reflect old code
        Changed nextflag to be uint32 to ensure we can have flags > 16 bit
        Changed checking if we are in insert with NULL keys as next_flag can now include additional bits that have to be ignored.
        Added SEARCH_INSERT flag to be used when inserting new keys in btree. This flag tells us the that the keys includes row position and it's thus safe to remove SEARCH_FIND
        Added comparision of transid. This is only done if the keys actually have a transid, which is indicated by nextflag
      mysys/my_lock.c:
        Fixed wrong test (Found by Guilhem)
      scripts/Makefile.am:
        Ensure that test programs are deleted by make clean
      sql/rpl_rli.cc:
        Moved assignment order to fix compiler warning
      storage/heap/hp_write.c:
        Add SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys
      storage/maria/Makefile.am:
        Remove also maria log files when doing make distclean
      storage/maria/ha_maria.cc:
        Use 'file->start_state' as default state for transactional tables without versioning
        At table unlock, set file->state to point to live state. (Needed for information schema to pick up right number of rows)
        In ha_maria::implicit_commit() move all locked (ie open) tables to new transaction. This is needed to ensure ha_maria->info doesn't point to a deleted history event.
        Disable concurrent inserts for insert ... select and table changes with subqueries if statement based replication as this would cause wrong results on slave
      storage/maria/ma_blockrec.c:
        Updated comment
      storage/maria/ma_check.c:
        Compact key pages (removes transid) when doing --zerofill
        Check that 'page_flag' on key pages contains KEYPAGE_FLAG_HAS_TRANSID if there is a single key on the page with a transid
        Modified functions to use MARIA_KEY instead of key pointer and key length
        Use new interface to _ma_rec_pos(), _ma_dpointer(), _ma_ft_del(), ma_update_state_lsn()
        Removed not needed argument from get_record_for_key()
        Fixed that we check doesn't give errors for RTREE; We now treath these like SPATIAL
        Remove some SPATIAL specific code where the virtual functions can handle this in a general manner
        Use info->lastkey_buff instead of info->lastkey
        _ma_dpos() -> _ma_row_pos_from_key()
        _ma_make_key() -> keyinfo->make_key()
        _ma_print_key() -> _ma_print_keydata()
        _ma_move_key() -> ma_copy_copy()
        Add SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys
        Ensure that data on page doesn't overwrite page checksum position
        Use DBUG_DUMP_KEY instead of DBUG_DUMP
        Use exact key lengths instead of USE_WHOLE_KEY to ha_key_cmp()
        Fixed check if rowid points outside of BLOCK_RECORD data file
        Use info->lastkey_buff instead of key on stack in some safe places
        Added #fdef EXTERNAL_LOCKING around removed state elements
      storage/maria/ma_close.c:
        Use keyinfo->root_lock instead of share->key_root_lock[keynr]
      storage/maria/ma_create.c:
        Removed assert that is already checked in maria_init()
        Force transactinal tables to be of type BLOCK_RECORD
        Fixed wrong usage of HA_PACK_RECORD (should be HA_OPTION_PACK_RECORD)
        Mark keys that uses HA_KEY_ALG_RTREE with HA_RTREE_INDEX for easier handling of these in ma_check
        Store max_trid in index file as state.create_trid. This is used to pack all transids in the index pages relative to max possible transid for file.
      storage/maria/ma_dbug.c:
        Changed _ma_print_key() to use MARIA_KEY
      storage/maria/ma_delete.c:
        Modified functions to use MARIA_KEY instead of key pointer and key length
        info->lastkey2-> info->lastkey_buff2
        Added SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys
        Use new interface for get_key(), _ma_get_last_key() and others
        _ma_dpos() -> ma_row_pos_from_key()
        Simplify setting of prev_key in del()
        Ensure that KEYPAGE_FLAG_HAS_TRANSID is set in page_flag if key page has transid
        Treath key pages that may have a transid as if keys would be of variable length
      storage/maria/ma_delete_all.c:
        Reset history state if maria_delete_all_rows() are called
        Update parameters to _ma_update_state_lsns() call
      storage/maria/ma_extra.c:
        Store and restore info->lastkey
      storage/maria/ma_ft_boolean_search.c:
        Modified functions to use MARIA_KEY instead of key pointer and key length
      storage/maria/ma_ft_nlq_search.c:
        Modified functions to use MARIA_KEY instead of key pointer and key length
        Use lastkey_buff2 instead of info->lastkey+info->s->base.max_key_length (same thing)
      storage/maria/ma_ft_update.c:
        Modified functions to use MARIA_KEY instead of key pointer and key length
      storage/maria/ma_ftdefs.h:
        Modified functions to use MARIA_KEY instead of key pointer and key length
      storage/maria/ma_fulltext.h:
        Modified functions to use MARIA_KEY instead of key pointer and key length
      storage/maria/ma_init.c:
        Check if blocksize is legal
        (Moved test here from ma_open())
      storage/maria/ma_key.c:
        Added functions for storing/reading of transid 
        Modified functions to use MARIA_KEY instead of key pointer and key length
        Moved _ma_sp_make_key() out of _ma_make_key() as we now use keyinfo->make_key to create keys
        Add transid to keys if table is versioned
        Added _ma_copy_key()
      storage/maria/ma_key_recover.c:
        Add logging of page_flag (holds information if there are keys with transid on page)
        Changed DBUG_PRINT("info" -> DBUG_PRINT("redo" as the redo logging can be quite extensive
        Added lots of DBUG_PRINT()
        Added support for index page operations: KEY_OP_SET_PAGEFLAG and KEY_OP_COMPACT_PAGE
      storage/maria/ma_key_recover.h:
        Modified functions to use MARIA_KEY instead of key pointer and key length
      storage/maria/ma_locking.c:
        Added new arguments to _ma_update_state_lsns_sub()
      storage/maria/ma_loghandler.c:
        Fixed all logging of LSN to look similar in DBUG log
        Changed if (left != 0) to if (left) as the later is used also later in the code
      storage/maria/ma_loghandler.h:
        Added new index page operations
      storage/maria/ma_open.c:
        Removed allocated "state_dummy" and instead use share->state.common for transactional tables that are not versioned
        This is needed to not get double increments of state.records (one in ma_write.c and on when log is written)
        Changed info->lastkey to MARIA_KEY type
        Removed resetting of MARIA_HA variables that have 0 as default value (as info is zerofilled)
        Enable versioning for transactional tables with index. Tables with an auto-increment key, rtree or fulltext keys are not versioned.
        Check on open that state.create_trid is correct
        Extend share->base.max_key_length in case of transactional table so that it can hold transid
        Removed 4.0 compatible fulltext key mode as this is not relevant for Maria
        Removed old and wrong #ifdef ENABLE_WHEN_WE_HAVE_TRANS_ROW_ID code block
        Initialize all new virtual function pointers
        Removed storing of state->unique, state->process and store state->create_trid instead
      storage/maria/ma_page.c:
        Added comment to describe key page structure
        Added functions to compact key page and log the compact operation
      storage/maria/ma_range.c:
        Modified functions to use MARIA_KEY instead of key pointer and key length
        Use SEARCH_PART_KEY indicator instead of USE_WHOLE_KEY to detect if we are doing a part key search
        Added handling of pages with transid
      storage/maria/ma_recovery.c:
        Don't assert if table we opened are not transactional. This may be a table which has been changed from transactional to not transactinal
        Added new arguments to _ma_update_state_lsns()
      storage/maria/ma_rename.c:
        Added new arguments to _ma_update_state_lsns()
      storage/maria/ma_rkey.c:
        Modified functions to use MARIA_KEY instead of key pointer and key length
        Don't use USE_WHOLE_KEY, use real length of key
        Use share->row_is_visible() to test if row is visible
        Moved search_flag == HA_READ_KEY_EXACT out of 'read-next-row' loop as this only need to be tested once
        Removed test if last_used_keyseg != 0 as this is always true
      storage/maria/ma_rnext.c:
        Modified functions to use MARIA_KEY instead of key pointer and key length
        Simplify code by using local variable keyinfo instead if share->keyinfo[i]
        Use share->row_is_visible() to test if row is visible
      storage/maria/ma_rnext_same.c:
        Modified functions to use MARIA_KEY instead of key pointer and key length
        lastkey2 -> lastkey_buff2
      storage/maria/ma_rprev.c:
        Modified functions to use MARIA_KEY instead of key pointer and key length
        Simplify code by using local variable keyinfo instead if share->keyinfo[i]
        Use share->row_is_visible() to test if row is visible
      storage/maria/ma_rsame.c:
        Updated comment
        Simplify code by using local variable keyinfo instead if share->keyinfo[i]
        Modified functions to use MARIA_KEY instead of key pointer and key length
      storage/maria/ma_rsamepos.c:
        Modified functions to use MARIA_KEY instead of key pointer and key length
      storage/maria/ma_rt_index.c:
        Modified functions to use MARIA_KEY instead of key pointer and key length
        Use better variable names
        Removed not needed casts
        _ma_dpos() -> _ma_row_pos_from_key()
        Use info->last_rtree_keypos to save position to key instead of info->int_keypos
        Simplify err: condition
        Changed return type for maria_rtree_insert() to my_bool as we are only intressed in ok/fail from this function
      storage/maria/ma_rt_index.h:
        Modified functions to use MARIA_KEY instead of key pointer and key length
      storage/maria/ma_rt_key.c:
        Modified functions to use MARIA_KEY instead of key pointer and key length
        Simplify maria_rtree_add_key by combining idenitcal code and removing added_len
      storage/maria/ma_rt_key.h:
        Modified functions to use MARIA_KEY instead of key pointer and key length
      storage/maria/ma_rt_mbr.c:
        Changed type of 'nextflag' to uint32
        Added 'to' argument to RT_PAGE_MBR_XXX functions to more clearly see which variables changes value
      storage/maria/ma_rt_mbr.h:
        Changed type of 'nextflag' to uint32
      storage/maria/ma_rt_split.c:
        Modified functions to use MARIA_KEY instead of key pointer and key length
        key_length -> key_data_length to catch possible errors
      storage/maria/ma_rt_test.c:
        Fixed wrong comment
        Reset recinfo to avoid valgrind varnings
        Fixed wrong argument to create_record() that caused test to fail
      storage/maria/ma_search.c:
        Modified functions to use MARIA_KEY instead of key pointer and key length
        Added support of keys with optional trid
        Test for SEARCH_PART_KEY instead of USE_WHOLE_KEY to detect part key reads
        _ma_dpos() -> _ma_row_pos_from_key()
        If there may be keys with transid on the page, have _ma_bin_search() call _ma_seq_search()
        Add _ma_skip_xxx() functions to quickly step over keys (faster than calling get_key() in most cases as we don't have to copy key data)
        Combine similar code at end of _ma_get_binary_pack_key()
        Removed not used function _ma_move_key()
        In _ma_search_next() don't call _ma_search() if we aren't on a nod page.
        Update info->cur_row.trid with trid for found key
        
        
        
        Removed some not needed casts
        Added _ma_trid_from_key()
        Use MARIA_SHARE instead of MARIA_HA as arguments to _ma_rec_pos(), _ma_dpointer() and _ma_xxx_keypos_to_recpos() to make functions faster and smaller
      storage/maria/ma_sort.c:
        Modified functions to use MARIA_KEY instead of key pointer and key length
      storage/maria/ma_sp_defs.h:
        _ma_sp_make_key() now fills in and returns (MARIA_KEY *) value
      storage/maria/ma_sp_key.c:
        _ma_sp_make_key() now fills in and returns (MARIA_KEY *) value
        Don't test sizeof(double), test against 8 as we are using float8store()
        Use mi_float8store() instead of doing swap of value (same thing but faster)
      storage/maria/ma_state.c:
        maria_versioning() now only calls _ma_block_get_status() if table supports versioning
        Added _ma_row_visible_xxx() functions for different occasions
        When emptying history, set info->state to point to the first history event.
      storage/maria/ma_state.h:
        Added _ma_row_visible_xxx() prototypes
      storage/maria/ma_static.c:
        Indentation changes
      storage/maria/ma_statrec.c:
        Fixed arguments to _ma_dpointer() and _ma_rec_pos()
      storage/maria/ma_test1.c:
        Call init_thr_lock() if we have versioning
      storage/maria/ma_test2.c:
        Call init_thr_lock() if we have versioning
      storage/maria/ma_unique.c:
        Modified functions to use MARIA_KEY
      storage/maria/ma_update.c:
        Modified functions to use MARIA_KEY instead of key pointer and key length
      storage/maria/ma_write.c:
        Modified functions to use MARIA_KEY instead of key pointer and key length
        Simplify code by using local variable keyinfo instead if share->keyinfo[i]
        In _ma_enlarge_root(), mark in page_flag if new key has transid
        _ma_dpos() -> _ma_row_pos_from_key()
        Changed return type of _ma_ck_write_tree() to my_bool as we are only testing if result is true or not
        Moved 'reversed' to outside block as area was used later
      storage/maria/maria_chk.c:
        Added error if trying to sort with HA_BINARY_PACK_KEY
        Use new interface to get_key() and _ma_dpointer()
        _ma_dpos() -> _ma_row_pos_from_key()
      storage/maria/maria_def.h:
        Modified functions to use MARIA_KEY instead of key pointer and key length
        Added 'common' to MARIA_SHARE->state for storing state for transactional tables without versioning
        Added create_trid to MARIA_SHARE
        Removed not used state variables 'process' and 'unique'
        Added defines for handling TRID's in index pages
        Changed to use MARIA_SHARE instead of MARIA_HA for some functions
        Added 'have_versioning' flag if table supports versioning
        Moved key_root_lock from MARIA_SHARE to MARIA_KEYDEF
        Changed last_key to be of type MARIA_KEY. Removed lastkey_length
        lastkey -> lastkey_buff, lastkey2 -> lastkey_buff2
        Added _ma_get_used_and_nod_with_flag() for faster access to page data when page_flag is read
        Added DBUG_DUMP_KEY for easier DBUG_DUMP of a key
        Changed 'nextflag' and assocaited variables to uint32
      storage/maria/maria_ftdump.c:
        lastkey -> lastkey_buff
      storage/maria/trnman.c:
        Fixed wrong initialization of min_read_from and max_commit_trid
        Added trnman_get_min_safe_trid()
      storage/maria/unittest/ma_test_all-t:
        Added --start-from
      storage/myisam/mi_check.c:
        Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order
      storage/myisam/mi_delete.c:
        Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order
      storage/myisam/mi_range.c:
        Updated comment
      storage/myisam/mi_write.c:
        Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order
      storage/myisam/rt_index.c:
        Fixed wrong parameter to rtree_get_req() which could cause crash
      52cb0c24
  18. 29 May, 2008 1 commit
    • unknown's avatar
      WL#3138: Maria - fast "SELECT COUNT(*) FROM t;" and "CHECKSUM TABLE t" · 5099033c
      unknown authored
      Added argument to maria_end_bulk_insert() to know if the table will be deleted after the operation
      Fixed wrong call to strmake
      Don't call bulk insert in case of inserting only one row (speed optimization as starting/stopping bulk insert
      Allow storing year 2155 in year field
      When running with purify/valgrind avoid copying structures over themself
      Added hook 'trnnam_end_trans_hook' that is called when transaction ends
      Added trn->used_tables that is used to an entry for all tables used by transaction
      Fixed that ndb doesn't crash on duplicate key error when start_bulk_insert/end_bulk_insert are not called
      
      
      include/maria.h:
        Added argument to maria_end_bulk_insert() to know if the table will be deleted after the operation
      include/my_tree.h:
        Added macro 'reset_free_element()' to be able to ignore calls to the external free function.
        Is used to optimize end-bulk-insert in case of failures, in which case we don't want write the remaining keys in the tree
      mysql-test/install_test_db.sh:
        Upgrade to new mysql_install_db options
      mysql-test/r/maria-mvcc.result:
        New tests
      mysql-test/r/maria.result:
        New tests
      mysql-test/suite/ndb/r/ndb_auto_increment.result:
        Fixed error message now when bulk insert is not always called
      mysql-test/suite/ndb/t/ndb_auto_increment.test:
        Fixed error message now when bulk insert is not always called
      mysql-test/t/maria-mvcc.test:
        Added testing of versioning of count(*)
      mysql-test/t/maria-page-checksum.test:
        Added comment
      mysql-test/t/maria.test:
        More tests
      mysys/hash.c:
        Code style change
      sql/field.cc:
        Allow storing year 2155 in year field
      sql/ha_ndbcluster.cc:
        Added new argument to end_bulk_insert() to signal if the bulk insert should ignored
      sql/ha_ndbcluster.h:
        Added new argument to end_bulk_insert() to signal if the bulk insert should ignored
      sql/ha_partition.cc:
        Added new argument to end_bulk_insert() to signal if the bulk insert should ignored
      sql/ha_partition.h:
        Added new argument to end_bulk_insert() to signal if the bulk insert should ignored
      sql/handler.cc:
        Don't call get_dup_key() if there is no table object. This can happen if the handler generates a duplicate key error on commit
      sql/handler.h:
        Added new argument to end_bulk_insert() to signal if the bulk insert should ignored (ie, the table will be deleted)
      sql/item.cc:
        Style fix
        Removed compiler warning
      sql/log_event.cc:
        Added new argument to ha_end_bulk_insert()
      sql/log_event_old.cc:
        Added new argument to ha_end_bulk_insert()
      sql/mysqld.cc:
        Removed compiler warning
      sql/protocol.cc:
        Added DBUG
      sql/sql_class.cc:
        Added DBUG
        Fixed wrong call to strmake
      sql/sql_insert.cc:
        Don't call bulk insert in case of inserting only one row (speed optimization as starting/stopping bulk insert involves a lot of if's)
        Added new argument to ha_end_bulk_insert()
      sql/sql_load.cc:
        Added new argument to ha_end_bulk_insert()
      sql/sql_parse.cc:
        Style fixes
        Avoid goto in common senario
      sql/sql_select.cc:
        When running with purify/valgrind avoid copying structures over themself.  This is not a real bug in itself, but it's a waste of cycles and causes valgrind warnings
      sql/sql_select.h:
        Avoid copying structures over themself.  This is not a real bug in itself, but it's a waste of cycles and causes valgrind warnings
      sql/sql_table.cc:
        Call HA_EXTRA_PREPARE_FOR_DROP if table created by ALTER TABLE is going to be dropped
        Added new argument to ha_end_bulk_insert()
      storage/archive/ha_archive.cc:
        Added new argument to end_bulk_insert()
      storage/archive/ha_archive.h:
        Added new argument to end_bulk_insert()
      storage/federated/ha_federated.cc:
        Added new argument to end_bulk_insert()
      storage/federated/ha_federated.h:
        Added new argument to end_bulk_insert()
      storage/maria/Makefile.am:
        Added ma_state.c and ma_state.h
      storage/maria/ha_maria.cc:
        Versioning of count(*) and checksum
        - share->state.state is now assumed to be correct, not handler->state
        - Call _ma_setup_live_state() in external lock to get count(*)/checksum versioning. In case of
          not versioned and not concurrent insertable table, file->s->state.state contains the correct state information
        
        Other things:
        - file->s -> share
        - Added DBUG_ASSERT() for unlikely case
        - Optimized end_bulk_insert() to not write anything if table is going to be deleted (as in failed alter table)
        - Indentation changes in external_lock becasue of removed 'goto' caused a big conflict even if very little was changed
      storage/maria/ha_maria.h:
        New argument to end_bulk_insert()
      storage/maria/ma_blockrec.c:
        Update for versioning of count(*) and checksum
        Keep share->state.state.data_file_length up to date (not info->state->data_file_length)
        Moved _ma_block_xxxx_status() and maria_versioning() functions to ma_state.c
      storage/maria/ma_check.c:
        Update and use share->state.state instead of info->state
        info->s to share
        Update info->state at end of repair
        Call _ma_reset_state() to update share->state_history at end of repair
      storage/maria/ma_checkpoint.c:
        Call _ma_remove_not_visible_states() on checkpoint to clean up not visible state history from tables
      storage/maria/ma_close.c:
        Remember state history for running transaction even if table is closed
      storage/maria/ma_commit.c:
        Ensure we always call trnman_commit_trn() even if other calls fails. If we don't do that, the translog and state structures will not be freed
      storage/maria/ma_delete.c:
        Versioning of count(*) and checksum:
        - Always update info->state->checksum and info->state->records
      storage/maria/ma_delete_all.c:
        Versioning of count(*) and checksum:
        - Ensure that share->state.state is updated, as here is where we store the primary information
      storage/maria/ma_dynrec.c:
        Use lock_key_trees instead of concurrent_insert to check if trees should be locked.
        This allows us to lock trees both for concurrent_insert and for index versioning.
      storage/maria/ma_extra.c:
        Versioning of count(*) and checksum:
        - Use share->state.state instead of info->state
        - share->concurrent_insert -> share->non_transactional_concurrent_insert
        - Don't update share->state.state from info->state if transactional table
        
        Optimization:
        - Don't flush io_cache or bitmap if we are using FLUSH_IGNORE_CHANGED
      storage/maria/ma_info.c:
        Get most state information from current state
      storage/maria/ma_init.c:
        Add hash table and free function to store states for closed tables
        Install hook for transaction commit/rollback to update history state
      storage/maria/ma_key_recover.c:
        Versioning of count(*) and checksum:
        - Use share->state.state instead of info->state
      storage/maria/ma_locking.c:
        Versioning of count(*) and checksum:
        - Call virtual functions (if exists) to restore/update status
        - Move _ma_xxx_status() functions to ma_state.c
        
        info->s -> share
      storage/maria/ma_open.c:
        Versioning of count(*) and checksum:
        - For not transactional tables, set info->state to point to new allocated state structure.
        - Initialize new info->state_start variable that points to state at start of transaction
        - Copy old history states from hash table (maria_stored_states) first time the table is opened
        - Split flag share->concurrent_insert to non_transactional_concurrent_insert & lock_key_tree
        - For now, only enable versioning of tables without keys (to be fixed in soon!)
        - Added new virtual function to restore status in maria_lock_database)
        
        More DBUG
      storage/maria/ma_page.c:
        Versioning of count(*) and checksum:
        - Use share->state.state instead of info->state
        - Modify share->state.state.key_file_length under share->intern_lock
      storage/maria/ma_range.c:
        Versioning of count(*) and checksum:
        - Lock trees based on share->lock_key_trees
        
        info->s -> share
      storage/maria/ma_recovery.c:
        Versioning of count(*) and checksum:
        - Use share->state.state instead of info->state
        - Update state information on close and when reenabling logging
      storage/maria/ma_rkey.c:
        Versioning of count(*) and checksum:
        - Lock trees based on share->lock_key_trees
      storage/maria/ma_rnext.c:
        Versioning of count(*) and checksum:
        - Lock trees based on share->lock_key_trees
      storage/maria/ma_rnext_same.c:
        Versioning of count(*) and checksum:
        - Lock trees based on share->lock_key_trees
        - Only skip rows based on file length if non_transactional_concurrent_insert is set
      storage/maria/ma_rprev.c:
        Versioning of count(*) and checksum:
        - Lock trees based on share->lock_key_trees
      storage/maria/ma_rsame.c:
        Versioning of count(*) and checksum:
        - Lock trees based on share->lock_key_trees
      storage/maria/ma_sort.c:
        Use share->state.state instead of info->state
        Fixed indentation
      storage/maria/ma_static.c:
        Added maria_stored_state
      storage/maria/ma_update.c:
        Versioning of count(*) and checksum:
        - Always update info->state->checksum and info->state->records
        - Remove optimization for index file update as it doesn't work for transactional tables
      storage/maria/ma_write.c:
        Versioning of count(*) and checksum:
        - Always update info->state->checksum and info->state->records
      storage/maria/maria_def.h:
        Move MARIA_STATUS_INFO to ma_state.h
        
        Changes to MARIA_SHARE:
        - Added state_history to store count(*)/checksum states
        - Added in_trans as counter if table is used by running transactions
        - Split concurrent_insert into lock_key_trees and on_transactional_concurrent_insert.
        - Added virtual function lock_restore_status
        
        Changes to MARIA_HA:
        - save_state -> state_save
        - Added state_start to store state at start of transaction
      storage/maria/maria_pack.c:
        Versioning of count(*) and checksum:
        - Use share->state.state instead of info->state
        
        Indentation fixes
      storage/maria/trnman.c:
        Added hook 'trnnam_end_trans_hook' that is called when transaction ends
        Added trn->used_tables that is used to an entry for all tables used by transaction
        More DBUG
        Changed return type of trnman_end_trn() to my_bool
        Added trnman_get_min_trid() to get minimum trid in use.
        Added trnman_exists_active_transactions() to check if there exist a running transaction started between two commit id
      storage/maria/trnman.h:
        Added 'used_tables'
        Moved all pointers into same groups to get better memory alignment
      storage/maria/trnman_public.h:
        Added prototypes for new functions and variables
        Chagned return type of trnman_end_trn() to my_bool
      storage/myisam/ha_myisam.cc:
        Added argument to end_bulk_insert() if operation should be aborted
      storage/myisam/ha_myisam.h:
        Added argument to end_bulk_insert() if operation should be aborted
      storage/maria/ma_state.c:
        Functions to handle state of count(*) and checksum
      storage/maria/ma_state.h:
        Structures and declarations to handle state of count(*) and checksum
      5099033c
  19. 24 Apr, 2008 1 commit
    • unknown's avatar
      WL#3072 - Maria Recovery · c9a82581
      unknown authored
      Recovery of R-tree and fulltext indices.
      Fix for BUG#35551 "Maria: crash in REPAIR TABLE/ENABLE KEYS if using
      repair-with-keycache method".
      Fix for bug (see ma_rt_index.c) where we could have a wrong
      page_link pointer causing wrong memory access during some R-tree
      index insert/delete.
      Making ma_rt_test work again (it had been neglected over time) and
      adding options (record type etc) to prepare it for integration into
      ma_test_all-t (but there is BUG#36321 about "ma_rt_test -M" crash)
      
      
      mysql-test/r/maria.result:
        correct result
      mysql-test/t/maria.test:
        now we get no error
      storage/maria/ma_blockrec.c:
        delete_dir_entry() and delete_head_or_tail() don't use info->keyread_buff.
        ma_get_length() does not change **packet, marking it with 'const' to
        remove some casts in callers of this function. The
        (const uchar**)&header casts will be removed when Monty changes 'header'
        to const uchar*.
        _ma_apply_redo_purge_row_head_or_tail() sets 'buff' from pagecache_read()
        so its initialization was superfluous.
      storage/maria/ma_check.c:
        Fix for BUG#35551 "Maria: crash in REPAIR TABLE/ENABLE KEYS if using repair-with-keycache method"
        (see comment in code)
      storage/maria/ma_create.c:
        FULLTEXT and SPATIAL indices have logging now, they are recoverable.
      storage/maria/ma_delete.c:
        Logging done by _ma_ck_delete() is moved to a function
        (_ma_write_undo_key_delete()), for reusal by R-tree logging.
        _ma_log_delete() is made non-static for same
        reason, and some of its parameters are made pointers to const.
        Removed wrong comment ("Note that for delete key" etc, contradicted by
        code and comment "Log also position to row" a few lines above)
      storage/maria/ma_ft_update.c:
        unneeded cast, comment for future
      storage/maria/ma_key_recover.c:
        Comment about possible deadlock.
        Write bad page to DBUG trace if KEY_OP_CHECK founds bad CRC.
        Support operation KEY_OP_MULTI_COPY.
        When we execute, in UNDO phase, UNDO_KEY_DELETE|INSERT, we must call
        the proper key insertion|deletion depending on if this is R-tree
        or B-tree.
        Explanation of of _ma_[un]lock_key_del() work, maybe useful for
        mortals like me.
      storage/maria/ma_key_recover.h:
        change of prototypes
      storage/maria/ma_loghandler.h:
        New operation which can be stored in REDO_INDEX log records: KEY_OP_MULTI_COPY
      storage/maria/ma_page.c:
        Comments
      storage/maria/ma_pagecache.c:
        typo
      storage/maria/ma_rt_index.c:
        Fix for bug: the page_link pointer in maria_rtree_insert_req()
        could be wrong when we set its 'changed' member; for the solution
        see ma_key_recover.h. It is needed only in cases when we manipulate
        several pages.
        Logging of changes done to pages by key insert/delete.
        maria_rtree_delete()'s main work is moved to a new function
        maria_rtree_real_delete(), which is used by maria_rtree_delete()
        and by applying of UNDO_KEY_INSERT.
      storage/maria/ma_rt_index.h:
        new prototypes and macros for ma_rt_index.c
      storage/maria/ma_rt_key.c:
        Logging of maria_rtree_add_key() and maria_rtree_delete_key().
        When inserting, split is necessary if there is not enough room for key:
        take checksum's occupied space in this calculation.
      storage/maria/ma_rt_key.h:
        new prototypes (those functions need to know the page's id
        because they do logging)
      storage/maria/ma_rt_mbr.c:
        Comments about what the functions change.
      storage/maria/ma_rt_split.c:
        maria_rtree_split_page() needs to know the page's id, because
        it does logging.
        Logging of what a split operation does to the split page (see
        comment of _ma_log_rt_split(): moves of keys inside the page,
        sometimes insertion of the new key, and shrinking of the page)
        and to the new page (receives some keys from split page, and
        sometimes the new key).
      storage/maria/ma_rt_test.c:
        ma_rt_test had been forgotten when maria_rkey() was changed some months ago
        (0->HA_WHOLE_KEY change), and when calls to maria_rnd(,,HA_OFFSET_ERROR)
        were rewritten to maria_scan() calls (which implies maria_scan_init()).
        The 'max_i' change is to adapt to the fact that maria_scan() does
        not return deleted records for BLOCK_RECORD but does so for other formats;
        the initial code assumed a certain number of deleted records would be
        returned, we change it to rather count only non-deleted ones.
        We also add more features to this test, like ma_test1 (the plan
        is to run ma_rt_test in ma_test_all-t):
        options to choose records' format, table checksum, transactions,
        checkpoints, end at specific stages, abort without committing,
        and debug trace.
      storage/maria/ma_test1.c:
        MY_INIT() does my_init().
      storage/maria/ma_write.c:
        Logging done by _ma_ck_write_btree_with_log() is moved to a function
        (_ma_write_undo_key_insert()), for reusal by R-tree logging.
        _ma_log_new() and _ma_log_change() are made non-static for same
        reason. Some parameters of logging functions are made pointers to const.
        If EXTRA_DEBUG_KEY_CHANGES, we now log CRC in _ma_log_change() too
        (better checks, bigger record).
      storage/maria/maria_read_log.c:
        Program takes no arguments, bail out if any, instead of silently discarding them
      storage/myisam/rt_test.c:
        rt_test had been forgotten when mi_rkey() was changed some months ago
        (0->HA_WHOLE_KEY change).
        The 'max_i' change is to make it symmetric with ma_rt_test.c
      mysql-test/r/maria-gis-rtree-dynamic.result:
        correct result
      mysql-test/r/maria-gis-rtree-trans.result:
        correct result
      mysql-test/r/maria-recovery-rtree-ft.result:
        almost correct result (hitting BUG# in the end)
      mysql-test/t/maria-gis-rtree-dynamic.test:
        test R-tree & dynamic row format
      mysql-test/t/maria-gis-rtree-trans.test:
        Test R-tree and page row format and transactional
      mysql-test/t/maria-recovery-rtree-ft-master.opt:
        usual options for recovery testing
      mysql-test/t/maria-recovery-rtree-ft.test:
        test of recovery of R-tree and fulltext indices.
      c9a82581
  20. 10 Apr, 2008 1 commit
    • unknown's avatar
      Added versioning of row data · 126c1228
      unknown authored
      Will in future changeset (soon) av versioning of status variables (number of rows) and index
      Changed some LEX_STRING to LEX_CUSTRING to avoid casts and warnings
      Removed some not needed variables (as noticed by Guilhem)
      
      
      include/maria.h:
        Added prototypes for maria_chk_init_for_check(), maria_versioning() and maria_ignore_trids()
      include/my_base.h:
        Add new error HA_ERR_ROW_NOT_VISIBLE
      include/myisamchk.h:
        Added variables for checking visibility of rows during maria_chk
      include/thr_lock.h:
        Changed argument type from int to my_bool for get_status
        Added variable allow_multiple_concurrent_insert, to signal if table supports multiple concurrent inserts
      mysql-test/r/maria-page-checksum.result:
        Added missing drop table
      mysql-test/t/maria-page-checksum.test:
        Added missing drop table
      mysys/my_handler.c:
        Added new error messages
      mysys/thr_lock.c:
        Added support for multiple concurrent inserts, if table handler supports it
      sql/sql_yacc.yy:
        Added LOCK TABLE table_name WRITE CONCURRENT
        This was added (temporarly?) to be able to check versioning with Maria
      storage/csv/ha_tina.cc:
        Updated parameter for get_status
      storage/maria/ha_maria.cc:
        Added calls to maria_chk_init_status()
        Fixed call to ma_control_file_open()
      storage/maria/ma_blockrec.c:
        Changed some LEX_STRING to LEX_CUSTRING to avoid casts and warnings
        Changed back some 'header' parameters to const char*
        Removed some casts
        
        Added support for versioning:
        - If info->row_flag & ROW_FLAG_TRANSID is set, store transaction id together with the row
        - When reading rows, check if rows are visible. Give error if not
        - When scanning table, ignore not visible rows
        - Added function parameters to some functions, to be able to call _ma_compact_block_page() with different parameters depending of if the page is a HEAD or TAIL page
        - _ma_compact_block_page() deletes transaction id's that are visible by all running transactions
        - Added functions for thr_lock() to enable multiple concurrent inserts
        - Added helper function 'mysql_versioning()' to enable/disable versioning
        - Added helper function maria_ignore_trids(), used by maria_chk and maria_pack to see all rows.
      storage/maria/ma_blockrec.h:
        Updated parameters for some functions.
        Added new functions to read/store state with thr_lock
      storage/maria/ma_check.c:
        Enable handling of transaction id's in rows
        Give a readable error if a table contains a transation id that makes rows not visible
      storage/maria/ma_control_file.c:
        Added option to not give warning if control file doesn't exists.
      storage/maria/ma_control_file.h:
        Updated parameter lists for ma_control_file_open()
      storage/maria/ma_delete.c:
        Removed not used variable (suggestion by Guilhem)
      storage/maria/ma_locking.c:
        Changed type of argument from int -> my_bool
      storage/maria/ma_open.c:
        Removed not used variables 'key_write_undo_lsn' and 'key_delete_undo_lsn'
        Added new thr_lock interface functions for BLOCK_RECORD to enable multiple concurrent insert
      storage/maria/ma_test1.c:
        Added option --versioning (-C) to check versioning
      storage/maria/ma_test2.c:
        Added option -C to check versioning
      storage/maria/ma_test_recovery:
        Forward argumetns to ma_test_recovery.pl
      storage/maria/ma_write.c:
        Removed not used variable key_write_undo_lsn
      storage/maria/maria_chk.c:
        Always read control file (if exist) at start
        Initialize checking of tables by calling maria_chk_init_for_check()
        In verbose mode and in case of error, print max found transaction id
      storage/maria/maria_def.h:
        Added Trid to MARIA_ROW to be able to check transaction id for found row
        Moved 'base_length' from MARIA_ROW to MARIA_HA to be able to handle different base length (with and without TRANSID) without if's
        Added default row_flag to MARIA_HA for the same reason
        Changed LEX_STRING -> LEX_CUSTRING to avoid casts in ma_blockrec.c
        Removed not needed variables key_write_undo_lsn and key_delete_undo_lsn
        Added prototypes for new functions and fixed those that had changed
      storage/maria/maria_pack.c:
        Ensure we can read all rows from the file, independent of the used transaction id
      storage/maria/maria_read_log.c:
        Updated arguments to ma_control_file_open()
      storage/maria/trnman.c:
        If we have only one transaction, fixed that min_read_from contains current transaction
        Fixed that trnman_can_read_from() returns that row is readable if it was written by current transaction
      storage/maria/unittest/ma_control_file-t.c:
        Updated arguments to ma_control_file_open()
      storage/maria/unittest/ma_test_all-t:
        Added test of versioning
        Removed printing of one extra space
      storage/maria/unittest/ma_test_loghandler-t.c:
        Updated arguments to ma_control_file_open()
      storage/maria/unittest/ma_test_loghandler_first_lsn-t.c:
        Updated arguments to ma_control_file_open()
      storage/maria/unittest/ma_test_loghandler_max_lsn-t.c:
        Updated arguments to ma_control_file_open()
      storage/maria/unittest/ma_test_loghandler_multigroup-t.c:
        Updated arguments to ma_control_file_open()
      storage/maria/unittest/ma_test_loghandler_multithread-t.c:
        Updated arguments to ma_control_file_open()
      storage/maria/unittest/ma_test_loghandler_noflush-t.c:
        Updated arguments to ma_control_file_open()
      storage/maria/unittest/ma_test_loghandler_nologs-t.c:
        Updated arguments to ma_control_file_open()
      storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
        Updated arguments to ma_control_file_open()
      storage/maria/unittest/ma_test_loghandler_purge-t.c:
        Updated arguments to ma_control_file_open()
      storage/maria/unittest/ma_test_recovery.expected:
        Updated file with result from new tests
      storage/maria/unittest/ma_test_recovery.pl:
        Added options --abort-on-error and --verbose
        In case of --verbose, print all excuted shell commands
        Added test of versioning
      storage/myisam/mi_locking.c:
        Updated type of parameter
      storage/myisam/myisamdef.h:
        Updated type of parameter
      mysql-test/r/maria-mvcc.result:
        New BitKeeper file ``mysql-test/r/maria-mvcc.result''
      mysql-test/t/maria-mvcc.test:
        New BitKeeper file ``mysql-test/t/maria-mvcc.test''
      126c1228
  21. 04 Apr, 2008 1 commit
    • unknown's avatar
      Store maximum transaction id into control file at clean shutdown. · 722a8ebe
      unknown authored
      This can serve to maria_chk to check that trids found in rows and keys
      are not too big. Also used by Recovery when logs are lost.
      Options --require-control-file, --datadir, --log-dir (yes, the dashes are
      inconsistent but I imitated mysqld --datadir and --maria-log-dir) for
      maria_chk.
      Lock control file _before_ reading its content.
      
      
      storage/maria/ha_maria.cc:
        new prototype
      storage/maria/ma_check.c:
        A function to find the max trid in the system (consults transaction
        manager and control file), to check tables.
      storage/maria/ma_checkpoint.c:
        new prototype
      storage/maria/ma_control_file.c:
        Store max trid into control file, in a backward-compatible way
        (can still read old control files).
        Parameter to ma_control_file_open(), to not create the log if it's
        missing (maria_chk needs that).
        Lock control file _before_ reading its content.
        Fix for a segfault when reading an old control file (bzero() with a
        negative second argument)
      storage/maria/ma_control_file.h:
        changes to the control file module's API
      storage/maria/ma_init.c:
        When Maria shuts down cleanly, store max trid into control file.
      storage/maria/ma_loghandler.c:
        new prototype
      storage/maria/ma_recovery.c:
        During recovery, consult max trid stored in control file, in case it is
        bigger than what we found in log (case of logs manually removed by user).
      storage/maria/ma_test1.c:
        new prototype
      storage/maria/ma_test2.c:
        new prototype
      storage/maria/maria_chk.c:
        New option --require-control-file (abort if control file not found),
        --datadir (path for control file (and for logs if --log-dir not specified)),
        --log-dir (path for logs).
        Try to open control file when maria_chk starts.
      storage/maria/maria_read_log.c:
        new prototype
      storage/maria/trnman.c:
        A new function to know max trid in transaction manager
      storage/maria/trnman_public.h:
        New function
      storage/maria/unittest/ma_control_file-t.c:
        new prototypes. Testing storing and retrieving the max trid to/from
        control file
      storage/maria/unittest/ma_test_loghandler-t.c:
        new prototype
      storage/maria/unittest/ma_test_loghandler_first_lsn-t.c:
        new prototype
      storage/maria/unittest/ma_test_loghandler_max_lsn-t.c:
        new prototype
      storage/maria/unittest/ma_test_loghandler_multigroup-t.c:
        new prototype
      storage/maria/unittest/ma_test_loghandler_multithread-t.c:
        new prototype
      storage/maria/unittest/ma_test_loghandler_noflush-t.c:
        new prototype
      storage/maria/unittest/ma_test_loghandler_nologs-t.c:
        new prototype
      storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
        new prototype
      storage/maria/unittest/ma_test_loghandler_purge-t.c:
        new prototype
      722a8ebe
  22. 03 Apr, 2008 1 commit
    • unknown's avatar
      Injecting more "const" declarations into code which does not change · f094eff1
      unknown authored
      pointed data.
      I ran gcc -Wcast-qual on storage/maria, this identified un-needed casts,
      a couple of functions which said they had a const parameter though
      they changed the pointed content! This is fixed here. Some suspicious
      places receive a comment.
      The original intention of running -Wcast-qual was to find what code
      changes R-tree keys: I added const words, but hidden casts
      like those of int2store (casts target to (uint16*)) removed const
      checking; -Wcast-qual helped find those hidden casts.
      Log handler does not change the content pointed by LEX_STRING::str it
      receives, so we now use a struct which has a const inside, to emphasize
      this and be able to pass "const uchar*" buffers to log handler
      without fear of their content being changed by it.
      One-line fix for a merge glitch (when merging from MyISAM).
      
      
      include/m_string.h:
        As Maria's log handler uses LEX_STRING but never changes the content
        pointed by LEX_STRING::str, and assigns uchar* into this member most
        of the time, we introduce a new struct LEX_CUSTRING
        (C const U unsigned) for the log handler.
      include/my_global.h:
        In macros which read pointed content: use const pointers so that
        gcc -Wcast-qual does not warn about casting a const pointer to non-const.
      include/my_handler.h:
        In macros which read pointed content: use const pointers so that
        gcc -Wcast-qual does not warn about casting a const pointer to non-const.
        ha_find_null() does not change *a.
      include/my_sys.h:
        insert_dynamic() does not change *element.
      include/myisampack.h:
        In macros which read pointed content: use const pointers so that
        gcc -Wcast-qual does not warn about casting a const pointer to non-const.
      mysys/array.c:
        insert_dynamic() does not change *element
      mysys/my_handler.c:
        ha_find_null() does not change *a
      storage/maria/ma_bitmap.c:
        Log handler receives const strings now
      storage/maria/ma_blockrec.c:
        Log handler receives const strings now.
        _ma_apply_undo_row_delete/update() do change *header.
      storage/maria/ma_blockrec.h:
        correct prototype
      storage/maria/ma_check.c:
        Log handler receives const strings now. Un-needed casts
      storage/maria/ma_checkpoint.c:
        Log handler receives const strings now
      storage/maria/ma_checksum.c:
        unneeded cast
      storage/maria/ma_commit.c:
        Log handler receives const strings now
      storage/maria/ma_create.c:
        Log handler receives const strings now
      storage/maria/ma_dbug.c:
        fixing warning of gcc -Wcast-qual
      storage/maria/ma_delete.c:
        Log handler receives const strings now
      storage/maria/ma_delete_all.c:
        Log handler receives const strings now
      storage/maria/ma_delete_table.c:
        Log handler receives const strings now
      storage/maria/ma_dynrec.c:
        fixing some warnings of gcc -Wcast-qual. Unneeded casts removed.
        Comment about function which lies.
      storage/maria/ma_ft_parser.c:
        fix for warnings of gcc -Wcast-qual, removing unneeded casts
      storage/maria/ma_ft_update.c:
        less casts, comment
      storage/maria/ma_key.c:
        less casts, stay const (warnings of gcc -Wcast-qual)
      storage/maria/ma_key_recover.c:
        Log handler receives const strings now
      storage/maria/ma_loghandler.c:
        Log handler receives const strings now
      storage/maria/ma_loghandler.h:
        Log handler receives const strings now
      storage/maria/ma_loghandler_lsn.h:
        In macros which read pointed content: use const pointers so that
        gcc -Wcast-qual does not warn about casting a const pointer to non-const.
      storage/maria/ma_page.c:
        Log handler receives const strings now; more const
      storage/maria/ma_recovery.c:
        Log handler receives const strings now
      storage/maria/ma_rename.c:
        Log handler receives const strings now
      storage/maria/ma_rt_index.c:
        more const, to emphasize that functions don't change pointed content.
        best_key= NULL was forgotten during merge from MyISAM a few days ago,
        was causing a Valgrind warning
      storage/maria/ma_rt_index.h:
        new proto
      storage/maria/ma_rt_key.c:
        more const
      storage/maria/ma_rt_key.h:
        new proto
      storage/maria/ma_rt_mbr.c:
        more const for functions which deserve it
      storage/maria/ma_rt_mbr.h:
        new prototype
      storage/maria/ma_rt_split.c:
        make const what is not changed.
      storage/maria/ma_search.c:
        un-needed casts, more const
      storage/maria/ma_sp_key.c:
        more const
      storage/maria/ma_unique.c:
        un-needed casts.
      storage/maria/ma_write.c:
        Log handler receives const strings now
      storage/maria/maria_def.h:
        some more const
      storage/maria/unittest/ma_test_loghandler-t.c:
        Log handler receives const strings now
      storage/maria/unittest/ma_test_loghandler_first_lsn-t.c:
        Log handler receives const strings now
      storage/maria/unittest/ma_test_loghandler_max_lsn-t.c:
        Log handler receives const strings now
      storage/maria/unittest/ma_test_loghandler_multigroup-t.c:
        Log handler receives const strings now
      storage/maria/unittest/ma_test_loghandler_multithread-t.c:
        Log handler receives const strings now
      storage/maria/unittest/ma_test_loghandler_noflush-t.c:
        Log handler receives const strings now
      storage/maria/unittest/ma_test_loghandler_nologs-t.c:
        Log handler receives const strings now
      storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
        Log handler receives const strings now
      storage/maria/unittest/ma_test_loghandler_purge-t.c:
        Log handler receives const strings now
      f094eff1
  23. 01 Apr, 2008 1 commit
    • unknown's avatar
      Merge of changes in MyISAM since December 16 -> April 1 · 3651e328
      unknown authored
      Fixes bugs:
      Bug#28837  MyISAM storage engine error (134) doing delete with self-join
      Bug#31277  myisamchk --unpack corrupts table
      Bug#4692   DISABLE/ENABLE KEYS waste a space
      Bug#31305  myisam tables crash when they are near capacity
      
      
      BitKeeper/etc/ignore:
        added unittest/tmp/*
      mysql-test/r/maria.result:
        Moved missing tests from myisam.test to maria.test
      mysql-test/t/maria.test:
        Moved missing tests from myisam.test to maria.test
      storage/maria/ha_maria.cc:
        Merge of changes in MyISAM since December 16 -> April 1
        Fixes bug in self join (Bug#28837: MyISAM storage engine error (134) doing delete with self-join)
      storage/maria/ha_maria.h:
        Merge of changes in MyISAM since December 16 -> April 1
      storage/maria/ma_blockrec.c:
        Merge of changes in MyISAM since December 16 -> April 1
        Fixes bug in self join (Bug#28837: MyISAM storage engine error (134) doing delete with self-join)
        The problem is that we may be using a cached key page with old information. Versioning will fix this
      storage/maria/ma_check.c:
        Merge of changes in MyISAM since December 16 -> April 1
        This fixes a problem with pack_reclength not beeing big enough (Bug #31277 myisamchk --unpack corrupts table)
        BUG#4692 - DISABLE/ENABLE KEYS waste a space
      storage/maria/ma_delete.c:
        Indentation fixes
      storage/maria/ma_dynrec.c:
        Merge of changes in MyISAM since December 16 -> April 1
        Fixes Bug#31305 myisam tables crash when they are near capacity.
        (This uses a simpler fix than in MyISAM by remembering the length of the current row)
      storage/maria/ma_ft_boolean_search.c:
        Merge of all changes from myisam/ft_boolean_search.c (This file had not been kept up to date)
      storage/maria/ma_open.c:
        Merge of changes in MyISAM since December 16 -> April 1
        Calculate default_rec_buff_size more exact to be sure it's always big enough
      storage/maria/ma_packrec.c:
        Merge of changes in MyISAM since December 16 -> April 1
        Update default_rec_buff_size to be big enough to hold one packed row
        Related to Bug#31277 myisamchk --unpack corrupts table
      storage/maria/ma_rnext_same.c:
        Indentation fixes
      storage/maria/ma_rt_index.c:
        Merge of changes in MyISAM since December 16 -> April 1
      storage/maria/ma_rt_mbr.c:
        Merge of changes in MyISAM since December 16 -> April 1
        (Added comment)
      storage/maria/ma_search.c:
        Merge of changes in MyISAM since December 16 -> April 1
        (Added comment)
      storage/maria/ma_sort.c:
        Merge of changes in MyISAM since December 16 -> April 1
      storage/maria/ma_statrec.c:
        Indentation fixes
      storage/maria/ma_test2.c:
        Indentation fixes
      storage/maria/maria_chk.c:
        Indentation fixes
      storage/maria/maria_pack.c:
        Merge of changes in MyISAM since December 16 -> April 1
      3651e328
  24. 08 Mar, 2008 1 commit
    • unknown's avatar
      Fix for #Bug35048 "maria table corruption reported when transactional=0 · 42455c48
      unknown authored
      Problem was that page in bitmap was marked as full even if there was free places in page directory
      
      
      mysql-test/r/maria.result:
        Test case for problem with head/tail page with 255 entries
        (Bug 35048 "maria table corruption reported when transactional=0)
      mysql-test/t/maria.test:
        Test case for problem with head/tail page with 255 entries
        (Bug 35048 "maria table corruption reported when transactional=0)
      storage/maria/ma_blockrec.c:
        Fix to ensure that bitmap is marked 'full' when the head/tail page directory is full
      storage/maria/ma_check.c:
        Better check when directory for head/tail pages are marked full (The page directory can't hold a row tail + blob tails)
      42455c48
  25. 26 Feb, 2008 1 commit
    • unknown's avatar
      WL#3072 Maria Recovery · b01c9528
      unknown authored
      fixes for ma_test_recovery.pl to work in release builds too:
      - bugfix in maria_zerofill_index()
      - applying of LOGREC_INSERT_ROW_BLOBS now zeroes unused end of non-full
      blob page (a mutation of tail page when it takes >75% of maria_block_size)
      like write_full_pages() does.
      
      
      storage/maria/ma_blockrec.c:
        When we write a non-full blob page at run-time, we zero the rest of
        it (see write_full_pages()). We now do the same in
        _ma_apply_redo_insert_row_blobs(): this is consistent and helps
        having log-applying produce the same page as run-time.
      storage/maria/ma_check.c:
        maria_zerofill_index() was wrong: it didn't zero certain bytes
        because it believed that the count of relevant bytes is
        _ma_get_page_used(share, buff) + share->keypage_header,
        whereas it's only the first term.
      storage/maria/ma_pagecache.c:
        typo
      storage/maria/ma_pagecache.h:
        typo
      storage/maria/maria_chk.c:
        enable --zerofill-keep-lsn in all builds
      storage/maria/unittest/ma_test_recovery.pl:
        now even release builds can run ma_test_recovery.pl, because zerofill
        makes tables of this test (made by run-time and by log-applying)
        identical.
      b01c9528
  26. 18 Feb, 2008 1 commit
    • unknown's avatar
      Merge from 5.1-build of the "my_bool for C" changeset. · 0ab7c2f3
      unknown authored
      Removing "#define bool BOOL" as it's dangerous.
      
      
      include/config-win.h:
        This #define was confusing: a) it changes the semantics of bool but
        only on Windows (C++ standard says that casting int to bool to int
        yields 0 or 1, but if using BOOL (which is int) this breaks, see
        old BUG 11567 "Variable 'foreign_key_checks', and other variables,
        differs binlog tests") b) it is not needed in C++ which has a bool type
        c) it is not needed in C where we must use my_bool as bool either does
        not exist or changes size between C and C++.
      storage/maria/ma_check.c:
        my_bool for C
      storage/maria/ma_dynrec.c:
        my_bool for C
      storage/maria/ma_search.c:
        my_bool for C
      storage/maria/ma_write.c:
        my_bool for C
      storage/maria/maria_def.h:
        my_bool for C
      storage/maria/maria_pack.c:
        my_bool for C
      0ab7c2f3
  27. 11 Feb, 2008 1 commit
    • unknown's avatar
      A new option for maria_chk: --zerofill-keep-lsn. This will be used · d2a3bf33
      unknown authored
      by ma_test_recovery.pl when it happens that Recovery does not recreate
      pages exactly as they were at first run: this option will help us
      verify that the differences are in unimportant page pieces (those pieces
      will be zeroed by --zerofill-keep-lsn, but not the important LSNs).
      
      
      include/myisamchk.h:
        new zerofill flag for maria_chk
      storage/maria/ma_check.c:
        If T_ZEROFILL_KEEP_LSN, we don't zero out LSNs of data/index pages.
        Then the table is not movable. We still mark it zerofilled, it helps
        to know what was last done to the table.
      storage/maria/maria_chk.c:
        New option --zerofill-keep-lsn
      d2a3bf33
  28. 07 Feb, 2008 1 commit
    • unknown's avatar
      Mac compiler warnings fixed. · 311d8e89
      unknown authored
      include/maria.h:
        mac compiler warnings fixed.
      storage/maria/ma_bitmap.c:
        mac compiler warnings fixed.
      storage/maria/ma_blockrec.c:
        mac compiler warnings fixed.
      storage/maria/ma_check.c:
        mac compiler warnings fixed.
      storage/maria/ma_control_file.c:
        mac compiler warnings fixed.
      storage/maria/ma_create.c:
        mac compiler warnings fixed.
      storage/maria/ma_delete.c:
        mac compiler warnings fixed.
      storage/maria/ma_ft_boolean_search.c:
        mac compiler warnings fixed.
      storage/maria/ma_page.c:
        mac compiler warnings fixed.
      storage/maria/ma_pagecache.c:
        mac compiler warnings fixed.
      storage/maria/ma_recovery.c:
        mac compiler warning fixed.
      storage/maria/ma_rt_test.c:
        mac compiler warnings fixed.
      storage/maria/ma_search.c:
        mac compiler warning fixed.
      storage/maria/ma_write.c:
        mac compiler warnings fixed.
      storage/maria/unittest/ma_control_file-t.c:
        mac compiler warnings fixed.
      storage/maria/unittest/ma_pagecache_consist.c:
        mac compiler warnings fixed.
      storage/maria/unittest/ma_pagecache_single.c:
        mac compiler warnings fixed.
      storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
        mac compiler warning fixed.
      storage/maria/unittest/test_file.c:
        mac compiler warning fixed.
      311d8e89
  29. 06 Feb, 2008 1 commit
    • unknown's avatar
      Fixes for running maria-recovery*.test and maria-purge.test under · 7300af84
      unknown authored
      Windows.
      
      
      include/my_dbug.h:
        a DBUG expression to force a flush of the trace file then an abort of the process
      mysql-test/include/wait_until_connected_again.inc:
        mysqladmin waits for pid file to be gone only under Unix; so
        maria_empty_logs.inc cannot wait for mysqld to be gone, so
        wait_until_connected_again.inc may send its "show status" to a 
        not-yet-dead server hence the 1053 error ("server shutdown in progress")
      mysys/my_thr_init.c:
        overload abort() under Windows, to not have an annoying CRT popup
        ("ignore/abort/retry" buttons) each time a test intentionally
        crashes mysqld
      sql/handler.cc:
        use new expression
      sql/log.cc:
        use new expression
      sql/mysql_priv.h:
        use new expression
      storage/maria/ha_maria.cc:
        use new expression
      storage/maria/ma_blockrec.c:
        use new expression
      storage/maria/ma_check.c:
        use new expression
      storage/maria/ma_checkpoint.c:
        use new expression
      storage/maria/ma_control_file.c:
        Can't yet lock control file under Windows (test suite problems,
        plus concerns about stray lock preventing a fast restart after crash).
      storage/maria/ma_loghandler.c:
        A file which should be closed, otherwise translog_purge() (the caller)
        cannot delete logs.
      7300af84
  30. 31 Jan, 2008 1 commit
    • unknown's avatar
      Fixed bug in restoring auto-increment value in case of duplicate key with insert or update · ab0fa111
      unknown authored
      Fixed bug when calculating max_key_length that caused some ALTER TABLE to fail if MAX_ROWS was used.
      Use maria_block_size instead of MARIA_MIN_KEY_BLOCK_LENGTH
      Fixed bug when scanning table with BLOCK format for repair; If table was > bitmap coverage one page block was read twice which caused a lot of duplicate key errors
      Could not repeat Bug#34106 "auto_increment is reset to 1 when table is recovered from crash" after this patch.
      
      NOTE: This is an incompatible change, so one must do maria_chk -r on ones old Maria tables!
      Sorry, but this was needed to fix the bug with max_key_length and to be able to handle bigger key files with smaller key references
      
      
      cmd-line-utils/readline/readline.c:
        Fixed compiler warnings
      mysql-test/r/maria.result:
        Added more test of auto-increment handling
      mysql-test/t/maria.test:
        Added more test of auto-increment handling
      mysys/my_pread.c:
        Fixed wrong test
        Removed not needed tests (error is always 1 if readbytes != Count)
      mysys/my_read.c:
        Fixed wrong test
      storage/maria/ha_maria.cc:
        Disable LOAD INDEX until I got Sanja's extension to pagecache interface
      storage/maria/ma_blockrec.c:
        Ensure that info->last_auto_increment is reset properly
      storage/maria/ma_check.c:
        Fixed wrong printing of row number in case of duplicate key for --safe-repair
        Safety fix in recreate table so that Column numbers are given to maria_create() in original order
        Added missing HA_OPEN_FOR_REPAIR to maria_open()
        Fixed bug when scanning table with BLOCK format for repair; If table was > bitmap coverage one page block was read twice which caused a lot of duplicate key errors
      storage/maria/ma_create.c:
        Use correct value for how much free space there is on a key page
        Remember some missing table option when doing re-create.
        Removed optimization where last packed fields is unpacked; Caused problems for re-create.
      storage/maria/ma_delete.c:
        Ensure that info->last_auto_increment is reset properly
        Fix for update to restore autoincrement value on duplicate key
      storage/maria/ma_key_recover.c:
        Moved handling of restoring value of auto-increment in case of duplicate key from clr to undo
        This ensures the restoring works both for insert and update and also that this is symetrical to how the auto_increment value is stored
      storage/maria/ma_key_recover.h:
        Added new prototype
      storage/maria/ma_loghandler.c:
        Added hook to write_hook_for_undo_key_delete()
      storage/maria/ma_open.c:
        Fixed wrong calculation of max_key_file_length
      storage/maria/ma_page.c:
        Use maria_block_size instead of MARIA_MIN_KEY_BLOCK_LENGTH
        Increase internal buffer (safety fix)
      storage/maria/ma_search.c:
        Use maria_block_size instead of MARIA_MIN_KEY_BLOCK_LENGTH
        Note that this is an incompatible change, so one must do maria_chk -r on ones old Maria tables (sorry)
      storage/maria/ma_update.c:
        Ensure that info->last_auto_increment is reset properly
      storage/maria/ma_write.c:
        Ensure that info->last_auto_increment is reset properly
        Fix for update to restore autoincrement value on duplicate key
      storage/maria/maria_chk.c:
        Allow small page_buffer_size
        Fixed printing for --describe to better fit into 80 characters
      storage/maria/maria_def.h:
        Added comments
      ab0fa111
  31. 29 Jan, 2008 1 commit
    • unknown's avatar
      Fix for BUG#34114 "maria_chk reports false error when several tables on · 2fcff898
      unknown authored
      command-line" and BUG#34062 "Maria table corruption on master".
      Use 5 bytes (instead of 4) to store page's number in the checkpoint
      record, to allow bigger table (1PB with maria-block-size=1kB).
      Help pushbuild not run out of memory by moving the portion of
      maria-recovery.test which generates lots of data into a -big.test.
      
      
      mysql-test/r/maria-recovery.result:
        result moved
      mysql-test/t/maria-recovery.test:
        piece which generates much data moved to maria-recovery-big.test
      mysys/my_pread.c:
        To fix BUG#34062, where a 1.1TB file was generated due to a wrong
        pwrite offset, it was useful to not lose precision on 'offset' in
        DBUG_PRINT, so that the crazy value is visible.
      mysys/my_read.c:
        To fix BUG#34062, where a 1.1TB file was generated due to a wrong
        pwrite offset, it was useful to not lose precision on 'offset' in
        DBUG_PRINT, so that the crazy value is visible.
      mysys/my_write.c:
        To fix BUG#34062, where a 1.1TB file was generated due to a wrong
        pwrite offset, it was useful to not lose precision on 'offset' in
        DBUG_PRINT, so that the crazy value is visible.
      storage/maria/ha_maria.cc:
        When starting a bulk insert, we throw away dirty index pages from the
        cache. Unique (non disabled) key insertions thus read out-of-date
        pages from the disk leading to BUG#34062 "Maria table corruption on
        master": a DELETE in procedure viewer_sp() had deleted all rows of
        viewer_tbl2 one by one, putting index page 1 into key_del; that page
        was thrown away at start of INSERT SELECT, then the INSERT SELECT
        needed a page to insert keys, looked at key_del, found 1, read page 1
        from disk, and its out-of-date content was used to set the new value of
        key_del (crazy value of 1TB), then a later insertion needed another
        index page, tried to read page at this crazy offset and failed, leading
        to corruption mark.
        The fix is to destroy out-of-date pages and make the state consistent
        with that, i.e. call maria_delete_all_rows().
      storage/maria/ma_blockrec.c:
        Special hook for UNDO_BULK_INSERT
      storage/maria/ma_blockrec.h:
        special hook for UNDO_BULK_INSERT
      storage/maria/ma_check.c:
        Fix for BUG#34114 "maria_chk reports false error when several tables on
        command-line": if the Nth (on the command line) table was BLOCK_RECORD
        it would start checks by using the param->record_checksum computed by
        checks of table N-1.
      storage/maria/ma_delete_all.c:
        comment
      storage/maria/ma_loghandler.c:
        special hook for UNDO_BULK_INSERT
      storage/maria/ma_page.c:
        comment
      storage/maria/ma_pagecache.c:
        page number is 5 bytes in checkpoint record now (allows bigger tables)
      storage/maria/ma_recovery.c:
        page number is 5 bytes in checkpoint record now
      storage/maria/ma_recovery_util.c:
        page number is 5 bytes now
      storage/maria/ma_write.c:
        typo
      mysql-test/r/maria-recovery-big.result:
        result is correct
      mysql-test/t/maria-recovery-big-master.opt:
        usual options for recovery tests
      mysql-test/t/maria-recovery-big.test:
        Moving out the big blob test to a -big test (it exhausts memory when
        using /dev/shm on certain machines)
      2fcff898
  32. 23 Jan, 2008 1 commit
    • unknown's avatar
      Fixed bug when using maria_chk --safe-recover with packed tables · b40a6348
      unknown authored
      Fixed bug when using maria_chk --safe-recover and getting duplicated keys
      Fixed bug when using maria_pack --join
      
      
      storage/maria/ma_check.c:
        Fixed bug when using --safe-recover with packed tables
        Fixed bug when using --safe-recover and getting duplicated keys
      storage/maria/maria_pack.c:
        Fixed bug when using --join
      storage/maria/unittest/ma_test_all-t:
        Added test to check maria_pack --join
      b40a6348
  33. 20 Jan, 2008 1 commit
    • unknown's avatar
      - fix for segfault in rpl_trigger/rpl_found_rows with default engine=maria · 0825c485
      unknown authored
      (fix is keeping the real TRN through a disable_logging/reenable cycle)
      - fix for pagecache assertion failure in ps/type_ranges with default
      engine=maria (fix is in sql_insert.cc)
      - when reenabling logging we must either flush all dirty pages,
      or at least verify (in debug build) that there are none. For example
      a bulk insert with single UNDO_BULK_INSERT must flush them, no matter
      if it uses repair or not (bugfix)
      - UNDO_BULK_INSERT_WITH_REPAIR is also used with repair, changes name
      
      
      mysql-test/r/maria.result:
        tests for bugs fixed
      mysql-test/t/maria.test:
        tests for bugs fixed
      sql/sql_insert.cc:
        Bugfix: even if select_create::prepare() failed to create the 'table' object
        we still have to re-enable logging.
      storage/maria/ha_maria.cc:
        Bugfix: when a transactional table does a bulk insert without
        repair, it still sometimes skips logging of REDOs thus needs a full
        flush and sync at the end. Not if repair is done, as repair does
        it internally already (see end of maria_repair*()).
      storage/maria/ha_maria.h:
        variable now can have 3 states not 2
      storage/maria/ma_bitmap.c:
        name change
      storage/maria/ma_blockrec.c:
        name change
      storage/maria/ma_blockrec.h:
        name change
      storage/maria/ma_check.c:
        * When maria_repair() re-enables logging it does not need to ask for
        a flush&sync as it did it by itself already a few lines before.
        * the log record of bulk insert can be used even without repair
        * disable logging in maria_zerofill(): without that, it puts LSN pages
        in the cache, so when it flushes them it flushes the log; the change
        makes auto-ha_maria::zerofill-if-moved faster (no log flush).
      storage/maria/ma_key_recover.c:
        name change
      storage/maria/ma_loghandler.c:
        name change
      storage/maria/ma_loghandler.h:
        name change
      storage/maria/ma_pagecache.c:
        A function, to check in debug builds that no dirty pages exist for a file.
      storage/maria/ma_pagecache.h:
        new function (nothing in non-debug)
      storage/maria/ma_recovery.c:
        _ma_tmp_disable_logging() sets info->trn to dummy_transaction_object
        when needed now. The changes done here about info->trn are to allow
        a table to retain its original, real TRN through a disable/reenable
        cycle (see replication scenario in _ma_reenable_logging_for_table()).
        When we reenable, we offer the caller to flush and sync the table;
        if the caller doesn't accept our offer, we verify that it's ok
        (no REDOs => no dirty pages are allowed to exist).
      storage/maria/maria_chk.c:
        comment
      storage/maria/maria_def.h:
        new names
      mysql-test/suite/rpl/r/rpl_stm_maria.result:
        result (it used to crash)
      mysql-test/suite/rpl/t/rpl_stm_maria.test:
        Test of replication-specific Maria bug fixed
      0825c485
  34. 19 Jan, 2008 1 commit
    • unknown's avatar
      - fix for bug when creating bitmaps · cd15ea74
      unknown authored
      - fix for bug seen when running test "type_datetime" with Maria
      (wrong data_file_length in maria_repair())
      - fix for bug seen when running test "repair" with Maria
      (myisam_sort_buffer_size was influencing Maria)
      
      
      sql/handler.cc:
        Sounds illogical to store myisam_sort_buffer_size into a structure
        used by all engines. There are only MyISAM and Maria which used 
        sort_buffer_size: they can get their value from their respective
        system variable (myisam|maria_sort_buffer_size). Using MyISAM's value
        for all engines was wrong (myisam_sort_buffer_size influenced Maria).
      sql/handler.h:
        not needed
      storage/maria/ha_maria.cc:
        check_opt->sort_buffer_size was myisam_sort_buffer_size; Maria
        must use maria_sort_buffer_size instead.
      storage/maria/ma_bitmap.c:
        don't use my_chsize() now that Monty re-explained the problem to me :)
      storage/maria/ma_check.c:
        making maria_repair() work like maria_repair_by_sort(): sort_param.filepos
        must be set at start then possibly corrected by create_new_data_handle();
        in the opposite order, filepos is finally set to 0, and if the table
        has no records, it stays 0 and this causes state.data_file_length
        to be 0 which is incorrect for a BLOCK_RECORD table having always
        at least one bitmap page.
      storage/maria/ma_pagecache.c:
        Comments
      storage/myisam/ha_myisam.cc:
        check_opt->sort_buffer_size is gone
      cd15ea74
  35. 18 Jan, 2008 1 commit
    • unknown's avatar
      compiler warnings · 306e09ba
      unknown authored
      storage/maria/ma_check.c:
        fix for important compiler warning
      storage/maria/ma_recovery.c:
        fix for compiler warning
      306e09ba
  36. 17 Jan, 2008 1 commit
    • unknown's avatar
      WL#3072 - Maria Recovery · 534417c2
      unknown authored
      Bulk insert: don't log REDO/UNDO for rows, log one UNDO which will
      truncate files; this is an optimization and a bugfix (table was left
      half-repaired by crash).
      Repair: mark table crashed-on-repair at start, bump skip_redo_lsn at start,
      this is easier for recovery (tells it to skip old REDOs or even UNDO
      phase) and user (tells it to repair) in case of crash, sync files
      in the end.
      Recovery skips missing or corrupted table and moves to next record
      (in REDO or UNDO phase) to be more robust; warns if happens in UNDO phase.
      Bugfix for UNDO_KEY_DELETE_WITH_ROOT (tested in ma_test_recovery)
      and maria_enable_indexes().
      Create missing bitmaps when needed (there can be more than one to create,
      in rare cases), log a record for this.
      
      
      include/myisamchk.h:
        new flag: bulk insert repair mustn't bump create_rename_lsn
      mysql-test/lib/mtr_report.pl:
        skip normal warning in maria-recovery.test
      mysql-test/r/maria-recovery.result:
        result: crash before bulk insert is committed, causes proper rollback,
        and crash right after OPTIMIZE replaces index file with new index file
        leads to table marked corrupted and recovery not failing.
      mysql-test/t/maria-recovery.test:
        - can't check the table or it would commit the transaction,
        but check is made after recovery.
        - test of crash before bulk-insert-with-repair is committed
        (to see if it is rolled back), and of crash after OPTIMIZE has replaced
        index file but not finished all operations (to see if recovery fails -
        it used to assert when trying to execute an old REDO on the new
        index).
      storage/maria/CMakeLists.txt:
        new file
      storage/maria/Makefile.am:
        new file
      storage/maria/ha_maria.cc:
        - If bulk insert on a transactional table using an index repair:
        table is initially empty, so don't log REDO/UNDO for data rows
        (optimization), just log an UNDO_BULK_INSERT_WITH_REPAIR
        which will, if executed, empty the data and index file. Re-enable
        logging in end_bulk_insert().
        - write log record for repair operation only after it's fully done,
        index sort including (maria_repair*() used to write the log record).
        - Adding back file->trn=NULL which was removed by mistake earlier.
      storage/maria/ha_maria.h:
        new member (see ha_maria.cc)
      storage/maria/ma_bitmap.c:
        Functions to create missing bitmaps:
        - one function which creates missing bitmaps in page cache, except
        the missing one with max offset which it does not put into page cache
        as it will be modified very soon.
        - one function which the one above calls, and creates bitmaps in page
        cache
        - one function to execute REDO_BITMAP_NEW_PAGE which uses the second
        one above.
      storage/maria/ma_blockrec.c:
        - when logging REDO_DELETE_ALL, not only 'records' and 'checksum'
        has to be reset under log's mutex.
        - execution of REDO_INSERT_ROW_BLOBS now checks the dirty pages' list
        - execution of UNDO_BULK_INSERT_WITH_REPAIR
      storage/maria/ma_blockrec.h:
        new functions
      storage/maria/ma_check.c:
        - table-flush-before-repair is moved to a separate function reused
        by maria_sort_index(); syncing is added
        - maria_repair() is allowed to re-enable logging only if it is the one
        which disabled it.
        - "_ma_flush_table_files_after_repair" was a bad name, it's not after
        repair now, and it should not sync as we do more changes to the files
        shortly after (sync is postponed to when writing the log record)
        - REDO_REPAIR record should be written only after all repair
        operations (in particular after sorting index in ha_mara::repair())
        - close to the end of repair by sort, flushing of pages must happen
        also in the non-quick case, to prepare for the sync at end.
        - in parallel repair, some page flushes are not needed as done
        by initialize_variables_for_repair().
      storage/maria/ma_create.c:
        Update skip_redo_lsn, create_rename_lsn optionally.
      storage/maria/ma_delete_all.c:
        Need to sync files at end of maria_delete_all_rows(), if transactional.
      storage/maria/ma_extra.c:
        During repair, we sometimes call _ma_flush_table_files() (via
        _ma_flush_table_files_before_swap()) while there is a WRITE_CACHE.
      storage/maria/ma_key_recover.c:
        - when we see CLR_END for UNDO_BULK_INSERT_WITH_REPAIR, re-enable
        indices.
        - fixing bug: _ma_apply_undo_key_delete() parsed UNDO_KEY_DELETE_WITH_ROOT
        wrongly, leading to recovery failure
      storage/maria/ma_key_recover.h:
        new prototype
      storage/maria/ma_locking.c:
        DBUG_VOID_RETURN missing
      storage/maria/ma_loghandler.c:
        UNDO for bulk insert with repair, and REDO for creating bitmaps.
        LOGREC_FIRST_FREE to not have to change the for() every time we
        add a new record type.
      storage/maria/ma_loghandler.h:
        new UNDO and REDO
      storage/maria/ma_open.c:
        Move share.kfile.file=kfile up a bit, so that _ma_update_state_lsns()
        can get its value, this fixes a bug where LSN_REPAIRED_BY_MARIA_CHK
        was not corrected on disk by maria_open().
        Store skip_redo_lsn in index' header.
        maria_enable_indexes() had a bug for BLOCK_RECORD, where an empty
        file has one page, not 0 bytes.
      storage/maria/ma_recovery.c:
        - Skip a corrupted, missing, or repaired-with-maria_chk, table in
        recovery: don't fail, just go to next REDO or UNDO; but if an UNDO
        is skipped in UNDO phase we issue warnings.
        - Skip REDO|UNDO in REDO phase if <skip_redo_lsn.
        - If UNDO phase fails, delete transactions to not make trnman
        assert.
        - Update skip_redo_lsn when playing REDO_CREATE_TABLE
        - Don't record UNDOs for old transactions which we don't know (long_trid==0)
        - Bugfix for UNDO_KEY_DELETE_WITH_ROOT (see ma_key_recover.c)
        - Execution of UNDO_BULK_INSERT_WITH_REPAIR
        - Don't try to find a page number in REDO_DELETE_ALL
        - Pieces moved to ma_recovery_util.c
      storage/maria/ma_rename.c:
        name change
      storage/maria/ma_static.c:
        I modified layout of the index' header (inserted skip_redo_lsn in its middle)
      storage/maria/ma_test2.c:
        allow breaking the test towards the end, tests execution of
        UNDO_KEY_DELETE_WITH_ROOT
      storage/maria/ma_test_recovery.expected:
        6 as testflag instead of 4
      storage/maria/ma_test_recovery:
        Increase the amount of rollback work to do when testing recovery
        with ma_test2; this reproduces the UNDO_KEY_DELETE_WITH_ROOT bug.
      storage/maria/maria_chk.c:
        skip_redo_lsn should be updated too, for consistency.
        Write a REDO_REPAIR after all operations (including sort-records)
        have been done.
        No reason to flush blocks after maria_chk_data_link() and
        maria_sort_records(), there is maria_close() in the end.
        write_log_record() is a function, to not clutter maria_chk().
      storage/maria/maria_def.h:
        New member skip_redo_lsn in the state, and comments
      storage/maria/maria_pack.c:
        skip_redo_lsn should be updated too, for consistency
      storage/maria/ma_recovery_util.c:
        _ma_redo_not_needed_for_page(), defined in ma_recovery.c, is needed
        by ma_blockrec.c; this causes link issues, resolved by putting
        _ma_redo_not_needed_for_page() into a new file (so that it is not
        in the same file as repair-related objects of ma_recovery.c).
      storage/maria/ma_recovery_util.h:
        new file
      534417c2
  37. 12 Jan, 2008 1 commit
    • unknown's avatar
      Fixes to bugs and compiler warnings detected by pushbuild · 978f3e3c
      unknown authored
      Don't compare uuid's on maria_open() if table is not transactional
      Fixed that my_microtime() works on windows (patch added from 5.1)
      
      
      mysql-test/r/create.result:
        Portability fix
      mysql-test/t/create.test:
        Portability fix
      mysql-test/t/maria.test:
        Remove warnings, to make test portable to windows
      mysys/my_getsystime.c:
        Add missed merge from 5.1
        This fixes that timing works on windows and fixes that that failed becasuse slow_query_log didn't get any queries
      storage/maria/ma_check.c:
        Removed not needed setting of variable
      storage/maria/ma_loghandler.c:
        Fixed compiler warnings
      storage/maria/ma_open.c:
        Don't compare uuid's if table is not transactional
      KNOWN_BUGS.txt:
        New BitKeeper file ``KNOWN_BUGS.txt''
      978f3e3c