1. 08 Feb, 2011 10 commits
  2. 07 Feb, 2011 10 commits
    • Bjorn Munch's avatar
      null upmerge · b5f7d244
      Bjorn Munch authored
      b5f7d244
    • Bjorn Munch's avatar
      merge 47141,59979 · 3bea8ee0
      Bjorn Munch authored
      3bea8ee0
    • Bjorn Munch's avatar
      merge 47141,59979 · 4254d2a5
      Bjorn Munch authored
      4254d2a5
    • Bjorn Munch's avatar
      upmerged and adapted 59979 · f8e13830
      Bjorn Munch authored
      f8e13830
    • Bjorn Munch's avatar
      Bug #59979 Add mtr option to run debug server, but without turning on debug · f88c6516
      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
      f88c6516
    • Tor Didriksen's avatar
      Bug #59632 Assertion failed: arg_length > length · 8c05e4ca
      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)
      8c05e4ca
    • Ole John Aske's avatar
      f4a7d3a2
    • Ole John Aske's avatar
      Fix for bug#59308: Incorrect result for SELECT DISTINCT <col>... ORDER BY <col> DESC. · cbe60d3e
      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.
      cbe60d3e
    • Vinay Fisrekar's avatar
      bzr merger from mysql-5.1 to mysql-5.5 · 0c527fdd
      Vinay Fisrekar authored
      Bug#59955 - engines/funcs/ps_string_not_null test needs better cleanup
      0c527fdd
    • Vinay Fisrekar's avatar
      Bug#59955 - engines/funcs/ps_string_not_null test needs better cleanup · 59230c89
      Vinay Fisrekar authored
      Correcting clean up command at the start of test.
      59230c89
  3. 05 Feb, 2011 2 commits
    • Dmitry Shulga's avatar
      Auto-merge from mysql-5.1 for bug#57450. · 6e6f9834
      Dmitry Shulga authored
      6e6f9834
    • Dmitry Shulga's avatar
      Fixed bug#57450 - mysql client enter in an infinite loop · a3bd7093
      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.
      a3bd7093
  4. 04 Feb, 2011 10 commits
  5. 03 Feb, 2011 1 commit
    • Luis Soares's avatar
      BUG#59147: rpl_circular_for_4_hosts fails sporadically · f3df9ccd
      Luis Soares authored
            
      There is one part of the test case that needs to break
      and re-establish the circular topology. For this the test
      stops the slave threads on a couple of servers and restarts
      them with START SLAVE. However, no check is done on the
      status of the IO or SQL threads before proceeding with
      the subsequent commands.
            
      Because rpl_only_running_threads is set to 1 this can lead
      to silently not syncing all slave threads as expected, 
      ultimately resulting in unexpected results (and consequently
      on a failing test run).
            
      We fix this by replacing the START SLAVE instructions with
      calls to --source include/start_slave.inc, which will wait
      for the slave threads to be running (show 'Yes' in 
      Slave_IO|SQL_Running fields of SHOW SLAVE STATUS) before 
      proceeding. Additionally, we change rpl_sync.inc to make the
      IO thread report that it is running when its running status
      is any other than 'No'.
      f3df9ccd
  6. 02 Feb, 2011 7 commits
    • Georgi Kodinov's avatar
      merge · fff46bb7
      Georgi Kodinov authored
      fff46bb7
    • Georgi Kodinov's avatar
      merge · ccbd29e6
      Georgi Kodinov authored
      ccbd29e6
    • Georgi Kodinov's avatar
      merge · 1a8d63ee
      Georgi Kodinov authored
      1a8d63ee
    • Georgi Kodinov's avatar
      43b383cb
    • Georgi Kodinov's avatar
      merge to 5.1. · 33606525
      Georgi Kodinov authored
      33606525
    • Georgi Kodinov's avatar
      Fixes for Bug #55755 and Bug #52315 part 2 · 7edb13af
      Georgi Kodinov authored
      Bug #55755 : Date STD variable signness breaks server on FreeBSD and OpenBSD
      
      * Added a check to configure on the size of time_t
      * Created a macro to check for a valid time_t that is safe to use with datetime 
        functions and store in TIMESTAMP columns.
      * Used the macro consistently instead of the ad-hoc checks introduced by 52315
      * Fixed compliation warnings on platforms where the size of time_t is smaller than
        the size of a long (e.g. OpenBSD 4.8 64 amd64).
      
      Bug #52315: utc_date() crashes when system time > year 2037
      
      * Added a correct check for the timestamp range instead of just variable size check to
      SET TIMESTAMP.
      * Added overflow checking before converting to time_t. 
      * Using a correct localized error message in this case instead of the generic error.
      * Added a test suite.
      * fixed the checks so that they check for unsigned time_t as well. Used the checks 
        consistently across the source code.
      * fixed the original test case to expect the new error code.
      7edb13af
    • Dmitry Lenev's avatar
      Merged fix for bug #58650 "Failing assertion: · 5e1dad01
      Dmitry Lenev authored
      primary_key_no == -1 || primary_key_no == 0"
      with recent changes from mysql-5.5 tree.
      5e1dad01