1. 10 Dec, 2010 1 commit
    • Michael Widenius's avatar
      Better warning message if lock test fails · 84edaac4
      Michael Widenius authored
      Made archive.test a bit more safe
      
      
      
      mysql-test/r/archive.result:
        Added removal of files to make rerun of failed test work
      mysql-test/t/archive.test:
        Added removal of files to make rerun of failed test work
      mysys/thr_lock.c:
        Better warning message if lock test fails
      84edaac4
  2. 08 Dec, 2010 1 commit
    • unknown's avatar
      MBug#687320: Fix sporadic test failures in innodb_mysql.test and... · 1bbb55a2
      unknown authored
      MBug#687320: Fix sporadic test failures in innodb_mysql.test and partition_innodb_semi_consistent.test
      
      Problem is that these tests run with --innodb-lock-wait-timeout=2 in .opt
      (and this is necessary as built-in innodb does not allow to change this
      dynamically). This cases another part of the test to occasionally time
      out an UPDATE, which subsequently caused the test case to timeout due to
      waiting for a condition (successful UPDATE) that never occurs.
      
      Fixed by re-trying the update in case of timeout.
      
      Tested by inserting a sleep() in the connection that the UPDATE is waiting
      for, and checking that the retry loops a couple of times until the other
      connection is done and COMMITs.
      1bbb55a2
  3. 07 Dec, 2010 1 commit
  4. 19 Nov, 2010 1 commit
    • unknown's avatar
      Mbug#677407 / MySQL Bug#48883: Stale data from INNODB_LOCKS table. · f0f9ab69
      unknown authored
      The logic for how to check when to update the table cache for
      INNODB_LOCKS with real data was flawed. This could result in both
      not updating the cache often enough (when the table is queried
      repeatedly with less than 100 milliseconds in-between) resulting
      in stale data; as well as updating too often (when multiple
      queries against the table start at around the same time).
      
      This caused occasional test failures in innodb_information_schema.
      
      Fix by updating the "last updated" timestamp in the right place,
      when the cache is updated, not when it is read.
      f0f9ab69
  5. 06 Dec, 2010 6 commits
    • 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
    • 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
  6. 05 Dec, 2010 1 commit
    • 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
  7. 04 Dec, 2010 7 commits
  8. 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
  9. 02 Dec, 2010 3 commits
  10. 01 Dec, 2010 4 commits
    • Vladislav Vaintroub's avatar
      Adapt fix_vs_config_dir () for VS2010 · 2f7a1564
      Vladislav Vaintroub authored
       
      MTR_VS_CONFIG is now determined by looking at parent directory 
      of sql\*\mysqld.exe,  instead of looking at *\*\BuildLog.htm
      
      Reason : VS2010 does not create BuildLog.htm, hence prior method did not work.
      2f7a1564
    • Vladislav Vaintroub's avatar
      Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warnings · c87923dc
      Vladislav Vaintroub authored
        -  Remove all mentioning of /MAP /MAPINFO link options (does not work in VS2010).
           Remove map files from packaging.
        -  Fix warning about ETIMEDOUT being redefined.
        -  Fix  warning about FSP_EXTENT_SIZE in xtradb  (32/64 bit right shift mismatch)
        -  Silence warnings coming from  generated  code (flex/bison) in xtradb/innodb_plugin.
        -  Be nice to people without cygwin (me) and add win/configure-mariadb.bat with options suitable for quick compilation, e.g no embedded
      c87923dc
    • Michael Widenius's avatar
      Automatic merge with 5.1 · 41df9be0
      Michael Widenius authored
      41df9be0
    • Michael Widenius's avatar
      Fixed failures in buildbot · 34fa79e9
      Michael Widenius authored
      mysql-test/suite/innodb_plugin/t/innodb_bug38231.test:
        Sometimes you get a timeout here; Disable the not fatal error message.
      storage/xtradb/sync/sync0rw.c:
        Disable compiler warning
      34fa79e9
  11. 30 Nov, 2010 2 commits
    • 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
  12. 29 Nov, 2010 4 commits
    • Michael Widenius's avatar
      Fixed some compiler warnings · d54f869f
      Michael Widenius authored
      configure.in:
        Added comment
      mysql-test/suite/innodb_plugin/t/innodb_bug56680.test:
        Disable test when run with valgrind as we get errors from buf_buddy_relocate() on work for this test.
        (Should probably be investigated as this may be an issue in xtradb, but probably harmless)
        Work is an amd-64 running openSUSE 1.11 and valgrind 3.4.1
      mysys/charset.c:
        Remove static function if not used (to remove compiler warning)
      storage/xtradb/srv/srv0srv.c:
        Added casts to get rid of compiler warnings
      d54f869f
    • Hakan Kuecuekyilmaz's avatar
    • Michael Widenius's avatar
      Automatic merge with 5.1-release · fde525de
      Michael Widenius authored
      fde525de
    • Michael Widenius's avatar
      Fixed compiler and gmake warnings · e68ff466
      Michael Widenius authored
      - Removed SCCS rule from Makefile.am
      - Made dummy rule in sql_yacc.yy to get rid of compiler warning about not used label.
      Don't use maintainer mode with valgrind (as we don't want to initialize all variables)
      
      config/ac-macros/maintainer.m4:
        Don't use maintainer mode with valgrind (as we don't want to initialize all variables)
        Force initialization of variables when using -Werror (To get rid of compiler warnings)
      configure.in:
        Don't use maintainer mode with valgrind (as we don't want to initialize all variables)
      sql/sql_yacc.yy:
        Made dummy rule in sql_yacc.yy to get rid of compiler warning about not used label.
      e68ff466
  13. 26 Nov, 2010 2 commits
    • Michael Widenius's avatar
      Fixed compiler warnings and a compilation failure on windows · 9ab4829b
      Michael Widenius authored
      extra/libevent/event.c:
        Tried to fix compiler warning on windows
      extra/libevent/evutil.h:
        Define __attribute__ for not gcc compilers
      extra/libevent/kqueue.c:
        Fixed compiler warnings
      extra/libevent/signal.c:
        Tried to fix compiler warning on windows
      storage/pbxt/src/ha_pbxt.cc:
        Fixed compiler warning about "variable might be clobbered by longjmp"
      storage/pbxt/src/table_xt.cc:
        Fixed compiler warnings (on windows)
      storage/xtradb/handler/i_s.cc:
        Fixed compiler warning by invoking the correct store function.
      9ab4829b
    • Michael Widenius's avatar
      Patch from Sergey Petrunya: · b8b3716a
      Michael Widenius authored
      Fix post-merge failure in 5.1-merge 
      - Let QUICK_RANGE_INTERSECT_SELECT not make assumption that HA_EXTRA_KEYREAD 
        scans do not touch parts of table->record[0] that refer to fields that are 
        not covered by the used index.
        This assumption is not true for XtraDB (e.g. grep row/row0sel.c for 
        "init null bytes with default values as they might be").
      b8b3716a
  14. 25 Nov, 2010 5 commits
    • Michael Widenius's avatar
      Automatic merge with 5.1 · 171260f3
      Michael Widenius authored
      171260f3
    • Michael Widenius's avatar
      Fixed failing test cases · 40b7efb3
      Michael Widenius authored
      mysql-test/include/have_not_innodb_plugin.inc:
        Also detect if xtradb is installed
      mysql-test/suite/innodb/t/innodb_bug56143.test:
        Disabled test case that doesn't work for innodb_plugin/xtradb.
      mysql-test/suite/innodb_plugin/r/innodb_bug56632.result:
        Updated result (key_block_size is lower case in MariaDB, as all other options)
      mysql-test/suite/pbxt/r/partition_hash.result:
        Updated results (after partition row count optimization changes)
      mysql-test/suite/pbxt/r/partition_pruning.result:
        Updated results (after partition row count optimization changes)
      mysql-test/suite/pbxt/r/partition_range.result:
        Updated results (after partition row count optimization changes)
      mysql-test/suite/pbxt/r/subselect.result:
        Updated result after ROW() changes.
      40b7efb3
    • Michael Widenius's avatar
      Merge of innodb_plugin for MySQL 5.1.53 with xtradb · f900b658
      Michael Widenius authored
      Fixed compiler warnings in xtradb
      Added back resetting of null bitmap but now in row_search_for_mysql()
      
      storage/xtradb/row/row0sel.c:
        Added back resetting of null bitmap but now in row_search_for_mysql()
      f900b658
    • Michael Widenius's avatar
      A proper fix for bug #57688. · 721a6a6a
      Michael Widenius authored
      Introduced a new flag in the class Item. The flag is set
      to 1 only for items that are used in GROUP BY lists of
      queries with ROLLUP.
      721a6a6a
    • Michael Widenius's avatar
      Automatic merge with base · babdbbbf
      Michael Widenius authored
      babdbbbf
  15. 24 Nov, 2010 1 commit
    • Michael Widenius's avatar
      Merge with MySQL 5.1.53 · 1a6373e8
      Michael Widenius authored
      Open issues:
      - A better fix for #57688; Igor is working on this
      - Test failure in index_merge_innodb.test ; Igor promised to look at this
      - Some Innodb tests fails (need to merge with latest xtradb) ; Kristian promised to look at this.
       - Failing tests: innodb_plugin.innodb_bug56143 innodb_plugin.innodb_bug56632 innodb_plugin.innodb_bug56680 innodb_plugin.innodb_bug57255 
      - Werror is disabled;  Should be enabled after merge with xtradb.
      1a6373e8