1. 15 Feb, 2011 5 commits
    • Dmitry Lenev's avatar
      Merged recent changes from mysql-5.5 tree with · 093d94cc
      Dmitry Lenev authored
      fix for bug @59888.
      093d94cc
    • Dmitry Lenev's avatar
      Merged fix for bug #59888 "debug assertion when attempt to · 1cff3f95
      Dmitry Lenev authored
      create spatial index on char > 31 bytes". Did after-merge
      fixes.
      1cff3f95
    • Luis Soares's avatar
      BUG#11754075: BUG#45621: A FEW TEST FILES ARE DISABLED DUE TO WL#4284 · 44fac8ea
      Luis Soares authored
        
      Backporting the patch from BUG#11753506 into mysql-5.5 
      as it is already in mysql-trunk but not in mysql-5.5.
      44fac8ea
    • Luis Soares's avatar
      BUG#11754075: BUG#45621: A FEW TEST FILES ARE DISABLED DUE TO WL#4284 · 0d82c585
      Luis Soares authored
      Backporting the patch from BUG#11753489 into mysql-5.5 
      as it is already in mysql-trunk but not in mysql-5.5.
      0d82c585
    • Dmitry Lenev's avatar
      Fix for bug#11766714 (former bug @59888) "debug assertion when · 9c89cca5
      Dmitry Lenev authored
      attempt to create spatial index on char > 31 bytes".
      
      Attempt to create spatial index on char field with length
      greater than 31 byte led to assertion failure on server
      compiled with safemutex support.
      
      The problem occurred in mi_create() function which was called
      to create a new version of table being altered. This function
      failed since it detected an attempt to create a spatial key
      on non-binary column and tried to return an error.
      On its error path it tried to unlock THR_LOCK_myisam mutex
      which has not been not locked at this point. Indeed such an
      incorrect behavior was caught by safemutex wrapper and caused
      assertion failure.
      
      This patch fixes the problem by ensuring that mi_create()
      doesn't releases THR_LOCK_myisam mutex on error path if it was
      not acquired.
      
      mysql-test/r/gis.result:
        Added test for bug @59888 "debug assertion when attempt to
        create spatial index on char > 31 bytes".
      mysql-test/t/gis.test:
        Added test for bug @59888 "debug assertion when attempt to
        create spatial index on char > 31 bytes".
      storage/myisam/mi_create.c:
        Changed mi_create() not to release THR_LOCK_myisam mutex on
        error path if it was not acquired.
      9c89cca5
  2. 14 Feb, 2011 2 commits
    • Joerg Bruehe's avatar
      Merge bug fix 42969 into main 5.5 branch. · a7662cf0
      Joerg Bruehe authored
      a7662cf0
    • Jon Olav Hauglid's avatar
      Bug #11766788 (former bug 59986) · 3058b8e2
      Jon Olav Hauglid authored
      Assert in Diagnostics_area::set_ok_status() for XA COMMIT
      
      This assert was triggered if XA COMMIT was issued when an XA transaction
      already had encountered an error (e.g. a deadlock) which required
      the XA transaction to be rolled back.
      
      In general, the assert is triggered if a statement tries to send OK to
      the client when an error has already been reported. It was triggered
      in this case because the trans_xa_commit() function first reported an
      error, then rolled back the transaction and finally returned FALSE,
      indicating success. Since trans_xa_commit() reported success,
      mysql_execute_command() tried to report OK, triggering the assert.
      
      This patch fixes the problem by fixing trans_xa_commit() to return TRUE
      if it encounters an error that requires rollback, even if the rollback
      itself is successful.
      
      Test case added to xa.test.
      3058b8e2
  3. 11 Feb, 2011 3 commits
    • Joerg Bruehe's avatar
      Fix bug#42969 Please add a MANIFEST to each build · bb956c1e
      Joerg Bruehe authored
      With this change, there will be new files "INFO_SRC"
      and "INFO_BIN", which describe the source and the
      binaries.
      They will be contained in all packages:
      - in "tar.gz" and derived packages, in "docs/",
      - in RPMs, in "/usr/share/doc/packages/MySQL-server".
      
      "INFO_SRC" is also part of a source tarball.
      It gives the version as exact as possible, preferably
      by calling "bzr version-info" on the source tree.
      If that is not possible, it just contains the three
      level version number.
      
      "INFO_BIN" contains some info when and where the
      binaries were built, the options given to the compiler,
      and the flags controlling the included features.
      
      The tests (test "mysql" in the main suite) are extended
      to verify the existence of both "INFO_SRC" and "INFO_BIN",
      as well as some of the expected contents.
      
      
      CMakeLists.txt:
        For the new files describing the source and the build
        ("INFO_SRC" and "INFO_BIN"), we need a new file
        "cmake/info_macros.cmake.in" with the build rules.
        
        1) This file must be configured with the current variables.
        
        2) "INFO_SRC" can be created during the cmake phase,
           but this should be repeated with each "make" to
        protect against a developer doing only "make" after
        a "bzr pull" (or "bzr commit").
        So have it both as a cmake rule and as a custom target.
        
        3) "INFO_BIN" must be created during the make phase
           only, because it contains information from files
        which will be written at the end of the cmake phase only.
        Therefore, it must be a custom target which is included
        in all "make" targets.
        
        4) The resulting "INFO_*" files must be included in packages.
      cmake/info_bin.cmake:
        This is the file to create "INFO_BIN",
        by calling the "CREATE_INFO_BIN()" macro.
        
        It must be a separate file, so that the macro
        definitions can be included in other cmake scripts
        without that file inclusion causing a side effect,
        the macro call.
        That call would modify the source tree which should
        be trated read-only.
      cmake/info_macros.cmake.in:
        This new file contains the macros to create the
        "INFO_*" files during various steps of the build,
        the calls will be at other places.
        
        1) For source: If running from a BZR tree, always create
           (update) "INFO_SRC" by running "bzr version-info".
           Outside a BZR tree, try to take it from exported
           sources, and create it only if missing, in that
           case put the three level version number into it.
        
        2) "INFO_BIN" contains
           - date/time and host name of the build host,
           - information about the platform,
           - information about the C and CXX compiler
             and the options given to them (Unix only),
           - the feature flags as reported by "cmake -L".
      cmake/info_src.cmake:
        This is the file to create "INFO_SRC",
        by calling the "CREATE_INFO_SRC()" macro.
        
        It must be a separate file, so that the macro
        definitions can be included in other cmake scripts
        without that file inclusion causing a side effect,
        the macro call.
        That call would modify the source tree which should
        be trated read-only.
      cmake/make_dist.cmake.in:
        Create a "VERSION_src" file during "make dist".
        
        In case it already exists from a preceding "cmake" run
        or tree export (which is quite likely), a new
        "make dist" must not modify it.
      mysql-test/r/file_contents.result:
        Result of test for bug#42969.
      mysql-test/t/file_contents.test:
        Perl test scriptlet for bug#42969.
      support-files/mysql.spec.sh:
        Add "INFO_SRC" and "INFO_BIN" to the RPM contents.
      bb956c1e
    • Georgi Kodinov's avatar
      bumped up the version to 5.1.11 · b8d2f808
      Georgi Kodinov authored
      b8d2f808
    • Georgi Kodinov's avatar
      version bump to 5.1.57 · 86721715
      Georgi Kodinov authored
      86721715
  4. 10 Feb, 2011 2 commits
  5. 09 Feb, 2011 5 commits
  6. 08 Feb, 2011 7 commits
  7. 07 Feb, 2011 6 commits
    • Bjorn Munch's avatar
      merge 47141,59979 · 285c7d04
      Bjorn Munch authored
      285c7d04
    • 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
      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
    • 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
      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
      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
  8. 05 Feb, 2011 1 commit
    • 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
  9. 04 Feb, 2011 5 commits
    • Luis Soares's avatar
    • Bjorn Munch's avatar
      merge from 5.1 main · bb3e48c2
      Bjorn Munch authored
      bb3e48c2
    • Bjorn Munch's avatar
      Bug #47141 "mysqltest" breaks because it tries to act on a debug option which is disabled · cd51cbf1
      Bjorn Munch authored
      Replace --debug with --loose-debug to prevent failure exit
      Update: added workaround for 50627, skip all debugging of mysqlbinlog
      cd51cbf1
    • Vasil Dimov's avatar
      Fix Bug#59874 Valgrind warning in InnoDB compression code · 5082c4d1
      Vasil Dimov authored
      Add suppressions for a bogus valgrind warnings.
      5082c4d1
    • Dmitry Shulga's avatar
      Fixed bug#58026 - massive recursion and crash in regular expression · 378091e4
      Dmitry Shulga authored
      handling.
      
      The problem was that parsing of nested regular expression involved
      recursive calls. Such recursion didn't take into account the amount of
      available stack space, which ended up leading to stack overflow crashes.
      
      mysql-test/t/not_embedded_server.test:
        Added test for bug#58026.
      regex/my_regex.h:
        added pointer to function as last argument of my_regex_init() for check
        enough memory in stack.
      regex/regcomp.c:
        p_ere() was modified: added call to function for check enough memory
        in stack. Function for check available stack space specified by
        global variable my_regex_enough_mem_in_stack. This variable set to
        NULL for embedded mysqld and to a pointer to function
        check_enough_stack_size otherwise.
      regex/reginit.c:
        my_regex_init was modified: pass a pointer to a function for check
        enough memory in stack space. Reset this pointer to NULL in my_regex_end.
      sql/mysqld.cc:
        Added function check_enough_stack_size() for check enough memory in stack.
        Passed this function as second argument to my_regex_init. For embedded 
        mysqld passed NULL as second argument.
      378091e4
  10. 03 Feb, 2011 2 commits
    • Joerg Bruehe's avatar
      Fix Bug #56581 RPM scripts use hardcoded datadir location · 106e5900
      Joerg Bruehe authored
      When fixing the 27072 bug, the shell snippets running before/after
      a RPM upgrade got expanded to look at files in the data directory
      and at the PID file.
      In this expansion, the standard locations were used.
      
      There are users who configure their installations to use non-standard
      locations for the data directory, the PID file, and other objects.
      For these users, the fix of 27072 did not work.
      As a result, the fact that a server was running at upgrade start was
      not noticed, and the new server was not started after the upgrade.
      
      With this patch, the shell snippets now try to get these locations
      from "my_print_defaults" before falling back to the defaults.
      Now, the fact that the old server is running is again noticed (even
      with non-standard locations), and the new server is started.
      
      Also, the upgrade log is written to the correct data directory.
      
      support-files/mysql.spec.sh:
        See the global comment for the purpose of this change.
        
        In tests on SuSE 11, it was found necessary to use the full path name
        of "my_print_defaults", it seems $PATH die not include "/usr/bin".
      106e5900
    • Luis Soares's avatar
      BUG#59147: rpl_circular_for_4_hosts fails sporadically · cb10771f
      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'.
      cb10771f
  11. 02 Feb, 2011 2 commits