1. 24 Jun, 2011 7 commits
    • Sergey Petrunya's avatar
      Fix compile failure · c177ccac
      Sergey Petrunya authored
      c177ccac
    • Michael Widenius's avatar
      Automatic merge · 3134d9dc
      Michael Widenius authored
      3134d9dc
    • Michael Widenius's avatar
      Merge with 5.1 · 9e8c92cb
      Michael Widenius authored
      9e8c92cb
    • Michael Widenius's avatar
      Fixed several errors in Aria discovered by test case for lp:727869... · 079aaf43
      Michael Widenius authored
      Fixed several errors in Aria discovered by test case for lp:727869 ma_pagecache.c:2103: find_block: Assertion `block->rlocks == 0
      - Fixed assert in transaction log handler when aria_check was run on block-record table that was much bigger than expected.
      - Fixed warnings about wrong mutex order between bitmap and intern_lock
      - Fixed error in bitmap that could cause two rows to use same block for a block record.
      - Fixed wrong test that could cause error if last page for a bitmap was used by a blob.
      - Fixed several bugs in pagecache for the case where pagecase had very few blocks and there was a lot of threads competing to get the blocks (very unlikely case).
      
      
      mysql-test/suite/maria/r/maria-recovery3.result:
        Updated results
      sql/mysqld.cc:
        Allow mi_check() to send information messages for log file
      storage/maria/ma_bitmap.c:
        Fixed problem with wrong mutex order when bitmap was the first page that was flushed out of page cache
        - Fixed by introducing _ma_bitmap_mark_file_changed() that marks file changed without a bitmap lock.
        - Fixed one case in _ma_change_bitmap_page() where we didn't mark the bitmap changed. This could cause to rows to reuse same block if this was the only change to the bitmap.
        - Split _ma_bitmap_get_page_bits() in two parts to not take a bitmap lock when we already have it
        - Fixed bug in _ma_bitmap_set_full_page_bits() that caused an error if last page for a bitmap was used by a blob
      storage/maria/ma_check.c:
        Better handling of wrong file length.
        Fixed bug when we tried to write to transaction log when it was not opened (happened when block record file was bigger than expected)
      storage/maria/ma_pagecache.c:
        Fixed several bugs in pagecache for the case where pagecase had very few blocks and there was a lot of threads competing to get the blocks:
        - In link_block() mark a block given to another thread with PCBLOCK_REASSIGNED to ensure that no other threads can start re-using the block
          before the thread that requsted a block.
        - In free_block(), don't reset status for a block that is in re-assign by link_block() (we don't want to loose the PCBLOCK_REASSIGNED flag).
        - Added call to wait_for_flush() when we got a new block in find_block() to ensure that we don't use a block that is beeing flushed by another thread.
        - Moved setting of hits_left and last_hit_time in find_block() to where we assign the block.
        
        
        Code cleanup and making code uniform:
        - Changed a lot of KEYCACHE_DBUG_PRINT to use DBUG_PRINT
        - Streamlined all reporting of 'signal' and 'wait' between threads to be identical.
        - Use thread name instead of thread number (for each match against --debug)
        - Added more DBUG_ENTER, DBUG_PRINT and DBUG_ASSERT()
        - Added more comments
      storage/myisam/ha_myisam.cc:
        Only print information about that we make a backup if we are really making a backup.
      storage/myisam/mi_check.c:
        Inform mysqld that we are creating a backup of the data file (for inclusion in error log).
      079aaf43
    • Michael Widenius's avatar
    • Michael Widenius's avatar
      Fixes to aria · f75be095
      Michael Widenius authored
      - Fixed error when writing a blob to the last page on the bitmap.
      - Marked bitmap changed in once case that could cause two rows to use the same blob page.
      f75be095
    • Michael Widenius's avatar
      Fix for bug lp:798597 Incorrect "Duplicate entry" error with views and GROUP BY · 71c7be39
      Michael Widenius authored
      
      mysql-test/r/join.result:
        Test case for LP:798597
      mysql-test/t/join.test:
        Test case for LP:798597
      sql/sql_select.cc:
        In simplify_joins we reset table->maybe_null for outer join tables that can't ever be NULL.
        This caused a conflict between the previously calculated items and the group_buffer against the fields
        in the temporary table that are created as not null thanks to the optimization.
        The fix is to correct the group by items to also be not_null so that they match the used fields and keys.
      71c7be39
  2. 21 Jun, 2011 1 commit
  3. 17 Jun, 2011 1 commit
    • Vladislav Vaintroub's avatar
      Fiix LPBUG#798629 · f77bfdcf
      Vladislav Vaintroub authored
      Define USE_MARIA_FOR_TMP_TABLES preprocessor constant by default if Aria engine is compiled in.
      Use CMake variable WITH_ARIA_TMP_TABLES to control the temp table engine setting.
      f77bfdcf
  4. 15 Jun, 2011 2 commits
  5. 13 Jun, 2011 2 commits
    • Michael Widenius's avatar
    • Michael Widenius's avatar
      Fixed portability problem with partiton_error.test · 59eaaa72
      Michael Widenius authored
      Added option to aria_read_log to crash recovery at certain points in the recovery process.
      Fixed bug that caused future recovery attempts to fail if we got a crash/got killed during closing of tables at end of recovery process.
      
      
      mysql-test/mysql-test-run.pl:
        Don't abort if 'var' points to stale place; Just remove it.
      mysql-test/suite/maria/r/maria.result:
        Fixed wrong indentation
      mysql-test/t/partition_error.test:
        Fixed portability problem with partiton_error.test
      storage/maria/ma_close.c:
        More DBUG_PRINT info
      storage/maria/ma_pagecache.c:
        Copy flush_log_callback when writing to page cache. This fixes problem in recovery when switching from mode of file
      storage/maria/ma_recovery.c:
        Added option to aria_read_log to crash recovery at certain points in the recovery process.
      storage/maria/ma_recovery.h:
        Added option to aria_read_log to crash recovery at certain points in the recovery process.
      storage/maria/maria_chk.c:
        Align aria_chk -d output
        Don't write warning Aria table '...' is usable but should be fixed if the table was before marked as crashed but now is ok
      storage/maria/maria_read_log.c:
        Added option to aria_read_log to crash recovery at certain points in the recovery process.
      59eaaa72
  6. 12 Jun, 2011 1 commit
  7. 11 Jun, 2011 3 commits
    • Michael Widenius's avatar
    • Michael Widenius's avatar
      Increased server version to 5.2.7 · a6306960
      Michael Widenius authored
      a6306960
    • Michael Widenius's avatar
      Fixes BUG#60976 "Crash, valgrind warning and memory leak with partitioned archive tables" · 3b250c7f
      Michael Widenius authored
      Noted that there was no memory leak, just a lot of used partitioned tables.
      Fixed old bug: 'show status' now shows memory usage when compiled with safemalloc.
      Added option --flush to mysqlcheck.c to run a 'flush tables' between each check to keep down memory usage.
      Changed '--safemalloc' options to mysqld so that one can use --safemalloc and --skip-safemalloc.
      Now skip-safemalloc is default (ie, we only do checking of memory overrun during free()) to speed up tests.
      
      
      client/client_priv.h:
        Added OPT_FLUSH_TABLES
      client/mysqlcheck.c:
        Added option --flush to mysqlcheck.c to run a 'flush tables' between each check to keep down memory usage.
      mysql-test/mysql-test-run.pl:
        Always run tests with --loose-skip-safemysqld for higher speed
      sql/mysqld.cc:
        Changed '--safemalloc' options so that one can use --safemalloc and --skip-safemalloc.
        Now skip-safemalloc is default (ie, we only do checking of memory overrun during free()) to speed up tests
      sql/sql_parse.cc:
        Fixed old bug: 'show status' now shows memory usage when compiled with safemalloc.
      storage/archive/archive_reader.c:
        Changed all malloc() calls to use my_malloc()/my_free()
        Added checks of malloc() calls.
      storage/archive/ha_archive.cc:
        Detect failure if init_archive_reader() and return errno. This fixed assert crash in my_seek().
        Changed all malloc() calls to use my_malloc()/my_free()
      3b250c7f
  8. 09 Jun, 2011 4 commits
  9. 08 Jun, 2011 2 commits
  10. 07 Jun, 2011 1 commit
  11. 06 Jun, 2011 1 commit
    • Michael Widenius's avatar
      Fixed lock sorting and lock check issues with thr_lock that caused warnings... · ea22ad95
      Michael Widenius authored
      Fixed lock sorting and lock check issues with thr_lock that caused warnings when running test suite.
      Safety check that could cause core dump when doing create table with virtual column.
      
      mysql-test/mysql-test-run.pl:
        Show also warnings from thr_lock (which starts with just Warning, not Warning:)
      mysql-test/r/lock.result:
        Added test that showed not relevant warning when using table locks.
      mysql-test/t/lock.test:
        Added test that showed not relevant warning when using table locks.
      mysys/thr_lock.c:
        Fixed sorting of locks.
        (Old sort code didn't handle case where TL_WRITE_CONCURRENT_INSERT must be sorted before TL_WRITE)
        Added more information to check_locks warning output.
        Fixed wrong testing of multiple different write locks for same table.
      sql/item_cmpfunc.cc:
        Safety check that could cause core dump when doing create table with virtual column.
      ea22ad95
  12. 02 Jun, 2011 1 commit
  13. 01 Jun, 2011 2 commits
  14. 27 May, 2011 2 commits
  15. 26 May, 2011 6 commits
  16. 25 May, 2011 1 commit
  17. 23 May, 2011 1 commit
  18. 20 May, 2011 1 commit
    • Michael Widenius's avatar
      Ensure we don't read a MariaDB 5.3 errmsg.sys file or new errmsg.sys file with... · 79319809
      Michael Widenius authored
      Ensure we don't read a MariaDB 5.3 errmsg.sys file or new errmsg.sys file with holes for not used error messages
      
      sql/derror.cc:
        Ensure we don't read a MariaDB 5.3 errmsg.sys file with moved error messages or a new errmsg.sys file with holes for not used error messages
        If error message file didn't exist and we have not read one in the past, don't continue.
        Give better error message if the errmsg.sys header has changed.
      79319809
  19. 19 May, 2011 1 commit