1. 01 Feb, 2009 1 commit
  2. 31 Jan, 2009 1 commit
    • Michael Widenius's avatar
      Fixed compiler warnings found by gcc 4.3.2 · bd4e6551
      Michael Widenius authored
      - Added braces around expressions with &&, ||, & and |
      - Added empty line before ; for empty while and for loops
      - Added () around if with assignments
      - Removed const before function returning simple type
      
      Changed BUILD scripts to not build with NDB 
      
      
      BUILD/SETUP.sh:
        By default, don't build ndb with --max in Maria tree.
        NDB is not kept up to date anyway in 5.1
      client/mysql.cc:
        Added braces around && to get rid of compiler warnings
      sql/event_db_repository.cc:
        Added braces around && to get rid of compiler warnings
      sql/events.cc:
        Added braces around && to get rid of compiler warnings
      sql/field.cc:
        Added braces around && to get rid of compiler warnings
        Fixed for loops
      sql/field.h:
        Added braces around & to get rid of compiler warnings
      sql/field_conv.cc:
        Added braces around && to get rid of compiler warnings
        Fixed bug when copying between DATETIME fields and strict dates are used
        Removed not needeed else
      sql/gstream.cc:
        Added braces around && to get rid of compiler warnings
      sql/ha_ndbcluster.cc:
        Added braces around && to get rid of compiler warnings
        Added {} to get rid of compiler warnings
      sql/handler.cc:
        Added braces around && to get rid of compiler warnings
      sql/item.cc:
        Added braces around && to get rid of compiler warnings
      sql/item_cmpfunc.cc:
        Added braces around && to get rid of compiler warnings
        Removed some not needed space
      sql/item_func.cc:
        Added braces around && to get rid of compiler warnings
      sql/item_strfunc.cc:
        Added braces around && to get rid of compiler warnings
      sql/item_subselect.cc:
        Added braces around && to get rid of compiler warnings
      sql/item_sum.cc:
        Added braces around && to get rid of compiler warnings
      sql/item_timefunc.cc:
        Added braces around && to get rid of compiler warnings
      sql/item_xmlfunc.cc:
        Added empty line before ; for empty while and for loops
      sql/log.cc:
        Added braces around && to get rid of compiler warnings
      sql/log_event.cc:
        Added braces around && to get rid of compiler warnings
        Removed not needed else
      sql/log_event_old.cc:
        Added braces around && to get rid of compiler warnings
      sql/opt_range.cc:
        Added braces around && to get rid of compiler warnings
      sql/opt_sum.cc:
        Added braces around && to get rid of compiler warnings
      sql/set_var.cc:
        Added empty line before ; for empty while and for loops
        Added () around if with assignments
      sql/slave.cc:
        Added braces around && to get rid of compiler warnings
        Added empty line before ; for empty while and for loops
      sql/spatial.h:
        Added braces around && to get rid of compiler warnings
      sql/sql_acl.cc:
        Added braces around && to get rid of compiler warnings
      sql/sql_analyse.cc:
        Added empty line before ; for empty while and for loops
      sql/sql_base.cc:
        Added braces around && to get rid of compiler warnings
      sql/sql_connect.cc:
        Added braces around && to get rid of compiler warnings
      sql/sql_db.cc:
        Added braces around && to get rid of compiler warnings
      sql/sql_delete.cc:
        Added braces around && to get rid of compiler warnings
      sql/sql_help.cc:
        Added empty line before ; for empty while and for loops
      sql/sql_insert.cc:
        Added braces around && to get rid of compiler warnings
        Added () around if with assignments
      sql/sql_lex.cc:
        Cast char array references to uchar; Fixed wrong array referencing when using characters > ASCII 128 in SQL statments
        Added empty line before ; for empty while and for loops
        Trivial indent fixes
        Added braces around && to get rid of compiler warnings
      sql/sql_load.cc:
        Added braces around && to get rid of compiler warnings
      sql/sql_parse.cc:
        Added braces around && to get rid of compiler warnings
      sql/sql_partition.cc:
        Added braces around && to get rid of compiler warnings
      sql/sql_plugin.cc:
        Fixed bug in detecing if option variable should be readonly
        Added empty line before ; for empty while and for loops
      sql/sql_prepare.cc:
        Added braces around && to get rid of compiler warnings
      sql/sql_select.cc:
        Added braces around && to get rid of compiler warnings
        Added () around if with assignments
        Added empty line before ; for empty while and for loops
      sql/sql_show.cc:
        Added braces around && to get rid of compiler warnings
      sql/sql_table.cc:
        Added braces around && to get rid of compiler warnings
      sql/sql_trigger.cc:
        Added braces around && to get rid of compiler warnings
      sql/sql_update.cc:
        Added braces around && to get rid of compiler warnings
      sql/sql_yacc.yy:
        Added braces around && to get rid of compiler warnings
      sql/table.cc:
        Added braces around && to get rid of compiler warnings
      sql/table.h:
        Added braces around && to get rid of compiler warnings
      sql/time.cc:
        Added braces around && to get rid of compiler warnings
      sql/tztime.cc:
        Added braces around && to get rid of compiler warnings
      sql/uniques.cc:
        Added braces around && to get rid of compiler warnings
      storage/federated/ha_federated.cc:
        Fixed bug in testing of variable to ha_info() (Not critical)
      storage/heap/ha_heap.cc:
        Added braces around && to get rid of compiler warnings
      storage/maria/ha_maria.cc:
        Fixed bug: Mark that maria_log_dir_path is readonly
        Added braces around && to get rid of compiler warnings
      storage/ndb/include/ndbapi/NdbEventOperation.hpp:
        Removed const before function returning simple type
      storage/ndb/include/ndbapi/NdbOperation.hpp:
        Removed const before function returning simple type
      storage/ndb/src/ndbapi/Ndb.cpp:
        Added empty line before ; for empty while and for loops
      storage/ndb/src/ndbapi/NdbEventOperation.cpp:
        Removed const before function returning simple type
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
        Removed const before function returning simple type
      storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
        Removed const before function returning simple type
      storage/ndb/src/ndbapi/NdbRecAttr.cpp:
        Added empty line before ; for empty while and for loops
      storage/ndb/src/ndbapi/TransporterFacade.hpp:
        Added braces around && to get rid of compiler warnings
      bd4e6551
  3. 30 Jan, 2009 1 commit
    • Michael Widenius's avatar
      Merge with mysql-maria · 37db97b0
      Michael Widenius authored
      Changed _ma_ft_convert_to_ft2() to my_bool
      
      storage/maria/ma_ft_update.c:
        Changed _ma_ft_convert_to_ft2() to my_bool
      storage/maria/ma_fulltext.h:
        Changed _ma_ft_convert_to_ft2() to my_bool
      storage/maria/ma_write.c:
        Manual merge
        Changed _ma_ft_convert_to_ft2() to my_bool
      37db97b0
  4. 19 Jan, 2009 1 commit
  5. 16 Jan, 2009 7 commits
    • Sergei Golubchik's avatar
      merged · e3da48ba
      Sergei Golubchik authored
      e3da48ba
    • Sergei Golubchik's avatar
      bug#41963 Maria: error_simulation and subselect_debug fail · 141a75fa
      Sergei Golubchik authored
      added a missing DBUG_VOID_RETURN
      141a75fa
    • Guilhem Bichot's avatar
      merge · 92c42182
      Guilhem Bichot authored
      92c42182
    • Guilhem Bichot's avatar
      Fix for BUG#42112 "Maria: recovery failure (pushbuild2) Assertion `rownr == 0 && new_page' failed" · 3907cb1d
      Guilhem Bichot authored
      mysql-test/suite/maria/r/maria-recovery3.result:
        result update
      mysql-test/suite/maria/t/maria-recovery3.test:
        Test for BUG#42112; before the bugfix, recovery would assert like this:
        ma_blockrec.c:6051: _ma_apply_redo_insert_row_head_or_tail: Assertion `rownr == 0 && new_page' failed.
      storage/maria/ma_create.c:
        Fix for BUG#42112; plus some intentional crashes to test the fix. The bug was that if crash happened during
        TRUNCATE TABLE, in maria_create(), after the index file's state has been written but before its LSNs
        have been updated (so, if crash happened between _ma_state_info_write_sub() and _ma_update_state__lsns_sub()),
        then that would leave a table with create_rename_lsn==0. Recovery would then try old pre-TRUNCATE REDOs
        on this table, and fail as this table is already partly shortened. Fix is to write create_rename_lsn==LSN_MAX
        as soon as TRUNCATE touches the index file, so that Recovery ignores this table. This allows Maria to start;
        the table is still corrupted but the user can successfully repeat TRUNCATE TABLE (which required Maria to start).
      storage/maria/ma_delete_all.c:
        A comment.
      3907cb1d
    • Sergei Golubchik's avatar
      mysql-test-run --list-options · 5a6a6c2e
      Sergei Golubchik authored
      5a6a6c2e
    • Sergei Golubchik's avatar
      merged · 60f3a340
      Sergei Golubchik authored
      trnman_get_state/trnman_set_state renamed to trnman_get/set_flags
      TRN::state - to TRN::flags accordingly
      60f3a340
    • Michael Widenius's avatar
      Fixed issues in last push found by pushbuild · 364f8611
      Michael Widenius authored
      sql/sql_insert.cc:
        Removed DBUG_ASSERT() that is triggered by deadlock-innodb test
      storage/maria/ma_loghandler.c:
        Removed compiler warnings
      storage/maria/trnman_public.h:
        Fixed wrong code from last push
      364f8611
  6. 15 Jan, 2009 4 commits
    • Michael Widenius's avatar
      Log queries to maria_log if compiled with EXTRA_DEBUG · 3fca2390
      Michael Widenius authored
      Added DBUG_ASSERT() to unlikely error senario
      Don't use errno == 0 in maria_create() / myisam_create()
      
      sql/sql_insert.cc:
        Added DBUG_ASSERT() for case that should never happen in real life
        Added my_error() to avoid assert if mysql_lock() or postlock() doesn't call my_error()
      storage/maria/ha_maria.cc:
        Log queries to maria_log if compiled with EXTRA_DEBUG
      storage/maria/ma_create.c:
        Don't use errno == 0
      storage/maria/ma_loghandler.c:
        Added logging of debug info to maria_log
      storage/maria/ma_loghandler.h:
        Added logging of debug info to maria_log
      storage/maria/ma_recovery.c:
        Added printing of debug info from maria_log
      storage/maria/trnman.c:
        Added functions to read/store state in TRN
      storage/maria/trnman.h:
        Added functions to read/store state in TRN
      storage/maria/trnman_public.h:
        Added state in TRN to remmeber if we have already logged the query
      storage/myisam/mi_create.c:
        Don't use errno == 0
      3fca2390
    • Sergei Golubchik's avatar
      post-review fixes · 9c96fde1
      Sergei Golubchik authored
      include/atomic/generic-msvc.h:
        prevent possible compiler warnings
      include/lf.h:
        comments, better definition for LF_HASH_OVERHEAD
      include/maria.h:
        define MARIA_CANNOT_ROLLBACK here
      include/my_pthread.h:
        avoid possible name clash
      include/waiting_threads.h:
        comments, const, move WT_RESOURCE to waiting_threads.c
      mysql-test/suite/maria/r/maria_notembedded.result:
        new test
      mysql-test/suite/maria/t/maria_notembedded.test:
        new test - 5-way deadlock
      mysys/lf_hash.c:
        better definition for LF_HASH_OVERHEAD
      mysys/my_static.c:
        comment
      mysys/my_thr_init.c:
        casts
      mysys/waiting_threads.c:
        comments, asserts, etc
      server-tools/instance-manager/parse.cc:
        fix my_init_dynamic_array() to follow new calling conventions
      sql/mysqld.cc:
        call wt_init after set_proper_floating_point_mode
      sql/sql_class.h:
        comment
      storage/maria/ha_maria.cc:
        move MARIA_CANNOT_ROLLBACK to a common header
      storage/maria/ma_commit.c:
        comment
      storage/maria/ma_write.c:
        comments, check for HA_ERR_FOUND_DUPP_KEY
      storage/maria/trnman.c:
        comments, assert
      storage/maria/trnman.h:
        comments
      storage/maria/unittest/trnman-t.c:
        be paranoid
      unittest/mysys/lf-t.c:
        comments
      unittest/mysys/waiting_threads-t.c:
        comments, safety, memory leak
      9c96fde1
    • Guilhem Bichot's avatar
      Fix for BUG#41493 "Maria: two recovery failures (wrong logging of BLOB pages)"... · a955efc4
      Guilhem Bichot authored
      Fix for BUG#41493 "Maria: two recovery failures (wrong logging of BLOB pages)" and some more debugging
      output related to this.
      
      mysql-test/suite/maria/r/maria-recovery3.result:
        result update
      mysql-test/suite/maria/t/maria-recovery3.test:
        Test for bug; before the fix, the "CHECK TABLE EXTENDED" would mention a bad bitmap, because the
        REDO_INSERT_ROW_BLOBS was containing a page number which was actually the one of a tail, so execution of this
        record would mark the tail page as full in bitmap (like if it were a blob page), though it wasn't full.
        Also, the assertion added around ma_blockrec.c:6580 in the present revision fired.
      storage/maria/ma_blockrec.c:
        - fix for BUG#41493: if we found out that logging was not needed at this point (blob_length==0 i.e. tail page),
        then we forgot to increment tmp_block, so in the second iteration (assuming two BLOB columns), we would log the
        page range of the first iteration (i.e. the tail page's number) for this second BLOB, which would cause
        Recovery to overwrite the tail page with the second BLOB.
        - assert when marking the table corrupted during REDO phase; this catches some problems earlier
        otherwise they get caught only when a later record wants to use the table.
        - _ma_apply_redo_insert_row_blobs() now fills some synthetic info about the blobs and pages involved
        in a REDO_INSERT_ROW_BLOBS record, for inclusion into maria_recovery.trace: number of blobs, of ranges,
        first and last page (does not tell about any gaps in the middle, but good enough for now). It also asserts
        that it's not overwriting a tail/head page (which happened in the bug).
      storage/maria/ma_blockrec.h:
        new prototype for _ma_apply_redo_insert_row_blobs
      storage/maria/ma_recovery.c:
        Print info got from _ma_apply_redo_insert_row_blobs() to maria_recovery.trace (so far this file had mentioned
        what head and tail pages a record touched, but not blob pages).
      a955efc4
    • Guilhem Bichot's avatar
      Fix for BUG#42012 "Maria: test maria-recovery2 fails with --embedded" and for simple failures · ae3aaa5e
      Guilhem Bichot authored
      of Maria tests with --big (back-ports from 6.0-maria)
      
      mysql-test/suite/maria/r/maria-big.result:
        result update
      mysql-test/suite/maria/r/maria-recovery-big.result:
        result update
      mysql-test/suite/maria/t/maria-big.test:
        this test didn't work anymore due to changes in 5.1 around max_allowed_packet allowed settings
        (fix back-ported from 6.0-maria)
      mysql-test/suite/maria/t/maria-recovery-big-master.opt:
        this test didn't work anymore due to changes in 5.1 around max_allowed_packet allowed settings
        (fix back-ported from 6.0-maria)
      mysql-test/suite/maria/t/maria-recovery-big.test:
        this test didn't work anymore due to changes in 5.1 around max_allowed_packet allowed settings
        (fix back-ported from 6.0-maria)
      mysql-test/suite/maria/t/maria-recovery2-master.opt:
        Fix for BUG#42012 "Maria: test maria-recovery2 fails with --embedded": file is updated like
        maria-recovery-master.opt had already been in guilhem@mysql.com-20080701204709-pa4megwfvllq3s7g
      ae3aaa5e
  7. 13 Jan, 2009 1 commit
  8. 12 Jan, 2009 2 commits
  9. 09 Jan, 2009 2 commits
    • Michael Widenius's avatar
      Code cleanup: · 7eda7f13
      Michael Widenius authored
      - Removed not needed casts
      - Indentation fixes
      - Changed some buffer variables to uchar, to be able to remove casts
      
      
      storage/maria/ma_bitmap.c:
        Removed not needed casts
      storage/maria/ma_blockrec.c:
        Removed not needed casts
      storage/maria/ma_check.c:
        Removed not needed casts.
        Changed type of buffers to be able to remove casts
      storage/maria/ma_create.c:
        Removed not needed casts
      storage/maria/ma_delete.c:
        Removed not needed casts
      storage/maria/ma_dynrec.c:
        Removed not needed casts
      storage/maria/ma_extra.c:
        Removed not needed casts
      storage/maria/ma_ft_boolean_search.c:
        Removed not needed casts
      storage/maria/ma_ft_nlq_search.c:
        Removed not needed casts
      storage/maria/ma_ft_parser.c:
        Removed not needed casts
      storage/maria/ma_loghandler.c:
        Removed not needed casts
      storage/maria/ma_open.c:
        Removed not needed casts
      storage/maria/ma_packrec.c:
        Removed not needed casts
      storage/maria/ma_pagecache.c:
        Removed not needed casts
      storage/maria/ma_preload.c:
        Removed not needed casts
        Removed not needed initialization
      storage/maria/ma_rnext_same.c:
        Removed not needed casts
      storage/maria/ma_rt_index.c:
        Removed not needed casts
      storage/maria/ma_search.c:
        Removed not needed casts
      storage/maria/ma_sort.c:
        Removed not needed casts
        Removed not needed if
        Fixed indentation
      storage/maria/ma_statrec.c:
        Removed not needed casts
      storage/maria/ma_test2.c:
        Removed not needed casts
      storage/maria/ma_write.c:
        Removed not needed casts
        Indentation fixes
      storage/maria/maria_chk.c:
        Removed not needed casts
      storage/maria/maria_pack.c:
        Removed not needed casts
      7eda7f13
    • Michael Widenius's avatar
      Fixed bugs from my latest patch found by pushbuild: · 7dc83c50
      Michael Widenius authored
      Bug #41962 Maria: view-related test failures (insert, view, maria, trigger tests)
      Added error handling for wrong update of view.
      See Bug #41760 Inserting into multiple-table views is not working
      
      mysql-test/r/delayed.result:
        Fixed test as we are now testing values before fields.
        Added new tests to test all error combinations
      mysql-test/suite/maria/r/maria.result:
        Added error handling for not supported update of view.
      mysql-test/suite/maria/t/maria.test:
        Added error handling for not supported update of view.
      mysql-test/t/delayed.test:
        Fixed test as we are now testing values before fields.
        Added new tests to test all error combinations
      sql/sql_base.cc:
        Fixed warning from valgrind
      sql/sql_insert.cc:
        Don't test from which table values are in case of INSERT ... SELECT
        Run fix_fields() in values before we do it on fields.
        This is needed becasue check_view_single_update() are accessing values.
      storage/maria/ma_blockrec.c:
        Don't call pagecache_delete_pages() if no pages to delete.
        This fixes a DBUG_ASSERT() error in maria_test_recovery
      7dc83c50
  10. 07 Jan, 2009 1 commit
  11. 05 Jan, 2009 1 commit
  12. 29 Dec, 2008 1 commit
    • unknown's avatar
      Fixed mutex taking order on recovery of bulk insert. · 4da218f0
      unknown authored
      storage/maria/ma_key_recover.c:
        Takes intern_lock before writing CLR_END of bulk insert.
        Added debug info about writing trigger.
        Check of mutex taken in _ma_state_info_write() where we need it.
      4da218f0
  13. 27 Dec, 2008 1 commit
    • Michael Widenius's avatar
      Fixed bugs found by pushbuild · 910284e6
      Michael Widenius authored
      Added code to detect and give error when doing an insert into a view where we accessed fields in a not yet read table
      Disabled test in subselect.test as the CHECK_OPTION for views doesn't work for insert.
      This needs to be fixed properly later.
      
      The problem with views are described in Bug #41760 Inserting into multiple-table views is not working
      
      mysql-test/r/insert.result:
        Fixed wrong usage of insert into view.
      mysql-test/r/subselect.result:
        Disabled wrong test (temporary)
      mysql-test/suite/maria/r/maria.result:
        Added test of size of table
      mysql-test/suite/maria/t/maria.test:
        Added test of size of table
      mysql-test/t/insert.test:
        Fixed wrong usage of insert into view
        The bug is that during insert/update we currently don't read any of the referenced tables of the view.
        This means that we can't get a value from another table to use as part of the update.
      mysql-test/t/subselect.test:
        Disabled not working test until someone has time to fix insert into view properly
        Here we where refering to last used value in t2, which is wrong.
      sql/sql_insert.cc:
        Detect if we are trying to update one table in a view based on value in another, not yet read, table.
        This fixes the problem discovered in insert.test
      storage/maria/ma_blockrec.c:
        Don't ignore not critical changes to the last page in the table.
        We need to write the last page as otherwise we can during aborting of a row with a duplicate key get
        state.data_file_length and the real length of file out of sync
      storage/maria/ma_check.c:
        Flush the page cache even if we got an error during zerofill.
        (This fixes a call to assert() in case of a too short data file)
      storage/maria/ma_pagecache.c:
        Mark page as read when we do a write of a full page.
        This fixes a bug when we got an error during read and then used direct write to page to update it
      storage/maria/ma_state.c:
        Restore info->lock.type after call to maria_versioning.
        Fixed crash in maria_recover.test
      storage/maria/maria_read_log.c:
        Don't write thread id in debug log. (Not needed as maria_read_log is a single treaded program)
      910284e6
  14. 23 Dec, 2008 1 commit
  15. 22 Dec, 2008 3 commits
    • Michael Widenius's avatar
      3ef5b1fd
    • Michael Widenius's avatar
      3ecbee7c
    • Michael Widenius's avatar
      Fix for Bug#40311 Assert in MARIA_RECORD_POS during pushbuild 2 test: · 86fcfb15
      Michael Widenius authored
      Fixed bug when removing a newly inserted record (in case of duplicate key).
      The bug caused a crash for rows with several blobs and the first blob was small enough to fit into the head page.
      Don't change state_history if nothing changed (speed optimization that also simplifies logic).
      Reset state_history if we added/deleted or updated rows without versioning.
      Fixed wrong test in trnman_exists_active_transactions() if state is visible or not.
      
      Other bugs fixed:
      Fixed wrong argument to (lock->get_status) when we had to wait for TL_WRITE_CONCURRENT_INSERT.
      Item_equal::update_used_tables() didn't calculate const_item_cache properly.
      Added assert's to detect if join_read_const_table() was called under wrong assumptions..
      Fixed that _ma_setup_live_state() is called from thr_lock() instead of handler::external_lock().
      This was needed to get versioning information to be setup correctly.
      Fixed error in debug binaries during a call to _ma_check_table_is_closed() when another thread was opening/closing a table.
      Fixed wrong test when finding right history_state to use.
      
      mysql-test/suite/maria/r/maria.result:
        Added test for Bug#40311 Assert in MARIA_RECORD_POS during pushbuild 2 test
      mysql-test/suite/maria/t/maria.test:
        Added test for Bug#40311 Assert in MARIA_RECORD_POS during pushbuild 2 test
      mysys/thr_lock.c:
        Fixed wrong argument to (lock->get_status) when we had to wait for TL_WRITE_CONCURRENT_INSERT
      sql/item_cmpfunc.cc:
        Item_equal::update_used_tables() didn't calculate const_item_cache properly, which later caused a wrong result for item->const_item()
      sql/sql_base.cc:
        In debug mode, Initilize record buffer with unexpected data to catch usage of uninitialized memory
      sql/sql_select.cc:
        Fixed indentation
        Added assert's to detect if join_read_const_table() was called under wrong assumptions.
        One assert() is disabled for now as Item_equal() doesn't behave as expected.
      storage/maria/ha_maria.cc:
        Move calling to _ma_setup_live_state() to ma_state.c::_ma_block_get_status()
        This was needed as _ma_setup_live_state() needed to know if the table will be used concurrently or not
      storage/maria/ma_blockrec.c:
        Fixed bug when removing a newly inserted record (in case of duplicate key).
        The bug caused a crash for rows with several blobs and the first blob was small enough to fit into the head page.
      storage/maria/ma_dbug.c:
        Added mutex to protect the open table list during _ma_check_table_is_closed().
        Without the protection we could get a error in debug binaries during a call to _ma_check_table_is_closed()
      storage/maria/ma_delete_table.c:
        Removed not used code
      storage/maria/ma_rename.c:
        Removed not used code
      storage/maria/ma_state.c:
        Fixed wrong test when finding right history_state to use
        Mark in tables->state_current.no_transid if we are using transid's or not.
        Don't change state_history if nothing changed (speed optimization that also simplifies logic)
        Reset state_history if we added/deleted or updated rows without versioning.
        More DBUG_ASSERT's and more DBUG
        Updated maria_versioning() to initialize environment before calling _ma_blok_get_status(). This was needed because of the new logic in _ma_block_get_status()
      storage/maria/ma_state.h:
        Added flags to detect if table changed and/or if we changed table without versioning
      storage/maria/ma_write.c:
        Simple cleanups (No logic changes)
      storage/maria/trnman.c:
        Fixed wrong test in trnman_exists_active_transactions() if state is visible or not.
      86fcfb15
  16. 15 Dec, 2008 1 commit
  17. 10 Dec, 2008 3 commits
  18. 09 Dec, 2008 3 commits
    • Michael Widenius's avatar
      Merge with main Maria tree · 7f91cf08
      Michael Widenius authored
      7f91cf08
    • Michael Widenius's avatar
      Merge with base Maria tree · 9948682b
      Michael Widenius authored
      Remove warnings from test logs about depricated options
      
      mysql-test/t/events_logs_tests-master.opt:
        Remove warnings from test logs about depricated options
      mysql-test/t/log_tables-big-master.opt:
        Remove warnings from test logs about depricated options
      mysql-test/t/log_tables-master.opt:
        Remove warnings from test logs about depricated options
      mysql-test/t/multi_statement-master.opt:
        Remove warnings from test logs about depricated options
      mysql-test/t/ps-master.opt:
        Remove warnings from test logs about depricated options
      mysql-test/t/show_check-master.opt:
        Remove warnings from test logs about depricated options
      mysql-test/t/slow_query_log_file_basic-master.opt:
        Remove warnings from test logs about depricated options
      mysql-test/t/slow_query_log_file_func-master.opt:
        Remove warnings from test logs about depricated options
      mysql-test/t/union-master.opt:
        Remove warnings from test logs about depricated options
      sql/mysqld.cc:
        Don't give warnings for empty log file names
      9948682b
    • Guilhem Bichot's avatar
      Fix for BUG#41159 "Maria: deadlock between checkpoint and maria_write() when extending data file". · c9a29373
      Guilhem Bichot authored
      No testcase (concurrency, tested by pushbuild2).
      
      storage/maria/ha_maria.cc:
        a comment about what Sanja had discovered a while ago
      storage/maria/ma_bitmap.c:
        guard against concurrent flush of bitmap by checkpoint: we must have close_lock here
      storage/maria/ma_blockrec.c:
        comment fixed for new behaviour
      storage/maria/ma_checkpoint.c:
        Release intern_lock before flushing bitmap, or it deadlocks with allocate_and_write_block_record()
        when that function needs to increase the data file's length (that function makes bitmap non flushable,
        then wants intern_lock to increase data_file_length).
        The checkpoint section which looks at the share's content (bitmap, state) needs to be protected from the possible
        my_free-ing done by a concurrent maria_close(); intern_lock is not enough as
        both maria_close() and checkpoint now have to release it in the middle.
        So the protection is done with close_lock. in_checkpoint is now protected by close_lock
        in places where it was protected by intern_lock.
      storage/maria/ma_close.c:
        hold close_lock in maria_close() from start to end, to guard against checkpoint trying to flush
        bitmap while we have my_free'd its structures, for example. intern_lock was not enough as
        both maria_close() and checkpoint have to release it in the middle, to avoid deadlocks.
      storage/maria/ma_open.c:
        initialize new mutex
      storage/maria/ma_recovery.c:
        a comment about what Sanja had discovered a while ago
      storage/maria/maria_def.h:
        comment.
        new mutex protecting the close of a MARIA_SHARE, from _start_ to _end_ of it.
      c9a29373
  19. 08 Dec, 2008 5 commits
    • unknown's avatar
      merge · 131a6a57
      unknown authored
      131a6a57
    • unknown's avatar
      Fixed mutexes lock order in maria_close(): LOCK_trn_list ->... · c9b0c5a1
      unknown authored
      Fixed mutexes lock order in maria_close(): LOCK_trn_list -> MARIA_SHARE::intern_lock (then will be WL to revert the order).
      (BUG#40981 Maria: deadlock between checkpoint and maria_close() when freeing state info)
      
      storage/maria/ma_checkpoint.c:
        The argument added to the function to use it in maria_close().
      storage/maria/ma_close.c:
        Locking/unlocking MARIA_SHARE::intern_lock added to use correct order of the mutexes taking.
      storage/maria/ma_state.c:
        Removed assert becase now we have externally locked mutex in maria_close().
        The argument added to the _ma_remove_not_visible_states_with_lock() to use it in maria_close().
        _ma_remove_not_visible_states_with_lock() fixed tio be usable from maria_chk where transaction manager is not initialized.
      storage/maria/ma_state.h:
        The argument added to the function to use it in maria_close().
      storage/maria/maria_def.h:
        Fixed comment to the variable.
      storage/maria/trnman.c:
        The debugging assert added.
        New function to detect transaction manager initialization added (maria_chk do not initialize it).
      storage/maria/trnman_public.h:
        New function to detect transaction manager initialization added (maria_chk do not initialize it).
      c9b0c5a1
    • Michael Widenius's avatar
      Fixed problem with crash in Maria _ma_setup_live_state() where history link... · d0fb8270
      Michael Widenius authored
      Fixed problem with crash in Maria _ma_setup_live_state() where history link didn't include needed state
      
      mysql-test/mysql-test-run.pl:
        Remove warnings in log about depricated mysqld options
      storage/maria/ma_state.c:
        More DBUG_PRINT
      storage/maria/trnman.c:
        Fixed wrong test if commit_trid is visible
      d0fb8270
    • unknown's avatar
      merge · 7f3631c2
      unknown authored
      7f3631c2
    • Georgi Kodinov's avatar
      merged 5.0-main -> 5.1-main · ba816c14
      Georgi Kodinov authored
      ba816c14