1. 09 Feb, 2011 1 commit
  2. 08 Feb, 2011 20 commits
  3. 07 Feb, 2011 16 commits
    • Inaam Rana's avatar
      Bug #59472 increase AIO requests per IO thread limit to 256 from 32 · 41ddf242
      Inaam Rana authored
      rb://566
      approved by: Sunny
      
      When using native aio on linux each IO helper thread should be able to
      handle upto 256 IO requests. The number 256 is the same which is used
      for simulated aio as well. In case of windows where we also use native
      aio this limit is 32 because of OS constraints. It seems that we are
      using the limit of 32 for all the platforms where we are using native
      aio. The fix is to use 256 on all platforms except windows (when native
      aio is enabled on windows)
      41ddf242
    • Bjorn Munch's avatar
      null upmerge · 31ef650e
      Bjorn Munch authored
      31ef650e
    • Bjorn Munch's avatar
      merge 47141,59979 · 76979f66
      Bjorn Munch authored
      76979f66
    • Bjorn Munch's avatar
      merge 47141,59979 · 285c7d04
      Bjorn Munch authored
      285c7d04
    • Vasil Dimov's avatar
    • Vasil Dimov's avatar
      Null merge mysql-5.1-innodb -> mysql-5.5-innodb · 99979aa4
      Vasil Dimov authored
      This change was backported from 5.5.
      99979aa4
    • Vasil Dimov's avatar
      Backport the fix for Bug#59875 Valgrind warning in buf0buddy.c from 5.5 · fe403949
      Vasil Dimov authored
      This warning also happens in 5.1 with a slightly different codepath.
      fe403949
    • Bjorn Munch's avatar
      upmerged and adapted 59979 · 44c74841
      Bjorn Munch authored
      44c74841
    • Bjorn Munch's avatar
      Bug #59979 Add mtr option to run debug server, but without turning on debug · 114ac525
      Bjorn Munch authored
      Added --debug-server and use $opt_debug_server where appropriate
      Let --debug imply --debug-server
      When merging to 5.5, must adapt fix for 59148
      Oops, set debug => debug-server too late, fixed
      114ac525
    • Tor Didriksen's avatar
      Bug #59632 Assertion failed: arg_length > length · dcd9f246
      Tor Didriksen authored
      The problem was overflow in max_length when we tried to des_decrypt()
      something which is not the output of des_encrypt()
      
      
      mysql-test/r/ssl_and_innodb.result:
        New test case.
      mysql-test/t/ssl_and_innodb.test:
        New test case.
      sql/item_strfunc.h:
        Do not subtract the encrypt overhead (9U) if args[0] has length < 9
        (In unsigned arithmetic, (1-9) becomes a very large number)
      dcd9f246
    • Ole John Aske's avatar
      cee1b3dd
    • Ole John Aske's avatar
      Fix for bug#59308: Incorrect result for SELECT DISTINCT <col>... ORDER BY <col> DESC. · 221ce922
      Ole John Aske authored
            
      Also fix bug#59110: Memory leak of QUICK_SELECT_I allocated memory.
      Includes Jørgen Lølands review comments.
            
      Root cause of these bugs are that test_if_skip_sort_order() decided to
      revert the 'skip_sort_order' descision (and use filesort) after the
      query plan has been updated to reflect a 'skip' of the sort order.
            
      This might happen in 'check_reverse_order:' if we have a 
      select->quick which could not be made descending by appending 
      a QUICK_SELECT_DESC. ().
            
      The original 'save_quick' was then restored after the QEP has been modified,
      which caused:
            
        - An incorrect 'precomputed_group_by= TRUE' may have been set, 
          and not reverted, as part of the already modifified QEP (Bug#59308)
        - A 'select->quick' might have been created which we fail to delete (bug#59110).
            
      This fix is a refactorication of test_if_skip_sort_order() where all logic
      related to modification of QEP (controlled by argument 'bool no_changes'), is
      moved to the end of test_if_skip_sort_order(), and done after *all* 'test_if_skip'
      checks has been performed - including the 'check_reverse_order:' checks.
            
      The refactorication above contains now intentional changes to the logic which 
      has been moved to the end of the function.
            
      Furthermore, a smaller part of the fix address the handling of the 
      select->quick objects which may already exists when we call 
      'test_if_skip_sort_order()' (save_quick) -and
      new select->quick's created during test_if_skip_sort_order():
            
        - Before new select->quick may be created by calling ::test_quick_select(), we
          set 'select->quick= 0' to avoid that ::test_quick_select() prematurely
          delete the save_quick's. (After this call we may have both a 'save_quick' 
          and 'select->quick')
            
        - All returns from ::test_if_skip_sort_order() where we may have both a
          'save_quick' and a 'select->quick' has been changed to goto's to the
          exit points 'skiped_sort_order:' or 'need_filesort:' where we
          decide which of the QUICK_SELECT's to keep, and delete the other.
      221ce922
    • Vasil Dimov's avatar
      Merge mysql-5.1-innodb -> mysql-5.5-innodb · 97b11ffd
      Vasil Dimov authored
      97b11ffd
    • Vasil Dimov's avatar
      Use fun:* instead of obj:*/libz.so* because when the bundled zlib is · 165ed4f1
      Vasil Dimov authored
      used (--with-zlib-dir=bundled) then there is no libz.so involved.
      165ed4f1
    • Vinay Fisrekar's avatar
      bzr merger from mysql-5.1 to mysql-5.5 · 2f3fdbcf
      Vinay Fisrekar authored
      Bug#59955 - engines/funcs/ps_string_not_null test needs better cleanup
      2f3fdbcf
    • Vinay Fisrekar's avatar
      Bug#59955 - engines/funcs/ps_string_not_null test needs better cleanup · e29b40f8
      Vinay Fisrekar authored
      Correcting clean up command at the start of test.
      e29b40f8
  4. 05 Feb, 2011 2 commits
    • Dmitry Shulga's avatar
      Auto-merge from mysql-5.1 for bug#57450. · d197051e
      Dmitry Shulga authored
      d197051e
    • Dmitry Shulga's avatar
      Fixed bug#57450 - mysql client enter in an infinite loop · 980868eb
      Dmitry Shulga authored
      if the standard input is a directory.
      
      The problem is that mysql monitor try to read from stdin without
      checking input source type.
      
      The solution is to stop reading data from standard input if a call
      to read(2) failed.
      
      A new test case was added into mysql.test.
      
      client/my_readline.h:
        Data members error and truncated was added to LINE_BUFFER structure.
        These data members used instead of out parameters in functions
        batch_readline, intern_read_line.
      client/mysql.cc:
        read_and_execute() was modified: set status.exit_status to 1
        when the error occured while reading the next command line in
        non-interactive mode. Also the value of the truncated attribute
        of structure LINE_BUFF is taken into account only for non-iteractive mode.
      client/readline.cc:
        intern_read_line() was modified: cancel reading from input if
        fill_buffer() returns -1, e.g. if call to read failed.
        batch_readline was modified: set the error data member of LINE_BUFFER
        structure to value of my_errno when system error happened during call
        to my_read/my_realloc.
      mysql-test/t/mysql.test:
        Test for bug#57450 was added.
      980868eb
  5. 04 Feb, 2011 1 commit
    • Serge Kozlov's avatar
      Bug#43828, Bug#59494. · 4c9cb95c
      Serge Kozlov authored
      After introducing new way of initialization of replication the setting different heartbeat periods for slaves was missed.
      Added asserts
      4c9cb95c