1. 22 Dec, 2010 1 commit
    • Igor Babaev's avatar
      Fixed LP bug #670380. · f1b558fe
      Igor Babaev authored
      Lifted the limitation that hash join could not be used over 
      varchar fields with non-binary collation.
      f1b558fe
  2. 14 Dec, 2010 1 commit
    • unknown's avatar
      Fix LP BUG#685411 · 766df925
      unknown authored
      Analysis:
      The assert failed because st_select_lex::print() was called for subqueries
      as follows:
      
      Item_subselect::print() ->
        subselect_single_select_engine::print() -> st_select_lex::print()
      
      It was Item_subselect::fix_fields() that set the thd by calling set_thd(),
      so when this print() was called before fix_fields(), subselect_engine::thd
      was NULL.
      
      Solution:
      The patch makes all constructors of all subselect_engine classes to take
      a THD parameter. The default subselect_single_select_engine engine is created
      early during parse time, in the Item_subselect::init call, so we pass the
      correct THD object already at this point.
      766df925
  3. 11 Dec, 2010 2 commits
  4. 08 Dec, 2010 1 commit
    • Michael Widenius's avatar
      Fixed test results for windows builds · 2fc79e2d
      Michael Widenius authored
      Fixed compiler warning
      
      mysql-test/r/named_pipe.result:
        Fixed test results for windows builds
      mysql-test/r/shm.result:
        Fixed test results for windows builds
      sql/item_cmpfunc.cc:
        Fixed compiler warning about uninitialized "first"
      2fc79e2d
  5. 06 Dec, 2010 12 commits
    • Vladislav Vaintroub's avatar
      merge LP Bug#686184 · 9574c71e
      Vladislav Vaintroub authored
      9574c71e
    • Vladislav Vaintroub's avatar
      merge LP Bug#686184 · 2ce6bea9
      Vladislav Vaintroub authored
      2ce6bea9
    • Vladislav Vaintroub's avatar
      Fix myisam_crash_before_flush_keys on Windows · a1abfb58
      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.
      a1abfb58
    • Vladislav Vaintroub's avatar
      Fix LP Bug#686184 - merge_debug test fails. · cd72b793
      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.
      cd72b793
    • Sergey Petrunya's avatar
      f38711c1
    • Vladislav Vaintroub's avatar
      merge · 3c68030d
      Vladislav Vaintroub authored
      3c68030d
    • Vladislav Vaintroub's avatar
      merge · fdd009f1
      Vladislav Vaintroub authored
      fdd009f1
    • Vladislav Vaintroub's avatar
      merge · 1208fba6
      Vladislav Vaintroub authored
      1208fba6
    • Vladislav Vaintroub's avatar
      Bug#473914: mysql_client_test fail with in debug compilaton on windows x64 · 7a80fa96
      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.
      7a80fa96
    • Michael Widenius's avatar
    • Michael Widenius's avatar
      Merge with 5.1-release · 7720092b
      Michael Widenius authored
      7720092b
    • Michael Widenius's avatar
      Merge with 5.1-release. · 4d8061cb
      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.
      4d8061cb
  6. 05 Dec, 2010 3 commits
    • Michael Widenius's avatar
      Removed compiler warning · 5c43e47b
      Michael Widenius authored
      5c43e47b
    • Michael Widenius's avatar
      merge with 5.1-release · 6ed1f88b
      Michael Widenius authored
      6ed1f88b
    • Michael Widenius's avatar
      Fixes to not trigger end-consistency testing of pagecache. · 420b6312
      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.
      420b6312
  7. 04 Dec, 2010 11 commits
  8. 03 Dec, 2010 1 commit
    • Michael Widenius's avatar
      Fixed compiler warnings. · 60f42a46
      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()
      60f42a46
  9. 02 Dec, 2010 4 commits
  10. 01 Dec, 2010 4 commits
    • Vladislav Vaintroub's avatar
      Adapt fix_vs_config_dir () for VS2010 · 0cb30e31
      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.
      0cb30e31
    • Vladislav Vaintroub's avatar
      Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warnings · 56784da3
      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
      56784da3
    • Michael Widenius's avatar
      automatic merge with 5.1 · 533bee82
      Michael Widenius authored
      533bee82
    • Michael Widenius's avatar
      Fixed compiler warnings · 64bba3d5
      Michael Widenius authored
      sql/debug_sync.cc:
        Initalize variable
      storage/sphinx/Makefile.am:
        Ensure we compile with the -Wno-unused-parameter flag
      64bba3d5