An error occurred fetching the project authors.
  1. 26 Jun, 2007 1 commit
    • unknown's avatar
      WL#3072 Maria Recovery · 35536366
      unknown authored
      - new program maria_read_log to display and apply log records
      found in a Maria log (see file's revision comment)
      - minor, misc fixes
      
      
      storage/maria/Makefile.am:
        new program maria_read_log
      storage/maria/ha_maria.cc:
        create control file if missing
      storage/maria/ma_blockrec.c:
        0 -> LSN_IMPOSSIBLE; comments
      storage/maria/ma_checkpoint.h:
        preparations for Checkpoint module
      storage/maria/ma_close.c:
        comment
      storage/maria/ma_control_file.c:
        renaming constants.
        Possibility to say "open control file but don't create it if it's
        missing" (used by maria_read_log which does not want to create
        anything)
      storage/maria/ma_control_file.h:
        renaming constants
      storage/maria/ma_create.c:
        I had duplicated "linkname" and "linkname_ptr", now I see it's not
        needed, reverting. Indeed those variables don't contain interesting
        information; fixing log record accordingly (the links are in
        ci->data/index_file_name). Storing keystart in log record is needed,
        to know at which size we must extend the file if we replay
        LOGREC_CREATE_TABLE.
      storage/maria/ma_loghandler.c:
        some structures need to be known to maria_read_log.c, taking
        them to ma_loghandler.h
      storage/maria/ma_loghandler.h:
        we have page_store, adding page_korr.
        translog_lock() made public, because Checkpoint will need it (to
        write to control file).
        Some structures moved from ma_loghandler.c because maria_read_log.c
        needs them (needs to know the execute-in-REDO-phase hooks of each
        record).
      storage/maria/ma_loghandler_lsn.h:
        constants defined in ma_control_file.h serve everywhere,
        and they relate to LSNs, so putting them in ma_loghandler_lsn.h.
        Stronger constraints in LSN_VALID().
      storage/maria/ma_pagecache.c:
        renaming constants
      storage/maria/ma_recovery.h:
        copyright
      storage/maria/ma_test1.c:
        new prototype
      storage/maria/ma_test2.c:
        new prototype
      storage/maria/trnman_public.h:
        double-inclusion safe
      storage/maria/unittest/ma_control_file-t.c:
        constants renamed, new prototype
      storage/maria/unittest/ma_test_loghandler-t.c:
        constants renamed, new prototype
      storage/maria/unittest/ma_test_loghandler_multigroup-t.c:
        constants renamed, new prototype
      storage/maria/unittest/ma_test_loghandler_multithread-t.c:
        constants renamed, new prototype
      storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
        constants renamed, new prototype
      storage/myisam/mi_close.c:
        comment
      storage/maria/maria_read_log.c:
        program to read and print log records from a Maria transaction log,
        and optionally apply them to tables. Very basic, early version.
        Should serve as a base for Recovery's code. Designed to be idempotent.
        Create a log by running maria.test, then cd to var/master-data
        and run "maria_read_log --only-display" to see info about records;
        run "maria_read_log --display-and-apply" to also apply the records
        to tables (it's more interesting if you first wipe out the
        tables in var/master-data/test, to see how they get re-created).
        Only a few records are handled by now: LONG_TRANSACTION_ID,
        COMMIT, FILE_ID, REDO_CREATE_TABLE; place is ready for
        REDO_INSERT_ROW_HEAD where I could use Monty's help (search for
        "Monty" in the file). Note: changes to the index pages, index's header
        and bitmap pages are not properly logged yet, so don't expect
        the program to work with that.
      35536366
  2. 22 Jun, 2007 1 commit
    • unknown's avatar
      - WL#3239 "log CREATE TABLE in Maria" · de28fd57
      unknown authored
      - WL#3240 "log DROP TABLE in Maria"
      - similarly, log RENAME TABLE, REPAIR/OPTIMIZE TABLE, and
      DELETE no_WHERE_clause (== the DELETE which just truncates the files)
      - create_rename_lsn added to MARIA_SHARE's state
      - all these operations (except DROP TABLE) also update the table's
      create_rename_lsn, which is needed for the correctness of
      Recovery (see function comment of _ma_repair_write_log_record()
      in ma_check.c)
      - write a COMMIT record when transaction commits.
      - don't log REDOs/UNDOs if this is an internal temporary table
      like inside ALTER TABLE (I expect this to be a big win). There was
      already no logging for user-created "CREATE TEMPORARY" tables.
      - don't fsync files/directories if the table is not transactional
      - in translog_write_record(), autogenerate a 2-byte-id for the table
      and log the "id->name" pair (LOGREC_FILE_ID); log
      LOGREC_LONG_TRANSACTION_ID; automatically store
      the table's 2-byte-id in any log record.
      - preparations for Checkpoint: translog_get_horizon(); pausing Checkpoint
      when some dirty pages are unknown; capturing trn->rec_lsn,
      trn->first_undo_lsn for Checkpoint and log's low-water-mark computing.
      - assertions, comments.
      
      
      storage/maria/Makefile.am:
        more files to build
      storage/maria/ha_maria.cc:
        - logging a REPAIR log record if REPAIR/OPTIMIZE was successful.
        - ha_maria::data_file_type does not have to be set in every info()
        call, just do it once in open().
        - if caller said that transactionality can be disabled (like if
        caller is ALTER TABLE) i.e. thd->transaction.on==FALSE, then we
        temporarily disable transactionality of the table in external_lock();
        that will ensure that no REDOs/UNDOs are logged for this possibly
        massive write operation (they are not needed, as if any write fails,
        the table will be dropped). We re-enable in external_lock(F_UNLCK),
        which in ALTER TABLE happens before the tmp table replaces the original
        one (which is good, as thus the final table will have a REDO RENAME
        and a correct create_rename_lsn).
        - when we commit we also have to write a log record, so
        trnman_commit_trn() calls become ma_commit() calls
        - at end of engine's initialization, we are potentially entering a
        multi-threaded dangerous world (clients are going to be accepted)
        and so some assertions of mutex-owning become enforceable, for that
        we set maria_multi_threaded=TRUE (see ma_control_file.c)
      storage/maria/ha_maria.h:
        new member ha_maria::save_transactional (see also ha_maria.cc)
      storage/maria/ma_blockrec.c:
        - fixing comments according to discussion with Monty
        - if a table is transactional but temporarily non-transactional
        (like in ALTER TABLE), we need to give a sensible LSN to the pages
        (and, if we give 0, pagecache asserts).
        - translog_write_record() now takes care of storing the share's
        2-byte-id in the log record
      storage/maria/ma_blockrec.h:
        fixing comment according to discussion with Monty
      storage/maria/ma_check.c:
        When REPAIR/OPTIMIZE modify the data/index file, if this is a
        transactional table, they must sync it; if they remove files or rename
        files, they must sync the directory, so that everything is durable.
        This is just applying to REPAIR/OPTIMIZE the logic already implemented
        in CREATE/DROP/RENAME a few months ago.
        Adding a function to write a LOGREC_REPAIR_TABLE at end of
        REPAIR/OPTIMIZE (called only by ha_maria, not by maria_chk), and
        to update the table's create_rename_lsn.
      storage/maria/ma_close.c:
        fix for a future bug
      storage/maria/ma_control_file.c:
        ensuring that if Maria is running in multi-threaded mode, anybody
        wanting to write to the control file and update
        last_checkpoint_lsn/last_logno owns the log's lock.
      storage/maria/ma_control_file.h:
        see ma_control_file.c
      storage/maria/ma_create.c:
        when creating a table:
        - sync it and its directory only if this is a transactional table
        and there is a log (no point in syncing in maria_chk)
        - decouple the two uses of linkname/linkname_ptr (for index file and
        for data file) into more variables, as we need to know all links
        until the moment we write the LOGREC_CREATE_TABLE.
        - set share.data_file_type early so that _ma_initialize_data_file()
        knows it (Monty's bugfix so that a table always has at least a bitmap
        page when it is created; so data-file is not 0 bytes anymore).
        - log a LOGREC_CREATE_TABLE; it contains the bytes which we have
        just written to the index file's header. Update table's
        create_rename_lsn.
        - syncing of kfile had been bugified in a previous merge, correcting
        - syncing of dfile is now needed as it's not empty anymore
        - in _ma_initialize_data_file(), use share's block_size and not the
        global one. This is a gratuitous change, both variables are equal,
        just that I find it more future-proof to use share-bound variable
        rather than global one.
      storage/maria/ma_delete_all.c:
        log a LOGREC_DELETE_ALL record when doing ma_delete_all_rows();
        update create_rename_lsn then.
      storage/maria/ma_delete_table.c:
        - logging LOGREC_DROP_TABLE; knowing if this is needed, requires
        knowing if the table is transactional, which requires opening the
        table.
        - we need to sync directories only if the table is transactional
      storage/maria/ma_extra.c:
        questions
      storage/maria/ma_init.c:
        when maria_end() is called, engine is not multithreaded
      storage/maria/ma_loghandler.c:
        - translog_inited has to be visible to ma_create() (see how it is used
        in ma_create())
        - checkpoint record will be a single record, not three
        - no REDO for TRUNCATE (TRUNCATE calls ma_create() internally so will
        log a REDO_CREATE)
        - adding REDO for DELETE no_WHERE_clause (fast DELETE of all rows by
        truncating the files), REPAIR.
        - MY_WAIT_IF_FULL to wait&retry if a log write hits a full disk
        - in translog_write_record(), if MARIA_SHARE does not yet have a
        2-byte-id, generate one for it and log LOGREC_FILE_ID; automatically
        store this short id into log records.
        - in translog_write_record(), if transaction has not logged its
        long trid, log LOGREC_LONG_TRANSACTION_ID.
        - For Checkpoint, we need to know the current end-of-log: adding
        translog_get_horizon().
        - For Control File, adding an assertion that the thread owns the
        log's lock (control file is protected by this lock)
      storage/maria/ma_loghandler.h:
        Changes in log records (see ma_loghandler.c).
        new prototypes, new functions.
      storage/maria/ma_loghandler_lsn.h:
        adding a type LSN_WITH_FLAGS especially for TRN::first_undo_lsn,
        where the most significant byte is used for flags.
      storage/maria/ma_open.c:
        storing the create_rename_lsn in the index file's header (in the
        state, precisely) and retrieving it from there.
      storage/maria/ma_pagecache.c:
        - my set_if_bigger was wrong, correcting it
        - if the first_in_switch list is not empty, it means that
        changed_blocks misses some dirty pages, so Checkpoint cannot run and
        needs to wait. A variable missing_blocks_in_changed_list is added to
        tell that (should it be named missing_blocks_in_changed_blocks?)
        - pagecache_collect_changed_blocks_with_lsn() now also tells the
        minimum rec_lsn (needed for low-water mark computation).
      storage/maria/ma_pagecache.h:
        see ma_pagecache.c
      storage/maria/ma_panic.c:
        comment
      storage/maria/ma_range.c:
        comment
      storage/maria/ma_rename.c:
        - logging LOGREC_RENAME_TABLE; knowing if this is needed, requires
        knowing if the table is transactional, which requires opening the
        table.
        - update create_rename_lsn
        - we need to sync directories only if the table is transactional
      storage/maria/ma_static.c:
        comment
      storage/maria/ma_test_all.sh:
        - tip for Valgrind-ing ma_test_all
        - do "export maria_path=somepath" before calling ma_test_all,
        if you want to run ma_test_all out of storage/maria (useful
        to have parallel runs, like one normal and one Valgrind, they
        must not use the same tables so need to run in different directories)
      storage/maria/maria_def.h:
        - state now contains, in memory and on disk, the create_rename_lsn
        - share now contains a 2-byte-id
      storage/maria/trnman.c:
        preparations for Checkpoint: capture trn->rec_lsn, trn->first_undo_lsn;
        minimum first_undo_lsn needed to know log's low-water-mark
      storage/maria/trnman.h:
        using most significant byte of first_undo_lsn to hold miscellaneous
        flags, for now TRANSACTION_LOGGED_LONG_ID.
        dummy_transaction_object is already declared in ma_static.c.
      storage/maria/trnman_public.h:
        dummy_transaction_object was declared in all files including
        trnman_public.h, while in fact it's a single object.
        new prototype
      storage/maria/unittest/ma_test_loghandler-t.c:
        update for new prototype
      storage/maria/unittest/ma_test_loghandler_multigroup-t.c:
        update for new prototype
      storage/maria/unittest/ma_test_loghandler_multithread-t.c:
        update for new prototype
      storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
        update for new prototype
      storage/maria/ma_commit.c:
        function which wraps:
        - writing a LOGREC_COMMIT record (==commit on disk)
        - calling trnman_commit_trn() (=commit in memory)
      storage/maria/ma_commit.h:
        new header file
      .tree-is-private:
        this file is now needed to keep our tree private (don't push it
        to public trees). When 5.1 is merged into mysql-maria, we can abandon
        our maria-specific post-commit trigger; .tree_is_private will take
        care of keeping commit mails private. Don't push this file to public
        trees.
      de28fd57
  3. 11 Jun, 2007 1 commit
    • unknown's avatar
      - moving pagecache.h from include/ to storage/maria as it is Maria- · f159c6cf
      unknown authored
      specific
      - adding TRN::first_undo_lsn, needed to know when a log can be deleted;
      this variable must be set under log's mutex and that leads to setting
      TRN::rec_lsn, TRN::undo_lsn and TRN::first_undo_lsn in a
      inwrite_rec_hook; adding implementation of one hook for REDOs and one
      for UNDOs. Thus translog_write_record() always uses TRN and so does
      not need a short_id argument, can find it from TRN.
      - Monty's patch for the last Valgrind error in the tree.
      - Log handler's unit tests fail but Sanja says it's known
      
      
      include/Makefile.am:
        pagecache.h moved and renamed
      include/maria.h:
        pagecache.h moved and renamed
      sql/handler.h:
        pagecache.h moved and renamed
      storage/maria/Makefile.am:
        pagecache.h moved and renamed
      storage/maria/ha_maria.cc:
        adding an assertion which sounds logical
      storage/maria/ma_blockrec.c:
        trn->rec_lsn and trn->undo_lsn are now set via hooks inside the log
        record's writing; this allows to also set trn->first_undo_lsn
        needed to compute the log's low-water mark.
        The PAGERANGE_STORE_SIZE -> PAGE_STORE_SIZE is Monty's fix to a
        Valgrind error.
      storage/maria/ma_loghandler.c:
        "tcb" renamed to "trn". Log handler now knows what is a transaction,
        and finds short_id from trn. trn's rec_lsn, undo_lsn, first_undo_lsn
        are now set by some inwrite_rec_hookS (one for REDOs, one for UNDOs).
        The HAVE_purify blocks are Monty's fix to a Valgrind error.
      storage/maria/ma_loghandler.h:
        Log handler functions use TRN, that needs a forward declaration
      storage/maria/ma_pagecache.c:
        pagecache.h was moved and renamed
      storage/maria/ma_pagecache.h:
        pagecache.h was moved and renamed
      storage/maria/ma_pagecaches.c:
        pagecache.h was moved and renamed
      storage/maria/trnman.c:
        initializing some members of TRN.
      storage/maria/trnman.h:
        TRN::first_undo_lsn needed for log's low-water mark calculation
        (which will serve to know which logs can be deleted)
      storage/maria/unittest/ma_test_loghandler-t.c:
        translog_write_record() now needs a valid TRN
      storage/maria/unittest/ma_test_loghandler_multigroup-t.c:
        translog_write_record() now needs a valid TRN
      storage/maria/unittest/ma_test_loghandler_multithread-t.c:
        translog_write_record() now needs a valid TRN
      storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
        translog_write_record() now needs a valid TRN
      storage/maria/unittest/test_file.h:
        pagecache.h was moved and renamed
      f159c6cf
  4. 08 Jun, 2007 1 commit
    • unknown's avatar
      - if table is not transactional, we don't create a transaction · 1a92c35d
      unknown authored
      - if table is temporary it's not crash-safe so we declare it
      non-transactional (saves trnman calls, REDO/UNDO log writing,
      and fixes the assertion failure at the first line of trnman_destroy()).
      
      
      storage/maria/ha_maria.cc:
        if table is not transactional, no need to create a transaction:
        - it saves trnman calls (mutex locks etc)
        - it saves REDO and UNDO log writing
        - it closes a bug: if this is a temporary table, external_lock(F_RD|WRLCK)
        is not always paired with external_lock(F_UNLCK), which confuses the
        transaction logic in external_lock. As temp tables are not crash-safe
        and so not transactional in this Maria version, we skip transactions
        and de-confuse. Note that maria_lock_database(F_UNLCK) is
        properly called, so if the transaction logic moves from external_lock()
        to maria_lock_database() (probably TODO), transactional temp tables
        will be possible.
      storage/maria/ma_create.c:
        temporary tables cannot be crash-safe as they are dropped at restart
      storage/maria/maria_def.h:
        comment
      1a92c35d
  5. 07 Jun, 2007 1 commit
  6. 06 Jun, 2007 1 commit
    • unknown's avatar
      rec_lsn (first REDO LSN( is now given to the page cache on unpinning · 6762e215
      unknown authored
      Added maria_clone(), needed by future REPAIR code
      
      
      storage/maria/unittest/ma_pagecache_consist.c:
        Change mode to -rw-rw-r--
      storage/maria/unittest/lockman-t.c:
        Change mode to -rw-rw-r--
      storage/maria/unittest/lockman1-t.c:
        Change mode to -rw-rw-r--
      storage/maria/unittest/lockman2-t.c:
        Change mode to -rw-rw-r--
      storage/maria/unittest/trnman-t.c:
        Change mode to -rw-rw-r--
      include/maria.h:
        Added prototype for maria_clone (for future)
      storage/maria/ha_maria.cc:
        Move filename to share structure
      storage/maria/ma_blockrec.c:
        rec_lsn (first REDO LSN( is now given to the page cache on unpinning
        Removed impossible lock handling in get_head_or_tail_page()
        Changed calls ot translog_write_record() to remember rec_lsn
        Removed some logging in csse of not transactions
      storage/maria/ma_delete.c:
        info->filename -> info->s->open_file_name
      storage/maria/ma_loghandler.c:
        Indentation fixes
      storage/maria/ma_open.c:
        Added maria_clone(), needed by future REPAIR code
      storage/maria/ma_packrec.c:
        Fixed typo in comment
      storage/maria/ma_pagecache.c:
        Added comment.
        Allow setting REC_LSN in case of read lock
      storage/maria/ma_update.c:
        info->filename -> info->s->open_file_name
      storage/maria/ma_write.c:
        info->filename -> info->s->open_file_name
      storage/maria/maria_def.h:
        info->filename -> info->s->open_file_name
        Added have_rtree to simplify test in ma_clone()
      storage/maria/maria_ftdump.c:
        info->filename -> info->s->open_file_name
      storage/maria/maria_pack.c:
        info->filename -> info->s->open_file_name
      storage/maria/trnman.h:
        Added rec_lsn
      6762e215
  7. 05 Jun, 2007 1 commit
  8. 29 May, 2007 1 commit
    • unknown's avatar
      This patch is a collection of patches from from Sanja, Sergei and Monty. · de6183fd
      unknown authored
      Added logging and pinning of pages to block format.
      Integration of transaction manager, log handler.
      Better page cache intergration
      Split trnman.h into two files, so that we don't have to include my_atomic.h into C++ programs.
      Renaming of structures, more comments, more debugging etc.
      Fixed problem with small head block + long varchar.
      Added extra argument to delete_record() and update_record() (needed for UNDO logging)
      Small changes to interface of pagecache and log handler.
      Change initialization of log_record_type_descriptors to not be depending on enum order.
      Use array of LEX_STRING's to send data to log handler
      Added 'dummy' transaction option to MARIA_INFO so that we can always assume 'trn' exists.
      
      
      include/lf.h:
        Interface fixes
        Rename of structures
        (Patch from Sergei via Sanja)
      include/my_atomic.h:
        More comments
      include/my_global.h:
        Added MY_ERRPTR
      include/pagecache.h:
        Added undo LSN when unlocking pages
      mysql-test/r/maria.result:
        Updated results
      mysql-test/t/maria.test:
        Added autocommit around lock tables
        (Patch from Sanja)
      mysys/lf_alloc-pin.c:
        Post-review fixes, simple optimizations
        More comments
        Struct slot renames
        Check amount of memory on stack
        (Patch from Sergei)
      mysys/lf_dynarray.c:
        More comments
      mysys/lf_hash.c:
        More comments
        After review fixes
        (Patch from Sergei)
      storage/maria/ha_maria.cc:
        Split trnman.h into two files, so that we don't have to include my_atomic.h into the .cc program.
        (Temporary fix to avoid bug in gcc)
        Move out all deferencing of the transaction structure.
        Transaction manager integrated (Patch from Sergei)
      storage/maria/ha_maria.h:
        Added prototype for start_stmt()
      storage/maria/lockman.c:
        Function call rename
      storage/maria/ma_bitmap.c:
        Mark deleted pages free from page cache
      storage/maria/ma_blockrec.c:
        Offset -> rownr
        More debugging
        Fixed problem with small head block + long varchar
        Added logging of changed pages
        Added logging of undo (Including only loggging of changed fields in case of update)
        Added pinning/unpinning of all changed pages
        More comments
        Added free_full_pages() as the same code was used in several places.
        fill_rows_parts() renamed as fill_insert_undo_parts()
        offset -> rownr
        Added some optimization of not transactional tables
        _ma_update_block_record() has new parameter, as we need original row to do efficent undo for update
      storage/maria/ma_blockrec.h:
        Added ROW_EXTENTS_ON_STACK
        Changed prototype for update and delete of row
      storage/maria/ma_check.c:
        Added original row to delete_record() call
      storage/maria/ma_control_file.h:
        Added ifdefs for C++
      storage/maria/ma_delete.c:
        Added original row to delete_record() call
        (Needed for efficent undo logging)
      storage/maria/ma_dynrec.c:
        Added extra argument to delete_record() and update_record()
        Removed not used variable
      storage/maria/ma_init.c:
        Initialize log handler
      storage/maria/ma_loghandler.c:
        Removed not used variable
        Change initialization of log_record_type_descriptors to not be depending on enum order
        Use array of LEX_STRING's to send data to log handler
      storage/maria/ma_loghandler.h:
        New defines
        Use array of LEX_STRING's to send data to log handler
      storage/maria/ma_open.c:
        Added 'dummy' transaction option to MARIA_INFO so that we can always assume 'trn' exists.
        Store in MARIA_SHARE->page_type if pages will have up to date LSN's
      storage/maria/ma_pagecache.c:
        Don't decrease number of readers when using pagecache_write()/pagecache_read()
        In pagecache_write() decrement request count if page was left pinned
        Added pagecache_delete_pages()
        Removed some casts
        Make trace output consistent with rest of code
        Simplify calling of DBUG_ASSERT(0)
        Only update LSN if the LSN is bigger than what's already on the page
        Added LSN parameter pagecache_unpin_page(), pagecache_unpin(), and pagecache_unlock()
        (Part of patch from Sanja)
      storage/maria/ma_static.c:
        Added 'dummy' transaction option to MARIA_INFO so that we can always assume 'trn' exists.
        Added default page cache
      storage/maria/ma_statrec.c:
        Added extra argument to delete_record() and update_record()
      storage/maria/ma_test1.c:
        Added option -T for transactions
      storage/maria/ma_test2.c:
        Added option -T for transactions
      storage/maria/ma_test_all.sh:
        Test with transactions
      storage/maria/ma_update.c:
        Changed prototype for update of row
      storage/maria/maria_def.h:
        Changed prototype for update & delete of row as block records need to access the old row
        Store in MARIA_SHARE->page_type if pages will have up to date LSN's
        Added MARIA_MAX_TREE_LEVELS to allow us to calculate the number of possible pinned pages we may need.
        Removed not used 'empty_bits_buffer'
        Added pointer to transaction object
        Added array for pinned pages
        Added log_row_parts array for logging of field data.
        Added MARIA_PINNED_PAGE to store pinned pages
      storage/maria/trnman.c:
        Added accessor functions to transaction object
        Added missing DBUG_RETURN()
        More debugging
        More comments
        Changed // comment of code to #ifdef NOT_USED
        Transaction manager integrated.
        Post review fixes
        Part of patch originally from Sergei
      storage/maria/trnman.h:
        Split trnman.h into two files, so that we don't have to include my_atomic.h into the .cc program.
        (Temporary fix to avoid bug in gcc)
      storage/maria/unittest/ma_pagecache_single.c:
        Added missing argument
        Added SKIP_BIG_TESTS
        (Patch from Sanja)
      storage/maria/unittest/ma_test_loghandler-t.c:
        Test logging with new LEX_STRING parameter
        (Patch from Sanja)
      storage/maria/unittest/ma_test_loghandler_multigroup-t.c:
        Test logging with new LEX_STRING parameter
        (Patch from Sanja)
      storage/maria/unittest/ma_test_loghandler_multithread-t.c:
        Test logging with new LEX_STRING parameter
        (Patch from Sanja)
      storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
        Test logging with new LEX_STRING parameter
        (Patch from Sanja)
      storage/maria/unittest/trnman-t.c:
        Stack overflow detection
        (Patch from Sergei)
      unittest/unit.pl:
        Command-line options --big and --verbose
        (Patch from Sergei)
      unittest/mytap/tap.c:
        Detect --big
        (Patch from Sergei)
      unittest/mytap/tap.h:
        Skip_big_tests and SKIP_BIG_TESTS
        (Patch from Sergei)
      storage/maria/trnman_public.h:
        New BitKeeper file ``storage/maria/trnman_public.h''
      de6183fd
  9. 19 Apr, 2007 1 commit
    • unknown's avatar
      Fixes after review of guilhem of block record patch · 57adccda
      unknown authored
      Short overview:
      Changed a lot of variable, functions, defines and struct elements to use more readable names
      More comments (mostly function and structure slot comments)
      
      Other things:
      Changed 'USE_WHOLE_KEY' to a big number to not interfer with long keys
      Ensure that tail block are at least of size 'MIN_TAIL_SIZE'
      Allow longer keys and key parts than before (don't limit Maria interface by HA_MAX_KEY_LENGTH)
      Use ma_chsize() to write initial bitmap page
      Added checking if using file with wrong block_size
      Added issing types to type_names[] (for maria_chk -d)
      Added maria_max_key_length()
      
      
      include/maria.h:
        Changed maria_portable_size_char_ptr to portable_size_char_ptr and moved it to my_handler.h
        Removed not used variable maria_delay_rec_write.
        More comments
      include/my_handler.h:
        Added portable_sizeof_char_ptr
      include/myisam.h:
        Changed mi_portable_size_char_ptr to portable_size_char_ptr and moved it to my_handler.h
      mysql-test/r/maria.result:
        Fix results when we now have a longer key length
      mysql-test/t/maria.test:
        More tests
      mysys/my_pread.c:
        Code cleanup
      sql/net_serv.cc:
        Changed warning to note (as in main 5.1 tree) to avoid not critical failing tests
      sql/sql_select.cc:
        Use portable_sizeof_char_ptr
      storage/maria/ha_maria.cc:
        Added max_supported_key_length(), as this is not a trival function anymore
      storage/maria/ha_maria.h:
        Moved max_supported_key_length(), as this is not a trival function anymore
      storage/maria/ma_bitmap.c:
        Lots of new comments
        Added maria_bitmap_marker[] to mark 2 last bytes of each bitmap (for corruption detection)
        Trivial code changes (based on review comments)
      storage/maria/ma_blockrec.c:
        More code comments
        Renamed _block_row() functions to _block_record()
        Trivial code changes, based on review comments
        Moved Code from maria_close() to _ma_end_block_record()
        Some function renames to make things more understandable
        DIR_ENTRY_OFFSET -> DIR_COUNT_OFFSET
        keybuff_used -> keyread_buff_used
        ma_recordpos_to_offset -> ma_recordpos_to_dir_entry
        Changed some 'rec' named variables to 'column'.
        Ensure that tail block are at least of size 'MIN_TAIL_SIZE'
      storage/maria/ma_blockrec.h:
        More comments
        DIRCOUNT_SIZE -> DIR_COUNT_SIZE
        Added define for maira_bitmap_marker[]
        ma_recordpos_to_offset -> ma_recordpos_to_dir_entry
        xxx_block_row() -> xxx_block_record()
        Made _ma_read_bitmap_page() static
      storage/maria/ma_check.c:
        More comments
        ma_recordpos_to_offset() -> ma_recordpos_to_dir_entry()
        DIR_ENTRY_OFFSET -> DIR_COUNT_OFFSET
        rec variables -> column variables
        recdef -> columndef
      storage/maria/ma_checksum.c:
        rec -> column
        Avoid an 'if' in _ma_checksum() for the common case
      storage/maria/ma_close.c:
        Moved resetting of info->dfile to ma_end_once_block_record()
      storage/maria/ma_create.c:
        Some variable changes to make things more readable:
        recinfo -> columndef
        rec -> column
        rec_end -> end_column
        record_type -> datafile_type
        ma_recinfo_write() -> ma_columndef_write()
        Fixed wrong setting of 'data_file_length'; Now max_rows should be calculated correctly
        New check if too long key.
        Use ma_chsize() to write bitmap page.
      storage/maria/ma_delete.c:
        keybuff_used -> keyread_buff_used
      storage/maria/ma_dynrec.c:
        rec -> columndef
        rec_length -> column_length
        maria_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
        Better comment for _ma_read_rnd_dynamic_record()
      storage/maria/ma_ft_eval.c:
        maria_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
      storage/maria/ma_ft_test1.c:
        maria_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
      storage/maria/ma_ft_update.c:
        keybuff_used -> keyread_buff_used
      storage/maria/ma_info.c:
        More comments
      storage/maria/ma_open.c:
        Added checking if using file with wrong block_size
        New checking of max_key_length
        rec -> columndef
        _ma_recinfo_write -> _ma_columndef_write
        Don't change block_size (as this is checked in ma_create())
        More comments
      storage/maria/ma_packrec.c:
        Trivial code changes
        rec -> columndef
        maria_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
      storage/maria/ma_page.c:
        keybuff_used -> keyread_buff_used
      storage/maria/ma_rkey.c:
        Removed not needded empty line
      storage/maria/ma_rrnd.c:
        Removed not used variable
      storage/maria/ma_rt_index.c:
        keybuff_used -> keyread_buff_used
      storage/maria/ma_search.c:
        keybuff_used -> keyread_buff_used
        Trivial code changes
      storage/maria/ma_sp_test.c:
        maria_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
      storage/maria/ma_test1.c:
        maria_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
      storage/maria/ma_test2.c:
        maria_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
      storage/maria/ma_update.c:
        Updated comment
      storage/maria/ma_write.c:
        keybuff_used -> keyread_buff_used
      storage/maria/maria_chk.c:
        Added missing types to type_names[]
        Removed not used variable
        rec -> columndef
        Replaced some numbers with define flags
      storage/maria/maria_def.h:
        More comments
        Added 'MARIA_INDEX_MIN_OVERHEAD_SIZE'
        rec -> columndef
        keybuff_used -> keyread_buff_used
        _ma_recinfo_write -> _ma_culumndef_write
        _ma_recinfo_read -> _ma_columndef_read
        Changed 'USE_WHOLE_KEY' to a big number to not interfer with long keys
        Added maria_max_key_length()
      storage/maria/maria_pack.c:
        Updated message strings
        rec -> columndef
        maria_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
        More comments
      storage/myisam/ft_eval.c:
        mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
      storage/myisam/ft_test1.c:
        mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
      storage/myisam/mi_checksum.c:
        mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
      storage/myisam/mi_create.c:
        mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
      storage/myisam/mi_dynrec.c:
        mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
      storage/myisam/mi_open.c:
        mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
      storage/myisam/mi_packrec.c:
        mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
      storage/myisam/mi_rkey.c:
        Unlock mutex also in case of error
      storage/myisam/mi_test1.c:
        mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
      storage/myisam/mi_test2.c:
        mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
      storage/myisam/myisampack.c:
        mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
      storage/myisam/sp_test.c:
        mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
      support-files/magic:
        Fixed typo
      57adccda
  10. 06 Apr, 2007 1 commit
    • unknown's avatar
      After merge fixes · 0fd06131
      unknown authored
      Fixed test for row based replication
      
      
      mysql-test/mysql-test-run.pl:
        After merge fix
      mysql-test/r/maria.result:
        Fixed test for row based replication
      mysql-test/t/maria.test:
        Fixed test for row based replication
      storage/maria/ha_maria.cc:
        After merge fix
      storage/maria/ma_blockrec.c:
        Better to clear whole page, as 'length' may be bigger than what we need.
      storage/maria/ma_loghandler.c:
        Fix compiler warning
        Removed access to not initialized memory
      storage/maria/ma_open.c:
        Remove wrong (not needed) test
      0fd06131
  11. 05 Apr, 2007 1 commit
    • unknown's avatar
      Fixed that maria.test works · 5e6b1945
      unknown authored
      BUILD/SETUP.sh:
        Update from 5.1
      include/maria.h:
        Moved structs into size order
      mysql-test/include/varchar.inc:
        Fixed error numbers (as in 5.1)
      mysql-test/mysql-test-run.pl:
        Updated from 5.1
        Create a dummy mysql.err file if using --valgrind --debug
      mysql-test/lib/init_db.sql:
        Update from 5.1
      mysql-test/lib/mtr_cases.pl:
        Update from 5.1
      mysql-test/lib/mtr_diff.pl:
        Update from 5.1
      mysql-test/lib/mtr_gcov.pl:
        Update from 5.1
      mysql-test/lib/mtr_gprof.pl:
        Update from 5.1
      mysql-test/lib/mtr_im.pl:
        Update from 5.1
      mysql-test/lib/mtr_io.pl:
        Update from 5.1
      mysql-test/lib/mtr_match.pl:
        Update from 5.1
      mysql-test/lib/mtr_misc.pl:
        Update from 5.1
      mysql-test/lib/mtr_process.pl:
        Update from 5.1
      mysql-test/lib/mtr_report.pl:
        Update from 5.1
      mysql-test/lib/mtr_stress.pl:
        Update from 5.1
      mysql-test/lib/mtr_timer.pl:
        Update from 5.1
      mysql-test/lib/mtr_unique.pl:
        Update from 5.1
      mysql-test/r/maria.result:
        Updated results. The reason for the new results are:
        
        - Maria doesn't support REPAIR TABLE or OPTIMIZE table yet
        - Some statistics information is different, so MySQL prefers index reads instead of table scans
        - No support for concurrent writes in the default BLOCK_RECORD mode
        - No support for different KEY_BLOCK sizes (will not be fixed)
      mysql-test/t/disabled.def:
        Enable maria test
      mysql-test/t/maria.test:
        No support for concurrent writes in the default BLOCK_RECORD mode
        No support for different KEY_BLOCK sizes (will not be fixed)
      mysql-test/t/myisam.test:
        Fix to be able to run with --extern
      mysql-test/t/query_cache_notembedded.test:
        Fix to be able to run with --extern
      sql/filesort.cc:
        Fixed compiler warning
      sql/handler.cc:
        Use new error message (as in 5.1)
      sql/share/errmsg.txt:
        Update error messages (as in 5.1)
      sql/slave.cc:
        Fixed compiler warning
      sql/slave.h:
        Fixed compiler warning
      sql/sql_table.cc:
        Fixed compiler warning
      storage/maria/ha_maria.cc:
        Added better scan_time()
        Disble REPAIR on BLOCK_RECORD tables
        Added rnd_end() to free memory after scan
        Don't pack numerical primary keys
        Don't allow fast alter table if row type changes
      storage/maria/ha_maria.h:
        Added get_row_type(), scan_time() and rnd_end()
      BitKeeper/etc/ignore:
        Added storage/maria/unittest/mf_pagecache_consist_1k-t-big storage/maria/unittest/mf_pagecache_consist_1kHC-t-big storage/maria/unittest/mf_pagecache_consist_1kRD-t-big storage/maria/unittest/mf_pagecache_consist_1kWR-t-big storage/maria/unittest/mf_pagecache_consist_64k-t-big storage/maria/unittest/mf_pagecache_consist_64kHC-t-big storage/maria/unittest/mf_pagecache_consist_64kRD-t-big storage/maria/unittest/mf_pagecache_consist_64kWR-t-big storage/maria/unittest/mf_pagecache_single_64k-t-big to the ignore list
      storage/maria/ma_bitmap.c:
        Fixed some bugs found with maria.test
        Added more DBUG_PRINT and some more comments
      storage/maria/ma_blockrec.c:
        Fixed some bugs found with maria.test
        Simplified code
        More comments
      storage/maria/ma_blockrec.h:
        Added DBUG_ASSERT()
      storage/maria/ma_check.c:
        Don't check record data links with block_records
        Update state.changed properly
      storage/maria/ma_checksum.c:
        Fixed bug in checksum handling (only first field was calculated)
      storage/maria/ma_create.c:
        Set rec->fill_length properly
        Added extra testing needed for BLOCK_RECORD
        Fixed bug in unlock of not locked mutex
        Fixed memory leak
      storage/maria/ma_delete.c:
        Update state.changed
      storage/maria/ma_delete_all.c:
        Update state.changed
      storage/maria/ma_extra.c:
        Disable caching of rows if we are using BLOCK_RECORD
        (scan_init will enable caching of rows when using BLOCK_RECORD)
      storage/maria/ma_info.c:
        Added data_file_type
      storage/maria/ma_search.c:
        Fixed bug with signed bytes
      storage/maria/ma_test2.c:
        Fixed wrong pointer handling (caused crash on 64 bit machines)
      storage/maria/ma_write.c:
        Added DBUG_ statements
      storage/maria/maria_def.h:
        Added STATE_NOT_OPTIMIZED_ROWS
      storage/myisam/mi_create.c:
        Fixed bug with unlocking of not locked mutex (in case of error condition)
      storage/myisam/mi_test2.c:
        Fixed wrong pointer handling (caused crash on 64 bit machines)
      5e6b1945
  12. 04 Apr, 2007 1 commit
    • unknown's avatar
      Pagecache integration for review. · ed175509
      unknown authored
      storage/maria/unittest/ma_pagecache_single.c:
        Rename: storage/maria/unittest/mf_pagecache_single.c -> storage/maria/unittest/ma_pagecache_single.c
      include/maria.h:
        Pagecache integration.
      include/myisamchk.h:
        Pagecache integration.
      include/pagecache.h:
        removed WRITE_NOW mode
        Pagecache parameters management.
      mysys/Makefile.am:
        Safe hash procedures moved to the separate file.
        Pagecache moved to maria engine directory.
      mysys/mf_keycaches.c:
        Safe hash procedures moved to the separate file.
      sql/handler.cc:
        Pageccahe integration.
      sql/handler.h:
        Pagecache integration.
      sql/mysql_priv.h:
        pagecache integration
      sql/mysqld.cc:
        pagecache integration
      sql/set_var.cc:
        Pagecache integration.
      sql/set_var.h:
        Pagecache integration.
      storage/maria/Makefile.am:
        Pagecache integration and moving to maria engine directory.
      storage/maria/ha_maria.cc:
        File changed on PAGECCAHE_FILE.
      storage/maria/ma_bitmap.c:
        Pagecache integration.
      storage/maria/ma_blockrec.c:
        Pagecache integration.
      storage/maria/ma_check.c:
        File changed on PAGECCAHE_FILE.
        Pagecache integration.
      storage/maria/ma_close.c:
        File changed on PAGECCAHE_FILE.
      storage/maria/ma_delete_all.c:
        File changed on PAGECCAHE_FILE.
      storage/maria/ma_dynrec.c:
        File changed on PAGECCAHE_FILE.
      storage/maria/ma_extra.c:
        File changed on PAGECCAHE_FILE.
      storage/maria/ma_info.c:
        File changed on PAGECCAHE_FILE.
      storage/maria/ma_keycache.c:
        Pagecache integration.
      storage/maria/ma_locking.c:
        File changed on PAGECCAHE_FILE.
      storage/maria/ma_loghandler.c:
        Assert added.
      storage/maria/ma_loghandler.h:
        extern specifier added.
      storage/maria/ma_open.c:
        Pagecache integration.
        File changed on PAGECCAHE_FILE.
      storage/maria/ma_packrec.c:
        File changed on PAGECCAHE_FILE.
      storage/maria/ma_page.c:
        Pagecache integration.
      storage/maria/ma_pagecache.c:
        Pagecache renamed and moved to the maria directory.
        BLOCK_* defines renamed to avoid conflict with BLOCK_ERROR defined in maria_def.h
      storage/maria/ma_panic.c:
        File changed on PAGECCAHE_FILE.
      storage/maria/ma_preload.c:
        Pagecache integration.
        File changed on PAGECCAHE_FILE.
      storage/maria/ma_static.c:
        Pagecache integration.
      storage/maria/ma_test1.c:
        Pagecache integration.
      storage/maria/ma_test2.c:
        Pagecache integration.
      storage/maria/ma_test3.c:
        Pagecache integration.
      storage/maria/ma_write.c:
        File changed on PAGECCAHE_FILE.
      storage/maria/maria_chk.c:
        Pagecache integration.
        File changed on PAGECCAHE_FILE.
      storage/maria/maria_def.h:
        Pagecache integration.
        File changed on PAGECCAHE_FILE.
      storage/maria/maria_ftdump.c:
        Pagecache integration.
      storage/maria/maria_pack.c:
        File changed on PAGECCAHE_FILE.
      storage/maria/unittest/Makefile.am:
        Pagecache moved to the maria directory.
      storage/maria/unittest/ma_pagecache_consist.c:
        fixed using uninitialized variable
      storage/maria/ma_pagecaches.c:
        New BitKeeper file ``storage/maria/ma_pagecaches.c''
      mysys/my_safehash.h:
        New BitKeeper file ``mysys/my_safehash.h''
      ed175509
  13. 02 Mar, 2007 1 commit
    • unknown's avatar
      GPL license update (same change as was done for all files in 5.1). · ee984206
      unknown authored
      storage/maria/Makefile.am:
        GPL license update
      storage/maria/ft_maria.c:
        GPL license update
      storage/maria/ha_maria.cc:
        GPL license update
      storage/maria/ha_maria.h:
        GPL license update
      storage/maria/lockman.c:
        GPL license update
      storage/maria/lockman.h:
        GPL license update
      storage/maria/ma_bitmap.c:
        GPL license update
      storage/maria/ma_blockrec.c:
        GPL license update
      storage/maria/ma_blockrec.h:
        GPL license update
      storage/maria/ma_cache.c:
        GPL license update
      storage/maria/ma_changed.c:
        GPL license update
      storage/maria/ma_check.c:
        GPL license update
      storage/maria/ma_checkpoint.c:
        GPL license update
      storage/maria/ma_checkpoint.h:
        GPL license update
      storage/maria/ma_checksum.c:
        GPL license update
      storage/maria/ma_close.c:
        GPL license update
      storage/maria/ma_control_file.c:
        GPL license update
      storage/maria/ma_control_file.h:
        GPL license update
      storage/maria/ma_create.c:
        GPL license update
      storage/maria/ma_dbug.c:
        GPL license update
      storage/maria/ma_delete.c:
        GPL license update
      storage/maria/ma_delete_all.c:
        GPL license update
      storage/maria/ma_delete_table.c:
        GPL license update
      storage/maria/ma_dynrec.c:
        GPL license update
      storage/maria/ma_extra.c:
        GPL license update
      storage/maria/ma_ft_boolean_search.c:
        GPL license update
      storage/maria/ma_ft_eval.c:
        GPL license update
      storage/maria/ma_ft_eval.h:
        GPL license update
      storage/maria/ma_ft_nlq_search.c:
        GPL license update
      storage/maria/ma_ft_parser.c:
        GPL license update
      storage/maria/ma_ft_stem.c:
        GPL license update
      storage/maria/ma_ft_test1.c:
        GPL license update
      storage/maria/ma_ft_test1.h:
        GPL license update
      storage/maria/ma_ft_update.c:
        GPL license update
      storage/maria/ma_ftdefs.h:
        GPL license update
      storage/maria/ma_fulltext.h:
        GPL license update
      storage/maria/ma_info.c:
        GPL license update
      storage/maria/ma_init.c:
        GPL license update
      storage/maria/ma_key.c:
        GPL license update
      storage/maria/ma_keycache.c:
        GPL license update
      storage/maria/ma_least_recently_dirtied.c:
        GPL license update
      storage/maria/ma_least_recently_dirtied.h:
        GPL license update
      storage/maria/ma_locking.c:
        GPL license update
      storage/maria/ma_open.c:
        GPL license update
      storage/maria/ma_packrec.c:
        GPL license update
      storage/maria/ma_page.c:
        GPL license update
      storage/maria/ma_panic.c:
        GPL license update
      storage/maria/ma_preload.c:
        GPL license update
      storage/maria/ma_range.c:
        GPL license update
      storage/maria/ma_recovery.c:
        GPL license update
      storage/maria/ma_recovery.h:
        GPL license update
      storage/maria/ma_rename.c:
        GPL license update
      storage/maria/ma_rfirst.c:
        GPL license update
      storage/maria/ma_rkey.c:
        GPL license update
      storage/maria/ma_rlast.c:
        GPL license update
      storage/maria/ma_rnext.c:
        GPL license update
      storage/maria/ma_rnext_same.c:
        GPL license update
      storage/maria/ma_rprev.c:
        GPL license update
      storage/maria/ma_rrnd.c:
        GPL license update
      storage/maria/ma_rsame.c:
        GPL license update
      storage/maria/ma_rsamepos.c:
        GPL license update
      storage/maria/ma_rt_index.c:
        GPL license update
      storage/maria/ma_rt_index.h:
        GPL license update
      storage/maria/ma_rt_key.c:
        GPL license update
      storage/maria/ma_rt_key.h:
        GPL license update
      storage/maria/ma_rt_mbr.c:
        GPL license update
      storage/maria/ma_rt_mbr.h:
        GPL license update
      storage/maria/ma_rt_split.c:
        GPL license update
      storage/maria/ma_rt_test.c:
        GPL license update
      storage/maria/ma_scan.c:
        GPL license update
      storage/maria/ma_search.c:
        GPL license update
      storage/maria/ma_sort.c:
        GPL license update
      storage/maria/ma_sp_defs.h:
        GPL license update
      storage/maria/ma_sp_key.c:
        GPL license update
      storage/maria/ma_sp_test.c:
        GPL license update
      storage/maria/ma_static.c:
        GPL license update
      storage/maria/ma_statrec.c:
        GPL license update
      storage/maria/ma_test1.c:
        GPL license update
      storage/maria/ma_test2.c:
        GPL license update
      storage/maria/ma_test3.c:
        GPL license update
      storage/maria/ma_unique.c:
        GPL license update
      storage/maria/ma_update.c:
        GPL license update
      storage/maria/ma_write.c:
        GPL license update
      storage/maria/maria_chk.c:
        GPL license update
      storage/maria/maria_def.h:
        GPL license update
      storage/maria/maria_ftdump.c:
        GPL license update
      storage/maria/maria_pack.c:
        GPL license update
      storage/maria/tablockman.c:
        GPL license update
      storage/maria/tablockman.h:
        GPL license update
      storage/maria/trnman.c:
        GPL license update
      storage/maria/trnman.h:
        GPL license update
      ee984206
  14. 01 Mar, 2007 1 commit
    • unknown's avatar
      merge from MyISAM into Maria (last step of merge of 5.1 into Maria). · 69d519e9
      unknown authored
      Tests: "maria" and "ps_maria" fail like before merge (assertions),
      "ma_test_all" fails like before merge (ma_test2 segfaults, I'll try
      to find out why).
      
      
      mysys/mf_pagecache.c:
        using a more distinctive tag
      storage/maria/ha_maria.cc:
        merge from MyISAM into Maria
      storage/maria/ma_check.c:
        merge from MyISAM into Maria
      storage/maria/ma_close.c:
        TODO as a word
      storage/maria/ma_create.c:
        merge from MyISAM into Maria
      storage/maria/ma_delete_all.c:
        TODO as a word
      storage/maria/ma_delete_table.c:
        TODO as a word
      storage/maria/ma_dynrec.c:
        merge from MyISAM into Maria
      storage/maria/ma_extra.c:
        merge from MyISAM into Maria
      storage/maria/ma_ft_boolean_search.c:
        merge from MyISAM into Maria
      storage/maria/ma_locking.c:
        merge from MyISAM into Maria
      storage/maria/ma_loghandler.c:
        fix for compiler warning
      storage/maria/ma_open.c:
        merge from MyISAM into Maria.
        I will ask Monty to check the ASKMONTY-marked piece of code.
      storage/maria/ma_packrec.c:
        merge from MyISAM into Maria
      storage/maria/ma_range.c:
        merge from MyISAM into Maria
      storage/maria/ma_rename.c:
        TODO as a word
      storage/maria/ma_rt_index.c:
        merge from MyISAM into Maria
      storage/maria/ma_rt_split.c:
        merge from MyISAM into Maria
      storage/maria/ma_search.c:
        merge from MyISAM into Maria
      storage/maria/ma_sort.c:
        merge from MyISAM into Maria
      storage/maria/ma_update.c:
        merge from MyISAM into Maria
      storage/maria/ma_write.c:
        merge from MyISAM into Maria
      storage/maria/maria_chk.c:
        merge from MyISAM into Maria
      storage/maria/maria_def.h:
        merge from MyISAM into Maria
      storage/maria/maria_pack.c:
        merge from MyISAM into Maria
      storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
        fix for compiler warning
      storage/myisam/ha_myisam.cc:
        merge from MyISAM into Maria
      storage/myisammrg/ha_myisammrg.cc:
        merge from MyISAM into Maria
      69d519e9
  15. 20 Dec, 2006 1 commit
    • unknown's avatar
      merge of recent MyISAM changes into Maria. · c76fb0ca
      unknown authored
      Only failure is ndb_restore - could have been worse!!
      
      
      include/pagecache.h:
        LSN->lsn
      mysys/mf_keycache.c:
        page_status is int
      mysys/mf_pagecache.c:
        merge of recent key cache changes
      sql/mysqld.cc:
        post-merge fixes
      sql/set_var.cc:
        post-merge fixes
      storage/maria/ha_maria.cc:
        merge of recent MyISAM changes into Maria
      storage/maria/ha_maria.h:
        merge of recent MyISAM changes into Maria
      storage/maria/ma_close.c:
        merge of recent MyISAM changes into Maria
      storage/maria/ma_create.c:
        merge of recent MyISAM changes into Maria
      storage/maria/ma_delete.c:
        merge of recent MyISAM changes into Maria
      storage/maria/ma_dynrec.c:
        merge of recent MyISAM changes into Maria
      storage/maria/ma_ft_boolean_search.c:
        merge of recent MyISAM changes into Maria
      storage/maria/ma_key.c:
        merge of recent MyISAM changes into Maria
      storage/maria/ma_keycache.c:
        merge of recent MyISAM changes into Maria
      storage/maria/ma_open.c:
        merge of recent MyISAM changes into Maria
      storage/maria/ma_page.c:
        merge of recent MyISAM changes into Maria
      storage/maria/ma_rsamepos.c:
        merge of recent MyISAM changes into Maria
      storage/maria/ma_statrec.c:
        merge of recent MyISAM changes into Maria
      storage/maria/ma_unique.c:
        merge of recent MyISAM changes into Maria
      storage/maria/maria_chk.c:
        merge of recent MyISAM changes into Maria
      storage/maria/maria_pack.c:
        merge of recent MyISAM changes into Maria
      storage/myisam/myisampack.c:
        compiler warning
      c76fb0ca
  16. 19 Dec, 2006 1 commit
    • unknown's avatar
      Maria - merging recent changes done to MyISAM into Maria. · c45f66c8
      unknown authored
      Plus compiler warnings, and a fix to the pagecache unit tests for IA64
      
      
      include/maria.h:
        merging MyISAM into Maria
      include/myisam.h:
        post-merge fixes
      mysql-test/r/maria.result:
        merging MyISAM into Maria
      mysql-test/t/maria.test:
        merging MyISAM into Maria
      sql/mysqld.cc:
        post-merge fixes
      storage/maria/ha_maria.cc:
        merging MyISAM into Maria
      storage/maria/ha_maria.h:
        merging MyISAM into Maria
      storage/maria/ma_check.c:
        merging MyISAM into Maria
      storage/maria/ma_open.c:
        merging MyISAM into Maria
      storage/maria/ma_packrec.c:
        merging MyISAM into Maria
      storage/maria/ma_range.c:
        merging MyISAM into Maria
      storage/maria/ma_sort.c:
        merging MyISAM into Maria
      storage/maria/maria_def.h:
        merging MyISAM into Maria
      storage/maria/maria_pack.c:
        merging MyISAM into Maria
      storage/maria/plug.in:
        merging MyISAM into Maria
      storage/myisam/myisamdef.h:
        merging MyISAM into Maria
      storage/myisam/myisampack.c:
        fix for compiler warnings
      unittest/mysys/mf_pagecache_consist.c:
        this sets the stack size lower than the minimum on IA64, we remove it
        (it made the test fail)
      unittest/mysys/mf_pagecache_single.c:
        this sets the stack size lower than the minimum on IA64, we remove it
        (it made the test fail)
      c45f66c8
  17. 11 Oct, 2006 1 commit
    • unknown's avatar
      Merge of recent MyISAM changes into Maria. Testsuite passes as much · c0f85a64
      unknown authored
      as in the main 5.1 (partition and ndb_alter_table fail).
      
      
      mysql-test/r/maria.result:
        merge from MyISAM
      mysql-test/r/ps_maria.result:
        merge from MyISAM
      mysql-test/t/maria.test:
        merge from MyISAM
      sql/mysql_priv.h:
        fix after wrong merge
      sql/mysqld.cc:
        fix after wrong merge
      sql/set_var.cc:
        adding _db like other engines have
      storage/maria/Makefile.am:
        merge from MyISAM
      storage/maria/ha_maria.cc:
        merge from MyISAM
      storage/maria/ha_maria.h:
        merge from MyISAM
      storage/maria/ma_check.c:
        merge from MyISAM
      storage/maria/ma_delete.c:
        merge from MyISAM
      storage/maria/ma_init.c:
        maria_inited should rather be my_bool
      storage/maria/ma_locking.c:
        merge from MyISAM
      storage/maria/ma_packrec.c:
        merge from MyISAM
      storage/maria/ma_panic.c:
        maria_panic() should not take mutex if engine has not been inited.
      storage/maria/ma_rkey.c:
        merge from MyISAM
      storage/maria/ma_write.c:
        merge from MyISAM
      storage/maria/maria_def.h:
        merge from MyISAM. maria_inited is needed for maria_panic().
      storage/maria/maria_ftdump.c:
        merge from MyISAM
      c0f85a64
  18. 07 Sep, 2006 2 commits
    • unknown's avatar
      Manually merging changes made to MyISAM into Maria. End of merge. · d13522ba
      unknown authored
      storage/maria/ft_maria.c:
        Rename: BitKeeper/deleted/.del-ft_maria.c -> storage/maria/ft_maria.c
      configure.in:
        maria moves to its plug.in
      storage/maria/Makefile.am:
        merging changes made to MyISAM into Maria.
        ft_maria.c is still needed.
      storage/maria/ha_maria.cc:
        merging changes made to MyISAM into Maria
      storage/maria/ma_dynrec.c:
        merging changes made to MyISAM into Maria
      storage/maria/ma_extra.c:
        merging changes made to MyISAM into Maria
      storage/maria/ma_ft_parser.c:
        merging changes made to MyISAM into Maria
      storage/maria/ma_open.c:
        merging changes made to MyISAM into Maria
      storage/maria/ma_sort.c:
        merging changes made to MyISAM into Maria
      storage/maria/ma_update.c:
        merging changes made to MyISAM into Maria
      storage/maria/ma_write.c:
        merging changes made to MyISAM into Maria
      storage/maria/maria_def.h:
        merging changes made to MyISAM into Maria
      storage/myisam/Makefile.am:
        merging changes made to MyISAM into Maria
      storage/maria/plug.in:
        merging changes made to MyISAM into Maria
      d13522ba
    • unknown's avatar
      Merge of Myisam changes into Maria. · 0166d45c
      unknown authored
      First step: ha_maria moves to storage/maria.
      
      
      BitKeeper/deleted/.del-ft_maria.c:
        Delete: storage/maria/ft_maria.c
      storage/maria/ha_maria.h:
        Rename: sql/ha_maria.h -> storage/maria/ha_maria.h
      storage/maria/ha_maria.cc:
        Rename: sql/ha_maria.cc -> storage/maria/ha_maria.cc
      libmysqld/Makefile.am:
        ha_maria moves to other dir (like myisam has)
      sql/Makefile.am:
        ha_maria moves to other dir (like myisam has)
      sql/mysqld.cc:
        ha_maria moves to other dir (like myisam has)
      storage/maria/Makefile.am:
        I delete ft_maria.c like ft_myisam.c has
      storage/maria/ma_test_all.sh:
        -l option is removed (no MyISAM log in Maria), maria_log is removed too.
      0166d45c
  19. 10 Aug, 2006 3 commits
    • unknown's avatar
      fixes for inline bit functions · aa4077f6
      unknown authored
      aa4077f6
    • unknown's avatar
      adding handler flag missing from previous merge, for Maria · 9b319b8b
      unknown authored
      sql/ha_maria.cc:
        flag missing from previous merge
      9b319b8b
    • unknown's avatar
      Completion of merge of mysql-5.1 into mysql-maria. · d2cea277
      unknown authored
      Manually imported changes done to MyISAM (include/myisam.h,
      storage/myisam/*, sql/ha_myisam.*, mysql-test/t/myisam.test,
      mysql-test/t/ps_2myisam.test) the last
      months into Maria (tedious, should do it more frequently in the
      future), including those not done at the previous 5.1->Maria merge
      (please in the future don't forget to apply MyISAM changes to Maria
      when you merge 5.1 into Maria).
      Note: I didn't try to import anything which could be MyISAM-related
      in other tests of mysql-test (I didn't want to dig in all csets),
      but as QA is working to make most tests re-usable for other engines
      (Falcon), it is likely that we'll benefit from this and just have
      to set engine=Maria somewhere to run those tests on Maria.
      func_group and partition tests fail but they already do in main 5.1
      on my machine. No Valgrind error in t/*maria*.test.
      Monty: please see the commit comment of maria.result and check.
      
      
      BitKeeper/deleted/.del-ha_maria.m4:
        Delete: config/ac-macros/ha_maria.m4
      configure.in:
        fix for the new way of enabling engines
      include/maria.h:
        importing changes done to MyISAM the last months into Maria
      include/my_handler.h:
        importing changes done to MyISAM the last months into Maria
      include/myisam.h:
        importing changes done to MyISAM the last months into Maria
      mysql-test/r/maria.result:
        identical to myisam.result, except the engine name in some places
        AND in the line testing key_block_size=1000000000000000000:
        Maria gives a key block size of 8192 while MyISAM gives 4096;
        is it explainable by the difference between MARIA_KEY_BLOCK_LENGTH
        and the same constant in MyISAM? Monty?
      mysql-test/r/ps_maria.result:
        identical to ps_2myisam.result (except the engine name in some places)
      mysql-test/t/maria.test:
        instead of engine=maria everywhere, I use @@storage_engine (reduces
        the diff with myisam.test).
        importing changes done to MyISAM the last months into Maria
      mysys/my_handler.c:
        importing changes done to MyISAM the last months into Maria
      sql/ha_maria.cc:
        importing changes done to MyISAM the last months into Maria
      sql/ha_maria.h:
        importing changes done to MyISAM the last months into Maria
      sql/mysqld.cc:
        unneeded
      storage/maria/Makefile.am:
        importing changes done to MyISAM the last months into Maria
      storage/maria/ma_check.c:
        importing changes done to MyISAM the last months into Maria
      storage/maria/ma_create.c:
        importing changes done to MyISAM the last months into Maria
      storage/maria/ma_delete_table.c:
        importing changes done to MyISAM the last months into Maria
      storage/maria/ma_dynrec.c:
        importing changes done to MyISAM the last months into Maria
      storage/maria/ma_extra.c:
        importing changes done to MyISAM the last months into Maria
      storage/maria/ma_ft_boolean_search.c:
        importing changes done to MyISAM the last months into Maria
      storage/maria/ma_ft_eval.c:
        importing changes done to MyISAM the last months into Maria
      storage/maria/ma_ft_nlq_search.c:
        importing changes done to MyISAM the last months into Maria
      storage/maria/ma_ft_parser.c:
        importing changes done to MyISAM the last months into Maria
      storage/maria/ma_ft_test1.c:
        importing changes done to MyISAM the last months into Maria
      storage/maria/ma_ft_update.c:
        importing changes done to MyISAM the last months into Maria
      storage/maria/ma_ftdefs.h:
        importing changes done to MyISAM the last months into Maria
      storage/maria/ma_key.c:
        importing changes done to MyISAM the last months into Maria
      storage/maria/ma_open.c:
        importing changes done to MyISAM the last months into Maria
      storage/maria/ma_page.c:
        importing changes done to MyISAM the last months into Maria
      storage/maria/ma_rkey.c:
        importing changes done to MyISAM the last months into Maria
      storage/maria/ma_rsamepos.c:
        importing changes done to MyISAM the last months into Maria
      storage/maria/ma_rt_index.c:
        importing changes done to MyISAM the last months into Maria
      storage/maria/ma_rt_mbr.c:
        importing changes done to MyISAM the last months into Maria
      storage/maria/ma_search.c:
        importing changes done to MyISAM the last months into Maria
      storage/maria/ma_sort.c:
        importing changes done to MyISAM the last months into Maria
      storage/maria/ma_test1.c:
        importing changes done to MyISAM the last months into Maria
      storage/maria/ma_test2.c:
        importing changes done to MyISAM the last months into Maria
      storage/maria/ma_test3.c:
        importing changes done to MyISAM the last months into Maria
      storage/maria/ma_update.c:
        importing changes done to MyISAM the last months into Maria
      storage/maria/ma_write.c:
        importing changes done to MyISAM the last months into Maria
      storage/maria/maria_chk.c:
        importing changes done to MyISAM the last months into Maria
      storage/maria/maria_def.h:
        importing changes done to MyISAM the last months into Maria
      storage/maria/maria_ftdump.c:
        importing changes done to MyISAM the last months into Maria
      storage/maria/maria_pack.c:
        importing changes done to MyISAM the last months into Maria
      d2cea277
  20. 24 May, 2006 1 commit
    • unknown's avatar
      postmerge fix · e8b53e52
      unknown authored
      BUILD/SETUP.sh:
        postmerge changes
      configure.in:
        postmerge changes
      mysql-test/r/ps_maria.result:
        changed result according last MyISAM test changes
      e8b53e52
  21. 11 Apr, 2006 1 commit
    • unknown's avatar
      Added storage/maria (based on MyISAM). WL#3245 · 4724d397
      unknown authored
      Moved things into ft_global.h, my_handler.h and myisamchk.h to allow MyISAM and Maria to share code and defines
      Rename of not properly renamed functions in MyISAM and my_handler.c
      Renamed some MI_ defines to HA_ to allow MyISAM and Maria to share
      Added maria variables to mysqld.cc and set_var.cc
      Fixed compiler warnings
      
      
      
      BitKeeper/etc/ignore:
        added storage/maria/*.MAI
      BUILD/SETUP.sh:
        Compile maria by default
      BitKeeper/triggers/post-commit:
        No public maria emails.
        Mark changesets emails with 'maria'
      configure.in:
        Add maria
      include/ft_global.h:
        Move defines needed by maria and MyISAM here
      include/keycache.h:
        Add support for default key_cache if cache not found
      include/my_base.h:
        Add invalidator_by_filename
      include/my_handler.h:
        Remove duplicate header files
        Add defines that are typical for handlers (MyISAM and Maria)
      include/myisam.h:
        Move things to my_handler.h to allow Maria and MyISAM to share things
        (Some things needed to be shared to allow sharing of HA_CHECK structure)
      libmysqld/Makefile.am:
        Added ha_maria.cc
      mysys/mf_keycaches.c:
        Added default value for multi_key_cache_search
      mysys/my_handler.c:
        mi_compare_text -> ha_compare_text
        Removed compiler warnings
      sql/ha_myisam.cc:
        MI_CHECK -> HA_CHECK
        MI_MAX_KEY_LENGTH -> HA_MAX_KEY_LENGTH
      sql/ha_myisam.h:
        MI_CHECK -> HA_CHECK
        MI_MAX_KEY_LENGTH -> HA_MAX_KEY_LENGTH
      sql/ha_myisammrg.h:
        MI_CHECK -> HA_CHECK
        MI_MAX_KEY_LENGTH -> HA_MAX_KEY_LENGTH
      sql/handler.h:
        Added MARIA
        Added inclusion of my_handler.h
      sql/item_func.h:
        Remove duplicate include
      sql/mysql_priv.h:
        Added maria variables
      sql/mysqld.cc:
        Added maria
      sql/set_var.cc:
        Added maria status variables
      sql/set_var.h:
        Added maria
      sql/sql_class.h:
        Added maria status variables
      sql/sql_sort.h:
        Remove duplicate BUFFPEK struct
      storage/Makefile.am:
        Added maria
      storage/csv/ha_tina.cc:
        Removed compiler warning
      storage/myisam/Makefile.am:
        Added ft_myisam.c
      storage/myisam/ft_boolean_search.c:
        mi_compare_text -> ha_compare_text
        MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF
        Remove compiler warnings
      storage/myisam/ft_nlq_search.c:
        mi_compare_text -> ha_compare_text
      storage/myisam/ft_parser.c:
        mi_compare_text -> ha_compare_text
      storage/myisam/ft_static.c:
        Move ft_init_search() to ft_myisam.c to make ft_static.c independent of MyISAM
      storage/myisam/ft_stopwords.c:
        mi_compare_text -> ha_compare_text
      storage/myisam/ft_update.c:
        mi_compare_text -> ha_compare_text
      storage/myisam/fulltext.h:
        Move things to ft_global.h to allow to share more things between MyISAM and Maria
      storage/myisam/mi_check.c:
        MI_CHECK -> HA_CHECK
      storage/myisam/mi_create.c:
        MI_MAX_POSSIBLE_KEY ->   HA_MAX_POSSIBLE_KEY
        MI_MAX_KEY_BLOCK_SIZE -> HA_MAX_KEY_BLOCK_SIZE
        MI_MAX_KEY_SEG ->  HA_MAX_KEY_SEG
        MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF
      storage/myisam/mi_delete.c:
        MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF
      storage/myisam/mi_delete_all.c:
        Remove not used variable
      storage/myisam/mi_dynrec.c:
        _my_calc_total_blob_length -> _mi_calc_total_blob_length
      storage/myisam/mi_key.c:
        _my_store_blob_length -> _mi_store_blob_length
      storage/myisam/mi_log.c:
        _my_calc_total_blob_length -> _mi_calc_total_blob_length
      storage/myisam/mi_open.c:
        MI_MAX_POSSIBLE_KEY -> HA_MAX_POSSIBLE_KEY
        MI_MAX_KEY_SEG ->      HA_MAX_KEY_SEG
        MI_MAX_KEY_BUFF ->     HA_MAX_KEY_BUFF
        my_n_base_info_read -> mi_n_base_info_read
      storage/myisam/mi_packrec.c:
        Made read_pack_length static
        _my_store_blob_length -> _mi_store_blob_length
        Remove not used variable
      storage/myisam/mi_range.c:
        MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF
      storage/myisam/mi_search.c:
        MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF
      storage/myisam/mi_test1.c:
        MI_MAX_KEY_LENGTH -> HA_MAX_KEY_LENGTH
      storage/myisam/mi_test2.c:
        Fixed compiler warning
      storage/myisam/mi_unique.c:
        Fixed compiler warning
        mi_compare_text -> ha_compare_text
      storage/myisam/mi_update.c:
        MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF
      storage/myisam/mi_write.c:
        Rename of defines and functions
      storage/myisam/myisamchk.c:
        Rename of defines and functions
      storage/myisam/myisamdef.h:
        Remove tabs
        Indentation fixes (Large changes as I did run indent-ex on the file)
        Move some things to myisamchk.h
        Added missing functions that gave compiler warnings
      storage/myisam/myisamlog.c:
        Rename of defines and functions
      storage/myisam/myisampack.c:
        Remove compiler warning
      storage/myisam/rt_index.c:
        Rename of defines and functions
      storage/myisam/sort.c:
        Rename of defines, functions and structures
      config/ac-macros/ha_maria.m4:
        New BitKeeper file ``config/ac-macros/ha_maria.m4''
      include/maria.h:
        New BitKeeper file ``include/maria.h''
      include/myisamchk.h:
        New BitKeeper file ``include/myisamchk.h''
      libmysqld/ha_maria.cc:
        New BitKeeper file ``libmysqld/ha_maria.cc''
      mysql-test/include/have_maria.inc:
        New BitKeeper file ``mysql-test/include/have_maria.inc''
      mysql-test/r/have_maria.require:
        New BitKeeper file ``mysql-test/r/have_maria.require''
      mysql-test/r/maria.result:
        New BitKeeper file ``mysql-test/r/maria.result''
      mysql-test/r/ps_maria.result:
        New BitKeeper file ``mysql-test/r/ps_maria.result''
      mysql-test/t/maria.test:
        New BitKeeper file ``mysql-test/t/maria.test''
      mysql-test/t/ps_maria.test:
        New BitKeeper file ``mysql-test/t/ps_maria.test''
      sql/ha_maria.cc:
        New BitKeeper file ``sql/ha_maria.cc''
      sql/ha_maria.h:
        New BitKeeper file ``sql/ha_maria.h''
      storage/maria/Makefile.am:
        New BitKeeper file ``storage/maria/Makefile.am''
      storage/maria/cmakelists.txt:
        New BitKeeper file ``storage/maria/cmakelists.txt''
      storage/maria/ft_maria.c:
        New BitKeeper file ``storage/maria/ft_maria.c''
      storage/maria/ma_cache.c:
        New BitKeeper file ``storage/maria/ma_cache.c''
      storage/maria/ma_changed.c:
        New BitKeeper file ``storage/maria/ma_changed.c''
      storage/maria/ma_check.c:
        New BitKeeper file ``storage/maria/ma_check.c''
      storage/maria/ma_checksum.c:
        New BitKeeper file ``storage/maria/ma_checksum.c''
      storage/maria/ma_close.c:
        New BitKeeper file ``storage/maria/ma_close.c''
      storage/maria/ma_create.c:
        New BitKeeper file ``storage/maria/ma_create.c''
      storage/maria/ma_dbug.c:
        New BitKeeper file ``storage/maria/ma_dbug.c''
      storage/maria/ma_delete.c:
        New BitKeeper file ``storage/maria/ma_delete.c''
      storage/maria/ma_delete_all.c:
        New BitKeeper file ``storage/maria/ma_delete_all.c''
      storage/maria/ma_delete_table.c:
        New BitKeeper file ``storage/maria/ma_delete_table.c''
      storage/maria/ma_dynrec.c:
        New BitKeeper file ``storage/maria/ma_dynrec.c''
      storage/maria/ma_extra.c:
        New BitKeeper file ``storage/maria/ma_extra.c''
      storage/maria/ma_ft_boolean_search.c:
        New BitKeeper file ``storage/maria/ma_ft_boolean_search.c''
      storage/maria/ma_ft_eval.c:
        New BitKeeper file ``storage/maria/ma_ft_eval.c''
      storage/maria/ma_ft_eval.h:
        New BitKeeper file ``storage/maria/ma_ft_eval.h''
      storage/maria/ma_ft_nlq_search.c:
        New BitKeeper file ``storage/maria/ma_ft_nlq_search.c''
      storage/maria/ma_ft_parser.c:
        New BitKeeper file ``storage/maria/ma_ft_parser.c''
      storage/maria/ma_ft_stem.c:
        New BitKeeper file ``storage/maria/ma_ft_stem.c''
      storage/maria/ma_ft_test1.c:
        New BitKeeper file ``storage/maria/ma_ft_test1.c''
      storage/maria/ma_ft_test1.h:
        New BitKeeper file ``storage/maria/ma_ft_test1.h''
      storage/maria/ma_ft_update.c:
        New BitKeeper file ``storage/maria/ma_ft_update.c''
      storage/maria/ma_ftdefs.h:
        New BitKeeper file ``storage/maria/ma_ftdefs.h''
      storage/maria/ma_fulltext.h:
        New BitKeeper file ``storage/maria/ma_fulltext.h''
      storage/maria/ma_info.c:
        New BitKeeper file ``storage/maria/ma_info.c''
      storage/maria/ma_init.c:
        New BitKeeper file ``storage/maria/ma_init.c''
      storage/maria/ma_key.c:
        New BitKeeper file ``storage/maria/ma_key.c''
      storage/maria/ma_keycache.c:
        New BitKeeper file ``storage/maria/ma_keycache.c''
      storage/maria/ma_locking.c:
        New BitKeeper file ``storage/maria/ma_locking.c''
      storage/maria/ma_log.c:
        New BitKeeper file ``storage/maria/ma_log.c''
      storage/maria/ma_open.c:
        New BitKeeper file ``storage/maria/ma_open.c''
      storage/maria/ma_packrec.c:
        New BitKeeper file ``storage/maria/ma_packrec.c''
      storage/maria/ma_page.c:
        New BitKeeper file ``storage/maria/ma_page.c''
      storage/maria/ma_panic.c:
        New BitKeeper file ``storage/maria/ma_panic.c''
      storage/maria/ma_preload.c:
        New BitKeeper file ``storage/maria/ma_preload.c''
      storage/maria/ma_range.c:
        New BitKeeper file ``storage/maria/ma_range.c''
      storage/maria/ma_rename.c:
        New BitKeeper file ``storage/maria/ma_rename.c''
      storage/maria/ma_rfirst.c:
        New BitKeeper file ``storage/maria/ma_rfirst.c''
      storage/maria/ma_rkey.c:
        New BitKeeper file ``storage/maria/ma_rkey.c''
      storage/maria/ma_rlast.c:
        New BitKeeper file ``storage/maria/ma_rlast.c''
      storage/maria/ma_rnext.c:
        New BitKeeper file ``storage/maria/ma_rnext.c''
      storage/maria/ma_rnext_same.c:
        New BitKeeper file ``storage/maria/ma_rnext_same.c''
      storage/maria/ma_rprev.c:
        New BitKeeper file ``storage/maria/ma_rprev.c''
      storage/maria/ma_rrnd.c:
        New BitKeeper file ``storage/maria/ma_rrnd.c''
      storage/maria/ma_rsame.c:
        New BitKeeper file ``storage/maria/ma_rsame.c''
      storage/maria/ma_rsamepos.c:
        New BitKeeper file ``storage/maria/ma_rsamepos.c''
      storage/maria/ma_rt_index.c:
        New BitKeeper file ``storage/maria/ma_rt_index.c''
      storage/maria/ma_rt_index.h:
        New BitKeeper file ``storage/maria/ma_rt_index.h''
      storage/maria/ma_rt_key.c:
        New BitKeeper file ``storage/maria/ma_rt_key.c''
      storage/maria/ma_rt_key.h:
        New BitKeeper file ``storage/maria/ma_rt_key.h''
      storage/maria/ma_rt_mbr.c:
        New BitKeeper file ``storage/maria/ma_rt_mbr.c''
      storage/maria/ma_rt_mbr.h:
        New BitKeeper file ``storage/maria/ma_rt_mbr.h''
      storage/maria/ma_rt_split.c:
        New BitKeeper file ``storage/maria/ma_rt_split.c''
      storage/maria/ma_rt_test.c:
        New BitKeeper file ``storage/maria/ma_rt_test.c''
      storage/maria/ma_scan.c:
        New BitKeeper file ``storage/maria/ma_scan.c''
      storage/maria/ma_search.c:
        New BitKeeper file ``storage/maria/ma_search.c''
      storage/maria/ma_sort.c:
        New BitKeeper file ``storage/maria/ma_sort.c''
      storage/maria/ma_sp_defs.h:
        New BitKeeper file ``storage/maria/ma_sp_defs.h''
      storage/maria/ma_sp_key.c:
        New BitKeeper file ``storage/maria/ma_sp_key.c''
      storage/maria/ma_sp_test.c:
        New BitKeeper file ``storage/maria/ma_sp_test.c''
      storage/maria/ma_static.c:
        New BitKeeper file ``storage/maria/ma_static.c''
      storage/maria/ma_statrec.c:
        New BitKeeper file ``storage/maria/ma_statrec.c''
      storage/maria/ma_test1.c:
        New BitKeeper file ``storage/maria/ma_test1.c''
      storage/maria/ma_test2.c:
        New BitKeeper file ``storage/maria/ma_test2.c''
      storage/maria/ma_test3.c:
        New BitKeeper file ``storage/maria/ma_test3.c''
      storage/maria/ma_test_all.sh:
        New BitKeeper file ``storage/maria/ma_test_all.sh''
      storage/maria/ma_unique.c:
        New BitKeeper file ``storage/maria/ma_unique.c''
      storage/maria/ma_update.c:
        New BitKeeper file ``storage/maria/ma_update.c''
      storage/maria/ma_write.c:
        New BitKeeper file ``storage/maria/ma_write.c''
      storage/maria/maria_chk.c:
        New BitKeeper file ``storage/maria/maria_chk.c''
      storage/maria/maria_def.h:
        New BitKeeper file ``storage/maria/maria_def.h''
      storage/maria/maria_ftdump.c:
        New BitKeeper file ``storage/maria/maria_ftdump.c''
      storage/maria/maria_log.c:
        New BitKeeper file ``storage/maria/maria_log.c''
      storage/maria/maria_pack.c:
        New BitKeeper file ``storage/maria/maria_pack.c''
      storage/maria/maria_rename.sh:
        New BitKeeper file ``storage/maria/maria_rename.sh''
      storage/maria/test_pack:
        New BitKeeper file ``storage/maria/test_pack''
      storage/myisam/ft_myisam.c:
        New BitKeeper file ``storage/myisam/ft_myisam.c''
      4724d397