1. 07 Oct, 2007 2 commits
    • unknown's avatar
      Comments fixed and added. · 561b6b42
      unknown authored
      561b6b42
    • unknown's avatar
      Optimisation todo for loghandler added. · fd97577f
      unknown authored
      Debug output information fixed.
      Fixed direct page referencing in write mode.
      
      
      storage/maria/ma_loghandler.c:
        TODO added.
      storage/maria/ma_pagecache.c:
        Debug output information fixed.
        Fixed direct page referencing in write mode.
      fd97577f
  2. 06 Oct, 2007 2 commits
    • unknown's avatar
      remove maria_* variables from the server, declare them in ha_maria.cc · 58532a17
      unknown authored
      note: this does *not* move pagecache* variables.
      
      
      sql/mysqld.cc:
        remove maria_* variables from the server, declare them in ha_maria.cc
      sql/set_var.cc:
        remove maria_* variables from the server, declare them in ha_maria.cc
      sql/sql_class.h:
        remove maria_* variables from the server, declare them in ha_maria.cc
      sql/sql_plugin.cc:
        bugfix: support for ENUM/SET thd local plugin variables
      storage/maria/ha_maria.cc:
        remove maria_* variables from the server, declare them in ha_maria.cc
      58532a17
    • unknown's avatar
      after-merge fixes for 64bit · ee0e324c
      unknown authored
      
      storage/maria/ma_test1.c:
        typo (?) fixed
      ee0e324c
  3. 04 Oct, 2007 2 commits
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-maria · 0b3e9103
      unknown authored
      into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-maria.prod
      
      
      BUILD/SETUP.sh:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      storage/maria/ha_maria.cc:
        Auto merged
      storage/maria/ma_check.c:
        Auto merged
      storage/maria/ma_create.c:
        Auto merged
      storage/maria/ma_delete.c:
        Auto merged
      storage/maria/ma_open.c:
        Auto merged
      storage/maria/ma_update.c:
        Auto merged
      storage/maria/ma_write.c:
        Auto merged
      storage/maria/maria_chk.c:
        Auto merged
      storage/maria/maria_def.h:
        Auto merged
      storage/maria/ma_pagecache.c:
        Manual merge with maria tree.
      storage/myisam/sort.c:
        Manual merge with maria tree.
      0b3e9103
    • unknown's avatar
      After merge fixes. Applied changes made in myisam manually to maria. · 243a5d49
      unknown authored
      
      
      storage/maria/ma_test1.c:
        After merge fixes. Applied changes made in myisam manually to maria.
        
        Fixed memory leak.
      storage/maria/ma_test2.c:
        After merge fixes. Applied changes made in myisam manually to maria.
        
        Fixed memory leak.
      243a5d49
  4. 03 Oct, 2007 1 commit
    • unknown's avatar
      WL#3072 Maria recovery. · 08ced364
      unknown authored
      * Thanks to Serg's tip, we fix here the compilation issue of
      REDO_REPAIR_TABLE's execution, by defining versions of
      _ma_killed_ptr() and _ma_check_print_info|warning|error()
      in maria_read_log.c (we move those of maria_chk.c into an include
      file and include it in maria_chk.c and maria_read_log.c).
      Execution of such record looks like working from my tests (it only
      happens in maria_read_log; recovery-from-mysqld skips DDLs and
      REPAIR is considered DDL here as it bypasses logging): tested
      ALTER TABLE ENABLE KEYS and then remove table, apply log: that
      did a repair.
      * Recent changes broke maria_read_log a bit: -a became default
      and -o caused error; fixing this.
      
      
      storage/maria/Makefile.am:
        addind new file
      storage/maria/ma_recovery.c:
        enable execution of REDO_REPAIR_TABLE by maria_read_log now that
        it compiles. Now reason to keep only T_QUICK from testflag.
      storage/maria/maria_chk.c:
        moving these functions to ma_check_standalone.h for reusability
      storage/maria/maria_def.h:
        comment
      storage/maria/maria_read_log.c:
        ma_check_standalone.h needs my_progname_short.
        Fixing bug where "maria_read_log" would default to -a and
        "maria_read_log -o" would throw an error. Implemented behaviour is:
        - no options: usage()
        - -a : applys, applys UNDOs by default unless --disable-undo
        - -o : only prints
      storage/maria/ma_check_standalone.h:
        All standalone programs which need to use functions from ma_check.c
        (like maria_repair()) must define their version of _ma_killed_ptr()
        and _ma_check_print_info|warning|error(). Indeed, linking with ma_check.o
        brings in the dependencies of ma_check.o which are definitions of the above
        functions; if the program does not define them then the ones of
        ha_maria.o are used i.e. ha_maria.o is linked into the program, and this
        brings dependencies of ha_maria.o on mysqld.o into the program's linking
        which thus fails, as the program is not linked with mysqld.o.
        We put in this file the functions which maria_chk.c uses, so that
        they can be reused by maria_read_log (when it replays REDO_REPAIR_TABLE)
        as they are good enough (they just print to stdout/stderr like
        maria_read_log already does).
      08ced364
  5. 02 Oct, 2007 2 commits
    • unknown's avatar
      Fix for pushbuild failure (noticable only on 64-bit) · e030a7af
      unknown authored
      
      storage/maria/ma_pagecache.c:
        pagecache->blocks is now long, takes 8 bytes on some platforms.
        The cast to ulonglong in int8store is for those platforms where
        ulong is 32-bit and int8store uses some << shifts, if there are
        (x<<40 is undefined if x is 32-bit).
      storage/maria/ma_recovery.c:
        this change corresponds to the one done in ma_pagecache.c: number
        of dirty pages is stored in 8 bytes.
      e030a7af
    • unknown's avatar
      WL#3072 - Maria recovery. · 198a1b6f
      unknown authored
      * Recovery of the table's live checksum (CREATE TABLE ... CHECKSUM=1)
      is achieved in this patch. The table's live checksum
      (info->s->state.state.checksum) is updated in inwrite_rec_hook's
      under the log mutex when writing UNDO_ROW_INSERT|UPDATE|DELETE
      and REDO_DELETE_ALL. The checksum variation caused by the operation
      is stored in these UNDOs, so that the REDO phase, when it sees such
      UNDOs, can update the live checksum if it is older (state.is_of_lsn is
      lower) than the record. It is also used, as a nice add-on with no
      cost, to do less row checksum computation during the UNDO phase
      (as we have it in the record already).
      Doing this work, it became pressing to move in-write hooks
      (write_hook_for_redo() et al) to ma_blockrec.c.
      The 'parts' argument of inwrite_rec_hook is unpredictable (it comes
      mangled at this stage, for example by LSN compression) so it is
      replaced by a 'void* hook_arg', which is used to pass down information,
      currently only to write_hook_for_clr_end() (previous undo_lsn and
      type of undone record).
      * If from ha_maria, we print to stderr how many seconds (with one
      fractional digit) the REDO phase took, same for UNDO phase and for
      final table close. Just to give an indication for debugging and maybe
      also for Support.
      
      
      storage/maria/ha_maria.cc:
        question for Monty
      storage/maria/ma_blockrec.c:
        * log in-write hooks (write_hook_for_redo() etc) move from
        ma_loghandler.c to here; this is natural: the hooks are coupled
        to their callers (functions in ma_blockrec.c).
        * translog_write_record() now has a new argument "hook_arg";
        using it to pass down to write_hook_for_clr_end() the transaction's
        previous_undo_lsn and the type of the being undone record, and also
        to pass down to all UNDOs the live checksum variation caused by the
        operation.
        * If table has live checksum, store in UNDO_ROW_INSERT|UPDATE|DELETE
        and in CLR_END the checksum variation ("delta") caused by the
        operation. For example if a DELETE caused the table's live checksum
        to change from 123 to 456, we store in the UNDO_ROW_DELETE, in 4 bytes,
        the value 333 (456-123).
        * Instead of hard-coded "1" as length of the place where we store
        the undone record's type in CLR_END, use a symbol CLR_TYPE_STORE_SIZE;
        use macros clr_type_store and clr_type_korr.
        * write_block_record() has a new parameter 'old_record_checksum'
        which is the pre-computed checksum of old_record; that value is used
        to update the table's live checksum when writing UNDO_ROW_UPDATE|CLR_END.
        * In allocate_write_block_record(), if we are executing UNDO_ROW_DELETE
        the row's checksum is already computed.
        * _ma_update_block_record2() now expect the new row's checksum into
        cur_row.checksum (was already true) and the old row's checksum into
        new_row.checksum (that's new). Its two callers, maria_update() and
        _ma_apply_undo_row_update(), honour this.
        * When executing an UNDO_ROW_INSERT|UPDATE|DELETE in UNDO phase, pick
        up the checksum delta from the log record. It is then used to update
        the table's live checksum when writing CLR_END, and saves us a
        computation of record.
      storage/maria/ma_blockrec.h:
        in-write hooks move from ma_loghandler.c
      storage/maria/ma_check.c:
        more straightforward size of buffer
      storage/maria/ma_checkpoint.c:
        <= is enough
      storage/maria/ma_commit.c:
        new prototype of translog_write_record()
      storage/maria/ma_create.c:
        new prototype of translog_write_record()
      storage/maria/ma_delete.c:
        The row's checksum must be computed before calling(*delete_record)(),
        not after, because it must be known inside _ma_delete_block_record()
        (to update the table's live checksum when writing UNDO_ROW_DELETE).
        If deleting from a transactional table, live checksum was already updated
        when writing UNDO_ROW_DELETE.
      storage/maria/ma_delete_all.c:
        @todo is now done (in ma_loghandler.c)
      storage/maria/ma_delete_table.c:
        new prototype of translog_write_record()
      storage/maria/ma_loghandler.c:
        * in-write hooks move to ma_blockrec.c.
        * translog_write_record() gets a new argument 'hook_arg' which is
        passed down to pre|inwrite_rec_hook. It is more useful that 'parts'
        for those hooks, because when those hooks are called, 'parts' has
        possibly been mangled (like with LSN compression) and is so
        unpredictable.
        * fix for compiler warning (unused buffer_start when compiling without
        debug support)
        * Because checksum delta is stored into UNDO_ROW_INSERT|UPDATE|DELETE
        and CLR_END, but only if the table has live checksum, these records
        are not PSEUDOFIXEDLENGTH anymore, they are now VARIABLE_LENGTH (their
        length is X if no live checksum and X+4 otherwise).
        * add an inwrite_rec_hook for UNDO_ROW_UPDATE, which updates the
        table's live checksum. Update it also in hooks of UNDO_ROW_INSERT|
        DELETE and REDO_DELETE_ALL and CLR_END.
        * Bugfix: when reading a record in translog_read_record(), it happened
        that "length" became negative, because the function assumed that
        the record extended beyond the page's end, whereas it may be shorter.
      storage/maria/ma_loghandler.h:
        * Instead of hard-coded "1" and "4", use symbols and macros
        to store/retrieve the type of record which the CLR_END corresponds
        to, and the checksum variation caused by the operation which logs the
        record
        * translog_write_record() gets a new argument 'hook_arg' which is
        passed down to pre|inwrite_rec_hook. It is more useful that 'parts'
        for those hooks, because when those hooks are called, 'parts' has
        possibly been mangled (like with LSN compression) and is so
        unpredictable.
      storage/maria/ma_open.c:
        fix for "empty body in if() statement" (when compiling without safemutex)
      storage/maria/ma_pagecache.c:
        <= is enough
      storage/maria/ma_recovery.c:
        * print the time that each recovery phase (REDO/UNDO/flush) took;
        this is enabled only when recovering from ha_maria. Is it printed
        n seconds with a fractional part of one digit (like 123.4 seconds).
        * In the REDO phase, update the table's live checksum by using
        the checksum delta stored in UNDO_ROW_INSERT|DELETE|UPDATE and CLR_END.
        Update it too when seeing REDO_DELETE_ALL.
        * In the UNDO phase, when executing UNDO_ROW_INSERT, if the table does
        not have live checksum then reading the record's header (as done by
        the master loop of run_undo_phase()) is enough; otherwise we
        do a translog_read_record() to have the checksum delta ready
        for _ma_apply_undo_row_insert().
        * When at the end of the REDO phase we notice that there is an unfinished
        group of REDOs, don't assert in debug binaries, as I verified that it
        can happen in real life (with kill -9)
        * removing ' in #error as it confuses gcc3
      storage/maria/ma_rename.c:
        new prototype of translog_write_record()
      storage/maria/ma_test_recovery.expected:
        Change in output of ma_test_recovery: now all live checksums of
        original tables equal those of tables recreated by the REDO phase
        and those of tables fixed by the UNDO phase. I.e. recovery of
        the live checksum looks like working (which was after all the only
        goal of this changeset).
        I checked by hand that it's not just all live checksums which are
        now 0 and that's why they match. They are the old values like
        3757530372. maria.test has hard-coded checksum values in its result
        file so checks this too.
      storage/maria/ma_update.c:
        * It's useless to put up HA_STATE_CHANGED in 'key_changed',
        as we put up HA_STATE_CHANGED in info->update anyway.
        * We need to compute the old and new rows' checksum before calling
        (*update_record)(), as checksum delta must be known when logging
        UNDO_ROW_UPDATE which is done by _ma_update_block_record(). Note that
        some functions change the 'newrec' record (at least _ma_check_unique()
        does) so we cannot move the checksum computation too early in the
        function.
      storage/maria/ma_write.c:
        If inserting into a transactional table, live's checksum was
        already updated when writing UNDO_ROW_INSERT. The multiplication
        is a trick to save an if().
      storage/maria/unittest/ma_test_loghandler-t.c:
        new prototype of translog_write_record()
      storage/maria/unittest/ma_test_loghandler_first_lsn-t.c:
        new prototype of translog_write_record()
      storage/maria/unittest/ma_test_loghandler_max_lsn-t.c:
        new prototype of translog_write_record()
      storage/maria/unittest/ma_test_loghandler_multigroup-t.c:
        new prototype of translog_write_record()
      storage/maria/unittest/ma_test_loghandler_multithread-t.c:
        new prototype of translog_write_record()
      storage/maria/unittest/ma_test_loghandler_noflush-t.c:
        new prototype of translog_write_record()
      storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
        new prototype of translog_write_record()
      storage/maria/unittest/ma_test_loghandler_purge-t.c:
        new prototype of translog_write_record()
      storage/myisam/sort.c:
        fix for compiler warnings in pushbuild (write_merge_key* functions
        didn't have their declaration match MARIA_HA::write_key).
      198a1b6f
  6. 01 Oct, 2007 6 commits
    • unknown's avatar
      Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria · da6db764
      unknown authored
      into  desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria-recovery
      
      da6db764
    • unknown's avatar
      Fixed problem with scanner destruction (unpinned page in the cache). · 108307b8
      unknown authored
      
      storage/maria/ma_loghandler.c:
        Debug output adder to control scanner freeing.
        Fixed problem with scanner destruction (unpinned page in the cache).
      108307b8
    • unknown's avatar
      Fix for "innodb_mysql" and "events" failures: we can disable transactionality · 426158e2
      unknown authored
      in CREATE SELECT only if the table is not temporary (because
      re-enabling causes a commit). In the future we should disable
      again for temporary tables; that will probably require changing
      ha_enable_transaction().
      
      
      sql/sql_insert.cc:
        When we disable transactionality in CREATE SELECT, we re-enable it
        at the end and this causes a commit (inside ha_enable_transaction());
        but this is undesired if the created table is temporary (we don't
        want CREATE TEMPORARY TABLE SELECT to commit all previous statements).
        So we disable logging only if the table is not temporary.
        Ideally in the future we would want to lift this restriction which
        sounds stupid, but for Maria it does not matter now (temporary
        tables are not transactional yet).
      426158e2
    • unknown's avatar
      fater way to detect last page address for the last log file. · ef3a5b5f
      unknown authored
      gprof build for amd64.
      
      
      storage/maria/ma_loghandler.c:
        fater way to detect last page address for the last log file.
      BUILD/compile-amd64-gprof-no-ndb:
        New BitKeeper file ``BUILD/compile-amd64-gprof-no-ndb''
      ef3a5b5f
    • unknown's avatar
      ma_recovery.c: · 4881ab88
      unknown authored
        SCCS merged
      
      
      storage/maria/ma_recovery.c:
        SCCS merged
      4881ab88
    • unknown's avatar
      Incorrect function call fixed. · be4d74e7
      unknown authored
      be4d74e7
  7. 27 Sep, 2007 7 commits
    • unknown's avatar
      fix typo · a4bcd5fe
      unknown authored
      a4bcd5fe
    • unknown's avatar
      Fixed merge problems. · 9d4b45f1
      unknown authored
      
      BitKeeper/etc/ignore:
        Added libmysql_r/client_settings.h libmysqld/scheduler.cc libmysqld/sql_connect.cc libmysqld/sql_tablespace.cc to the ignore list
      9d4b45f1
    • unknown's avatar
      Merge pwbook.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria · cc0f7413
      unknown authored
      into  pwbook.sanja.is.com.ua:/home/bell/mysql/bk/work-maria-logref
      
      cc0f7413
    • unknown's avatar
      Faster translog_filename_by_fileno · adf58790
      unknown authored
      Fixed compiler warning
      PAGECACHE_PAGE_LINK -> PAGECACHE_BLOCK_LINK*
      
      
      storage/maria/ma_loghandler.h:
        PAGECACHE_PAGE_LINK -> PAGECACHE_BLOCK_LINK*
      storage/maria/ma_pagecache.c:
        PAGECACHE_PAGE_LINK -> PAGECACHE_BLOCK_LINK*
      storage/maria/ma_pagecache.h:
        PAGECACHE_PAGE_LINK -> PAGECACHE_BLOCK_LINK*
      storage/maria/maria_def.h:
        PAGECACHE_PAGE_LINK -> PAGECACHE_BLOCK_LINK*
      adf58790
    • unknown's avatar
      Use direct memory access for the log scan · 916fe818
      unknown authored
      
      BUILD/SETUP.sh:
        compile maria by default
      916fe818
    • unknown's avatar
      Merge hynda.mysql.fi:/home/my/mysql-5.1-main · fb6dfc83
      unknown authored
      into  hynda.mysql.fi:/home/my/mysql-maria
      
      
      BitKeeper/etc/ignore:
        auto-union
      BUILD/SETUP.sh:
        Auto merged
      BitKeeper/deleted/.del-CMakeLists.txt~99a50df6:
        Auto merged
      Makefile.am:
        Auto merged
      client/mysqldump.c:
        Auto merged
      configure.in:
        Auto merged
      include/Makefile.am:
        Auto merged
      include/keycache.h:
        Auto merged
      include/m_string.h:
        Auto merged
      include/my_sys.h:
        Auto merged
      libmysqld/Makefile.am:
        Auto merged
      mysql-test/extra/rpl_tests/rpl_insert_delayed.test:
        Auto merged
      mysql-test/lib/mtr_cases.pl:
        Auto merged
      mysql-test/lib/mtr_misc.pl:
        Auto merged
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/lib/mtr_report.pl:
        Auto merged
      mysql-test/lib/mtr_timer.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/alter_table.result:
        Auto merged
      mysql-test/r/merge.result:
        Auto merged
      mysql-test/r/mysqldump.result:
        Auto merged
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/suite/ndb/r/ps_7ndb.result:
        Auto merged
      mysql-test/suite/rpl/r/rpl_events.result:
        Auto merged
      mysql-test/suite/rpl/r/rpl_insert.result:
        Auto merged
      mysql-test/suite/rpl/r/rpl_row_insert_delayed.result:
        Auto merged
      mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result:
        Auto merged
      mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result:
        Auto merged
      mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result:
        Auto merged
      mysql-test/suite/rpl/t/rpl_insert.test:
        Auto merged
      mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test:
        Auto merged
      mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test:
        Auto merged
      mysql-test/t/alter_table.test:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      mysys/array.c:
        Auto merged
      mysys/mf_keycache.c:
        Auto merged
      mysys/my_init.c:
        Auto merged
      mysys/my_symlink2.c:
        Auto merged
      mysys/safemalloc.c:
        Auto merged
      mysys/thr_lock.c:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/filesort.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_partition.cc:
        Auto merged
      sql/ha_partition.h:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_xmlfunc.cc:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/net_serv.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/slave.h:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      sql/sql_test.cc:
        Auto merged
      sql/table.h:
        Auto merged
      sql/udf_example.c:
        Auto merged
      sql/uniques.cc:
        Auto merged
      sql/unireg.cc:
        Auto merged
      storage/csv/ha_tina.h:
        Auto merged
      storage/myisam/ft_boolean_search.c:
        Auto merged
      storage/myisam/ft_nlq_search.c:
        Auto merged
      storage/myisam/ft_parser.c:
        Auto merged
      storage/myisam/ft_stopwords.c:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Auto merged
      storage/myisam/ha_myisam.h:
        Auto merged
      storage/myisam/mi_check.c:
        Auto merged
      storage/myisam/mi_create.c:
        Auto merged
      storage/myisam/mi_delete.c:
        Auto merged
      storage/myisam/mi_dynrec.c:
        Auto merged
      storage/myisam/mi_extra.c:
        Auto merged
      storage/myisam/mi_key.c:
        Auto merged
      storage/myisam/mi_locking.c:
        Auto merged
      storage/myisam/mi_log.c:
        Auto merged
      storage/myisam/mi_packrec.c:
        Auto merged
      storage/myisam/mi_rkey.c:
        Auto merged
      storage/myisam/mi_search.c:
        Auto merged
      storage/myisam/mi_test1.c:
        Auto merged
      storage/myisam/mi_test2.c:
        Auto merged
      storage/myisam/mi_update.c:
        Auto merged
      storage/myisam/mi_write.c:
        Auto merged
      storage/myisam/myisamchk.c:
        Auto merged
      storage/myisam/myisamlog.c:
        Auto merged
      storage/myisam/myisampack.c:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      storage/myisam/sp_test.c:
        Auto merged
      storage/myisammrg/ha_myisammrg.cc:
        Auto merged
      storage/myisammrg/ha_myisammrg.h:
        Auto merged
      storage/ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      support-files/compiler_warnings.supp:
        Auto merged
      client/mysqltest.c:
        Manual merge between mysql-5.1 and mysql-maria
      include/my_base.h:
        Manual merge between mysql-5.1 and mysql-maria
      include/my_global.h:
        Manual merge between mysql-5.1 and mysql-maria
      include/myisam.h:
        Manual merge between mysql-5.1 and mysql-maria
      libmysql/Makefile.shared:
        Manual merge between mysql-5.1 and mysql-maria
      mysql-test/r/events_logs_tests.result:
        Manual merge between mysql-5.1 and mysql-maria
      mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result:
        Manual merge between mysql-5.1 and mysql-maria
      mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test:
        Manual merge between mysql-5.1 and mysql-maria
      mysql-test/t/disabled.def:
        Manual merge between mysql-5.1 and mysql-maria
      mysql-test/t/events_logs_tests.test:
        Manual merge between mysql-5.1 and mysql-maria
      mysys/my_compress.c:
        Manual merge between mysql-5.1 and mysql-maria
      mysys/my_getsystime.c:
        Manual merge between mysql-5.1 and mysql-maria
      mysys/my_open.c:
        Manual merge between mysql-5.1 and mysql-maria
      sql/handler.cc:
        Manual merge between mysql-5.1 and mysql-maria
      sql/set_var.h:
        Manual merge between mysql-5.1 and mysql-maria
      sql/sql_class.h:
        Manual merge between mysql-5.1 and mysql-maria
      sql/sql_show.cc:
        Manual merge between mysql-5.1 and mysql-maria
      sql/sql_sort.h:
        Manual merge between mysql-5.1 and mysql-maria
      sql/sql_yacc.yy:
        Manual merge between mysql-5.1 and mysql-maria
      sql/table.cc:
        Manual merge between mysql-5.1 and mysql-maria
      storage/csv/ha_tina.cc:
        Manual merge between mysql-5.1 and mysql-maria
      storage/myisam/mi_open.c:
        Manual merge between mysql-5.1 and mysql-maria
      storage/myisam/myisamdef.h:
        Manual merge between mysql-5.1 and mysql-maria
      unittest/mysys/my_atomic-t.c:
        Manual merge between mysql-5.1 and mysql-maria
      fb6dfc83
    • unknown's avatar
      Remove SAFE_MODE for opt_range as it disables UPDATE to use keys · e914e469
      unknown authored
      REDO optimization (Bascily avoid moving blocks from/to pagecache)
      More command line arguments to maria_read_log
      Fixed recovery bug when recreating table
      
      
      sql/opt_range.cc:
        Remove SAFE_MODE for opt_range as it disables UPDATE to use keys
      storage/maria/ma_blockrec.c:
        REDO optimization
        Use new interface for pagecache_reads to avoid copying page buffers
      storage/maria/ma_loghandler.c:
        Patch from Sanja:
        - Added new parameter to translog_get_page to use direct links to pagecache
        - Changed scanner to be able to use direct links
        
        This avoids a lot of calls to bmove512() in page cache.
      storage/maria/ma_loghandler.h:
        Added direct link to pagecache objects
      storage/maria/ma_open.c:
        Added const to parameter
        Added missing braces
      storage/maria/ma_pagecache.c:
        From Sanja:
        - Added direct links to pagecache (from pagecache_read())
          Dirrect link means that on pagecache_read we get back a pointer to the pagecache buffer
        
        
        From Monty:
        - Fixed arguments to init_page_cache to handle big page caches
        - Fixed compiler warnings
        - Replaced PAGECACHE_PAGE_LINK with PAGECACHE_BLOCK_LINK * to catch errors
      storage/maria/ma_pagecache.h:
        Changed block numbers from int to long to be able to handle big page caches
        Changed some PAGECACHE_PAGE_LINK to PAGECACHE_BLOCK_LINK
      storage/maria/ma_recovery.c:
        Fixed recovery bug when recreating table (table was kept open)
        Moved some variables to function start (portability)
        Added space to some print messages
      storage/maria/maria_chk.c:
        key_buffer_size -> page_buffer_size
      storage/maria/maria_def.h:
        Changed default page_buffer_size to 10M
      storage/maria/maria_read_log.c:
        Added more startup options:
        --version
        --undo (apply undo)
        --page_cache_size (to run with big cache sizes)
        --silent (to not get any output from --apply)
      storage/maria/unittest/ma_control_file-t.c:
        Fixed compiler warning
      storage/maria/unittest/ma_test_loghandler-t.c:
        Added new argument to translog_init_scanner()
      storage/maria/unittest/ma_test_loghandler_multigroup-t.c:
        Added new argument to translog_init_scanner()
      storage/maria/unittest/ma_test_loghandler_multithread-t.c:
        Added new argument to translog_init_scanner()
      e914e469
  8. 25 Sep, 2007 5 commits
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 574e9689
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      574e9689
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1 · 97ab5f49
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
        Auto merged
      mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
        Auto merged
      97ab5f49
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · 8a4a21e2
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
      
      8a4a21e2
    • unknown's avatar
      WL#3072 Maria recovery · 3560de49
      unknown authored
      Minor change: decouple the writing of a recovery trace from
      compilation with --with-debug; that writing happens if and only
      if EXTRA_DEBUG. So one can enable (by defining EXTRA_DEBUG) a recovery trace
      in a non-debug build.
      
      
      storage/maria/ma_recovery.c:
        Small optimization. Decouple recovery trace from --with-debug.
      3560de49
    • unknown's avatar
      WL#3072 Maria recovery · 4c90a51d
      unknown authored
      Progress reports on stderr if doing recovery from ha_maria;
      don't do checkpoints if activity since last checkpoint < 2MB
      (no change in fact as background thread is disabled for now);
      recovery trace is only if EXTRA_DEBUG now (better for benchmarks).
      
      
      storage/maria/ma_checkpoint.c:
        don't do checkpoints if activity (log writes plus page flushes)
        since last checkpoint was < 2MB.
      storage/maria/ma_recovery.c:
        progress reports in recovery (10%, transactions left to rollback etc);
        that is only if from ha_maria and is displayed on stderr.
        Recovery trace is now created only if EXTRA_DEBUG.
      storage/maria/ma_test_recovery.expected:
        update (--debug gone)
      storage/maria/ma_test_recovery:
        don't use --debug, as it can absent from binary
      4c90a51d
  9. 24 Sep, 2007 2 commits
    • unknown's avatar
      Merge production.mysql.com:/usersnfs/jperkin/bk/build-5.0 · 281e6d03
      unknown authored
      into  production.mysql.com:/usersnfs/jperkin/bk/build-5.1
      
      
      BitKeeper/deleted/.del-CMakeLists.txt~dd682cce1d53c0b4:
        Auto merged
      281e6d03
    • unknown's avatar
      Optimization (useful at least for the Maria engine): we disable · 751cdc41
      unknown authored
      logging of insertions made by CREATE SELECT.
      
      
      sql/sql_insert.cc:
        If error during the CREATE SELECT we drop the table, so no need for
        engines to do logging of the insertions (optimization). Engines
        require that disabling is done before locking and re-enabling is done
        before unlocking; as table creation and locking is done as one
        function (create_table_from_items()) we disable before calling
        this function and re-enable before unlocking, in send_eof() (called
        if success) and abort() (called if error).
        Question for reviewer: would it be better to do the disabling between
        creation and locking, so inside create_table_from_items(), given
        that this function is used only by CREATE SELECT?
      751cdc41
  10. 22 Sep, 2007 1 commit
  11. 21 Sep, 2007 4 commits
  12. 20 Sep, 2007 6 commits
    • unknown's avatar
      In non-debug builds, the log handler failed to read any log · c22b1cd7
      unknown authored
      record (for example in ma_test_loghandler-t). Reason was
      wrongly matched () in DBUG.
      
      
      storage/maria/ma_loghandler.c:
        Wrongly matched parenthesis:
        DBUG_PRINT(keyword, argslist) expands to roughly
        _db_doprnt arglist;
        So DBUG_PRINT("enter",(a);
        b;
        c);
        expands to roughly
        _db_doprnt(a);b;c;
        which is valid code. Except that in non-debug builds, DBUG_PRINT(
        expands to nothing so the wrongly "included" code is thrown away,
        leading to some members of "scanner" to not be initialized.
      c22b1cd7
    • unknown's avatar
      fix for non-debug compilation errors. · 0cda94a3
      unknown authored
      Note that non-debug build fails in log handler functions, mail sent.
      
      
      storage/maria/ma_blockrec.c:
        fix for compiler warning
      storage/maria/ma_checkpoint.c:
        Debug build does not catch this situation
        static int f();
        ...
        f(2);
        ...
        static int f(int a, int b);
        Maybe this is because it believes the declaration is K&R. Non-debug
        build catches it. Adding (void) as an habit to avoid such errors.
      storage/maria/ma_checkpoint.h:
        adding (void)
      storage/maria/ma_recovery.c:
        adding (void)
      storage/maria/ma_recovery.h:
        adding (void)
      0cda94a3
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 88fac6e7
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      88fac6e7
    • unknown's avatar
      result fix · 6c0bab6a
      unknown authored
      6c0bab6a
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · acea00c1
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      mysql-test/r/grant.result:
        Auto merged
      acea00c1
    • unknown's avatar
      result fix · bf3d46a8
      unknown authored
      bf3d46a8