1. 06 Dec, 2010 12 commits
    • Vladislav Vaintroub's avatar
      merge LP Bug#686184 · 2de9a774
      Vladislav Vaintroub authored
      2de9a774
    • Vladislav Vaintroub's avatar
      merge LP Bug#686184 · 077d96c2
      Vladislav Vaintroub authored
      077d96c2
    • Vladislav Vaintroub's avatar
      Fix myisam_crash_before_flush_keys on Windows · 3fb8bc16
      Vladislav Vaintroub authored
      Problem : mtr reports test failure because it sees
      [ERROR] mysqld got exception 0x80000003 ;
      in the .err file
      
      The exception comes from DBUG_EXECUTE_IF (.. abort())
      
      Fix:  use DBUG_ABORT instead of abort() - it does not throw 
      any exceptions.
      3fb8bc16
    • Vladislav Vaintroub's avatar
      Fix LP Bug#686184 - merge_debug test fails. · 60722bca
      Vladislav Vaintroub authored
      The reason for failure is that DBUG_EXECUTE_IF in mi_open()
      only worked for Unix-formatted file names, due to strstr(name, "/crashed")
      
      The fix change strstr() above to strstr(name, "crashed"), to it can work with 
      Windows file names as well.
      60722bca
    • Sergey Petrunya's avatar
      c67b8954
    • Vladislav Vaintroub's avatar
      merge · 82113c39
      Vladislav Vaintroub authored
      82113c39
    • Vladislav Vaintroub's avatar
      merge · bfcc62c7
      Vladislav Vaintroub authored
      bfcc62c7
    • Vladislav Vaintroub's avatar
      merge · 6ad44811
      Vladislav Vaintroub authored
      6ad44811
    • Vladislav Vaintroub's avatar
      Bug#473914: mysql_client_test fail with in debug compilaton on windows x64 · 0eae06c4
      Vladislav Vaintroub authored
       
      Reason: inconsistent compilation, federatedx is compiled without SAFEMALLOC
      flag, while anything else is compiled with SAFEMALLOC.
      
      As a consequence, my_hash_init used inside federatedx initialization does not
      provide correct caller info parameters (file, line) , so they are initialized with 
      whatever is on stack. When info about allocated memory is output in
      COM_DEBUG command, the server crashes trying to output string starting at
      0xcccccccccccccccc.
      
      The fix is to remove SAFEMALLOC  preprocessor flags 
      from every CMakeLists.txt, except the top-level one.
      
      Also, SAFEMALLOC is not defined by default now, instead
      there is WITH_DEBUG_FULL CMake option which adds 
      -DSAFEMALLOC to C and C++ flags in debug compilation. 
      This option is off by  default, because 
      1) Debug C runtime already has heap debugging builtin with 
       overwrite and leak detection
      2)safemalloc considerably slows down the tests.
      
      
      Note also  that 
      - SAFEMALLOC is gone  in MySQL5.5
      - On Windows, heap related overflows can also be found using free pageheap utility
      (that is also part of application verifier). This is even more efficient if there are no other layers 
      on top of Windows heap allocator, e.g  it is most efficient with release version.
      0eae06c4
    • Michael Widenius's avatar
    • Michael Widenius's avatar
      Merge with 5.1-release · 42746a44
      Michael Widenius authored
      42746a44
    • Michael Widenius's avatar
      Merge with 5.1-release. · b7b25dc6
      Michael Widenius authored
      - Fixed problem with oqgraph and 'make dist'
      
      Note that after this merge we have a problem show in join_outer where we examine too many rows in one specific case (related to BUG#57024).
      This will be fixed when mwl#128 is merged into 5.3.
      b7b25dc6
  2. 05 Dec, 2010 3 commits
    • Michael Widenius's avatar
      Removed compiler warning · b3c72b9a
      Michael Widenius authored
      b3c72b9a
    • Michael Widenius's avatar
      merge with 5.1-release · 6061a11d
      Michael Widenius authored
      6061a11d
    • Michael Widenius's avatar
      Fixes to not trigger end-consistency testing of pagecache. · a585745d
      Michael Widenius authored
      - Moved end_pagecache() to after maria_close()
      - Flush page cache before closing files (in maria_pack)
      Fixed test suite failure for PBXT
      
      mysql-test/suite/pbxt/r/select.result:
        We mask out the 'rows' column because it may differ from run to run
      mysql-test/suite/pbxt/t/select.test:
        We mask out the 'rows' column because it may differ from run to run
      storage/maria/maria_chk.c:
        Moved end_pagecache() to after maria_close() to not trigger end-consistency testing of pagecache.
      storage/maria/maria_pack.c:
        Moved end_pagecache() to after maria_close() to not trigger end-consistency testing of pagecache.
        flush page cache before closing files.
      a585745d
  3. 04 Dec, 2010 11 commits
  4. 03 Dec, 2010 1 commit
    • Michael Widenius's avatar
      Fixed compiler warnings. · d0ad135b
      Michael Widenius authored
      Fixed timing test failures.
      Fixed a failure in the Aria engines page cache and log handler (found with maria.maria-big test)
      - This could cause a core dump when deleting big blobs.
      - Added test to end_pagecache() to verify that page cache was correctly used.
        - inc_counter_for_resize_op and dec_counter_for_resize_op are called same number of times.
        - All page cache blocks was properly deallocated (empty)
      
      
      mysql-test/suite/innodb/t/innodb_bug38231.test:
        Fixed timing issue (code comment says it all)
      mysql-test/suite/innodb_plugin/t/innodb_bug38231.test:
        Fixed timing issue (code comment says it all)
      sql/debug_sync.cc:
        Fixed compiler warning
      storage/maria/ma_loghandler.c:
        Fixed bug found by maria.maria-big test:
        - Fixed race condition between update thread logging a very big blog and checkpoint thread.
      storage/maria/ma_pagecache.c:
        Added assert to ensure mutex was properly locked.
        Added test to end_pagecache() to verify that page cache was correctly used.
        - inc_counter_for_resize_op and dec_counter_for_resize_op are called same number of times.
        - All page cache blocks was properly deallocated (empty)
        In pagecache_delete_internal(), properly reset counters and pins if functions aborts.
        Added missing inc_counter_for_resize_op() to pagecache_wait_lock().
        Added missing dec_counter_for_resize_op() to pagecache_delete()
      d0ad135b
  5. 02 Dec, 2010 4 commits
  6. 01 Dec, 2010 6 commits
  7. 30 Nov, 2010 3 commits
    • Michael Widenius's avatar
      merge with 5.1 · 1e5061fe
      Michael Widenius authored
      1e5061fe
    • unknown's avatar
      Bug#54201: "SET INSERT_ID" event must be ignored if corresponding event is ignored · e46d0aea
      unknown authored
      An INSERT query log event is preceeded by an INSERT_ID intvar event if the
      INSERT allocates a new auto_increment value. But if we ignore the INSERT
      due to --replicate-ignore-table or similar, then the INSERT_ID event is
      still executed, and the set value of INSERT_ID lingers around in the
      slave sql thread THD object indefinitely until the next INSERT that
      happens to need allocation of a new auto_increment value.
      
      Normally this does not cause problems as such following INSERT would
      normally come with its own INSERT_ID event. In this bug, the user had
      a trigger on the slave which was missing on the master, and this
      trigger had an INSERT which could be affected. In any case, it seems
      better to not leave a stray INSERT_ID hanging around in the sql thread
      THD indefinitely.
      
      Note that events can also be skipped from apply_event_and_update_pos();
      however it is not possible in that code to skip the INSERT without also
      skipping the INSERT_ID event.
      e46d0aea
    • Michael Widenius's avatar
      Automatic merge with 5.1-release · 6f279f40
      Michael Widenius authored
      6f279f40