1. 15 May, 2009 24 commits
  2. 14 May, 2009 9 commits
    • Philip Stoev's avatar
      null merge. fix not applicable to 5.1 · 5f3dc895
      Philip Stoev authored
      5f3dc895
    • Philip Stoev's avatar
      Bugs #44871 and #43894: · ccc0ffb4
      Philip Stoev authored
        UNIX sockets need to be on a path shorter than 70 characters on some older platofrms.
        MTRv1 tries to fix this by moving the socket to the $TMPDIR, however this causes
        issues with certain tests on Windows.
      
        Fixed by not applying any hacks on Windows - Windows does not need them.
      ccc0ffb4
    • Kristofer Pettersson's avatar
      Bug#19027 MySQL 5.0 starts even with Fatal InnoDB errors · afee6322
      Kristofer Pettersson authored
      It is not possible to prevent the server from starting if a mandatory
      built-in plugin fails to start. This can in some cases lead to data
      corruption when the old table name space suddenly is used by a different
      storage engine.
      
      A boolean command line option in the form of --foobar is automatically
      created for every existing plugin "foobar". By changing this command line
      option from a boolean to a tristate { OFF, ON, FORCE } it is possible to
      specify the plugin loading policy for each plugin.
      
      The behavior is specified as follows:
         OFF   = Disable the plugin and start the server
         ON    = Enable the plugin and start the server even if an error occurrs
                 during plugin initialization.
         FORCE = Enable the plugin but don't start the server if an error occurrs
                 during plugin initialization.
      
      
      mysql-test/lib/mtr_cases.pm:
        * Changed --<pluginname> from a boolean to a tristate.
      mysys/my_getopt.c:
        * Changed --<pluginname> from boolean to tristate. Optional arguments
          must still work for tristates. It is praxis that disable means value 0
          and enable is value 1. Since plugin name is the only tristate with
          optional arguments this principle will still hold.
      sql/sql_plugin.cc:
        * Changed --<pluginname> option from a boolean type to a tristate.
          - FORCE will now terminate the server if the plugin fails to
            initialize properly.
        * Refactored prototypes for test_plugin_options() and construct_options()
          to get rid of the 'enable' value pointer.
        * Cleaned up code related to option name constructing.
        * Added documentation
      sql/sql_plugin.h:
        * Introduced new member to st_plugin_int structure.
      afee6322
    • Luis Soares's avatar
      e8e8f2fa
    • Philip Stoev's avatar
      Bugs #44871 and #43894: · e67233ff
      Philip Stoev authored
      UNIX sockets need to be on a path shorter than 70 characters on some older platofrms.
      MTRv1 tries to fix this by moving the socket to the $TMPDIR, however this causes
      issues with certain tests on Windows.
      
      Fixed by not applying any hacks on Windows - Windows does not need them.
      e67233ff
    • Narayanan V's avatar
      merging with mysql-5.1-bugteam · 872ec20e
      Narayanan V authored
      872ec20e
    • Jonathan Perkin's avatar
      09cf42a2
    • Narayanan V's avatar
      Bug#44232 Error msg should be improved when collation not supported. · 78283436
      Narayanan V authored
      checking in a test case that will reproduce
      the error on v5r4.
      
      mysql-test/suite/ibmdb2i/include/have_i54.inc:
        Bug#44232 Error msg should be improved when collation not supported.
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44232.result:
        Bug#44232 Error msg should be improved when collation not supported.
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44232.test:
        Bug#44232 Error msg should be improved when collation not supported.
      78283436
    • Anurag Shekhar's avatar
      merging with fix for compiler warnings. · 9320c933
      Anurag Shekhar authored
      9320c933
  3. 13 May, 2009 7 commits
    • Ramil Kalimullin's avatar
      Auto-merge. · d0128f5e
      Ramil Kalimullin authored
      d0128f5e
    • Jim Winstead's avatar
      Merge from 5.1-bugteam · 272c17d1
      Jim Winstead authored
      272c17d1
    • Jim Winstead's avatar
      Merge from 5.0-bugteam · 4161dc49
      Jim Winstead authored
      4161dc49
    • Martin Hansson's avatar
      Merge. · 5811a137
      Martin Hansson authored
      5811a137
    • Anurag Shekhar's avatar
      Bug #39802 On Windows, 32-bit time_t should be enforced · da0fe3cb
      Anurag Shekhar authored
      This patch fixes compilation warning, "conversion from 'time_t' to 'ulong', 
      possible loss of data". 
      The fix is to typecast time_t to ulong before assigning it to ulong. 
      Backported this from 6.0-bugteam tree.
      
      
      storage/archive/ha_archive.cc:
        type casting time_t to ulong before assigning.
      storage/federated/ha_federated.cc:
        type casting time_t to ulong before assigning.
      storage/innobase/handler/ha_innodb.cc:
        type casting time_t to ulong before assigning.
      storage/myisam/ha_myisam.cc:
        type casting time_t to ulong before assigning.
      da0fe3cb
    • Gleb Shchepa's avatar
      Bug #44290: explain crashes for subquery with distinct in · 585cf08f
      Gleb Shchepa authored
                  SQL_SELECT::test_quick_select
      
      The crash was caused by an incomplete cleanup of JOIN_TAB::select
      during the filesort of rows for GROUP BY clause inside a subquery.
      Queries where a quick index access is replaced with filesort was
      was affected. For example:
      
        SELECT 1 FROM
          (SELECT COUNT(DISTINCT c1) FROM t1
             WHERE c2 IN (1, 1) AND c3 = 2 GROUP BY c2) x
      
      Quick index access related data in the SQL_SELECT::test_quick_select
      function was inconsistent after an incomplete cleanup.
      This function has been completed to prevent crashes in the
      SQL_SELECT::test_quick_select function.
      
      
      mysql-test/include/mix1.inc:
        Add test case for bug #44290.
      mysql-test/r/innodb_mysql.result:
        Add test case for bug #44290.
      sql/sql_select.cc:
        Bug #44290: explain crashes for subquery with distinct in
                    SQL_SELECT::test_quick_select
        
        Quick index access related data in the SQL_SELECT::test_quick_select
        function was inconsistent after an incomplete cleanup.
        This function has been completed to prevent crashes in the
        SQL_SELECT::test_quick_select function.
      585cf08f
    • Ramil Kalimullin's avatar
      Fix for bug#44774 merged. · 80fdebaf
      Ramil Kalimullin authored
      80fdebaf