1. 13 May, 2009 3 commits
  2. 12 May, 2009 3 commits
    • Jim Winstead's avatar
      Merge in approved bug-fixes · 10611fe6
      Jim Winstead authored
      10611fe6
    • Jim Winstead's avatar
      Merge from 5.0-bugteam · c65ebb5d
      Jim Winstead authored
      c65ebb5d
    • Gleb Shchepa's avatar
      Bug #44290: explain crashes for subquery with distinct in · bd596287
      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.
      bd596287
  3. 11 May, 2009 2 commits
    • Mats Kindahl's avatar
      Merging with 5.1-bugteam tree. · 206bdd67
      Mats Kindahl authored
      206bdd67
    • Mats Kindahl's avatar
      Bug #44442: Incident events are silent in mysqlbinlog output · 8f95c5e1
      Mats Kindahl authored
            
      In the output from mysqlbinlog, incident log events were
      represented as just a comment. Since the incident log event
      represents an incident that could cause the contents of the
      database to change without being logged to the binary log,
      it means that if the SQL is applied to a server, it could
      potentially lead to that the databases are out of sync.
      
      In order to handle that, this patch adds the statement "RELOAD
      DATABASE" to the SQL output for the incident log event. This will
      require a DBA to edit the file and handle the case as apropriate
      before applying the output to a server.
      
      mysql-test/suite/binlog/t/binlog_incident-master.opt:
        Options file to cause server to generate an incident log
        event when executing a REPLACE.
      mysql-test/suite/binlog/t/binlog_incident.test:
        Test to check that the incident log event is represented
        correctly in the output from mysqlbinlog.
      sql/log_event.cc:
        The incident log event now ouput a "RELOAD DATABASE" instead
        of just a comment. RELOAD DATABASE is not an existing command
        and will generate a syntax error.
      8f95c5e1
  4. 10 May, 2009 2 commits
    • Ramil Kalimullin's avatar
      Manual merge. · 3c08b9b1
      Ramil Kalimullin authored
      3c08b9b1
    • Ramil Kalimullin's avatar
      Fix for bug#42009: SELECT into variable gives different results to direct SELECT · d615a11b
      Ramil Kalimullin authored
      Problem: storing "SELECT ... INTO @var ..." results in variables we used val_xxx()
      methods which returned results of the current row. 
      So, in some cases (e.g. SELECT DISTINCT, GROUP BY or HAVING) we got data
      from the first row of a new group (where we evaluate a clause) instead of
      data from the last row of the previous group.
      
      Fix: use val_xxx_result() counterparts to get proper results.
      
      
      mysql-test/r/distinct.result:
        Fix for bug#42009: SELECT into variable gives different results to direct SELECT
          - results adjusted.
      mysql-test/r/user_var.result:
        Fix for bug#42009: SELECT into variable gives different results to direct SELECT
          - test result.
      mysql-test/t/user_var.test:
        Fix for bug#42009: SELECT into variable gives different results to direct SELECT
          - test case.
      sql/item_func.cc:
        Fix for bug#42009: SELECT into variable gives different results to direct SELECT
          - Item_func_set_user_var::save_item_result() added to evaluate and store 
            an item's result into a user variable.
      sql/item_func.h:
        Fix for bug#42009: SELECT into variable gives different results to direct SELECT
          - Item_func_set_user_var::save_item_result() added to evaluate and store 
            an item's result into a user variable.
      sql/sql_class.cc:
        Fix for bug#42009: SELECT into variable gives different results to direct SELECT
          - use Item_func_set_user_var::save_item_result() to store results into user 
            variables.
      d615a11b
  5. 08 May, 2009 10 commits
  6. 07 May, 2009 7 commits
  7. 06 May, 2009 4 commits
  8. 05 May, 2009 9 commits
    • Davi Arnaut's avatar
      Remove unused variable. · 29de48d8
      Davi Arnaut authored
      29de48d8
    • Jim Winstead's avatar
      Fix incorrect filename in verbose output of innochecksum. (Bug #44484, · 84c5ba6e
      Jim Winstead authored
      patch contributed by Andrew Hutchings)
      84c5ba6e
    • Jim Winstead's avatar
      Merge with 5.1-bugteam. · 3636eab7
      Jim Winstead authored
      3636eab7
    • Bernt M. Johnsen's avatar
      f27d9c26
    • Narayanan V's avatar
      merging with mysql-5.1-bugteam · 32be2414
      Narayanan V authored
      32be2414
    • Martin Hansson's avatar
      Bug#43580: Issue with Innodb on multi-table update · 391364fa
      Martin Hansson authored
                              
      Certain multi-updates gave different results on InnoDB from
      to MyISAM, due to on-the-fly updates being used on the former and
      the update order matters.
      Fixed by turning off on-the-fly updates when update order 
      dependencies are present.
      
      
      mysql-test/r/innodb_mysql.result:
        Bug#43580: Test result.
      mysql-test/suite/rpl/r/rpl_slave_skip.result:
        Bug#43580: Changed test result. The InnoDB result is now what it would have been on MyISAM.
      mysql-test/t/innodb_mysql.test:
        Bug#43580: Test case.
      sql/sql_base.cc:
        Bug#43580: Added a word of caution about using tmp_set here.
      sql/sql_update.cc:
        Bug#43580: Fix.
        Calls to TABLE::mark_columns_needed_for_update() are moved
        from mysql_multi_update_prepare() and right before the decison
        to do on-the-fly updates to the place where we do (or don't do)
        on-the-fly updates.
      391364fa
    • Narayanan V's avatar
      Bug#44232 Error msg should be improved when collation not supported. · fdce1019
      Narayanan V authored
      When a user selected an unsupported character set for an
      IBMDB2I table, error 2501 or 2511 may have been returned,
      giving the appearance of an internal programming error.
      
      This patch consolidates these errors into a single descriptive
      error message for the common case of an unsupported character
      set.
      
      The new error number is 2504 and indicates a user error.
      The errors 2501 and 2511 remain to indicate cases of internal
      programming errors.
      
      storage/ibmdb2i/db2i_charsetSupport.cc:
        Bug#44232 Error msg should be improved when collation not supported.
                
        consolidate errors 2501 and 2511 into a single
        descriptive error message for the common case
        of an unsupported character set.
      storage/ibmdb2i/db2i_conversion.cc:
        Bug#44232 Error msg should be improved when collation not supported.
                
        consolidate errors 2501 and 2511 into a single
        descriptive error message for the common case
        of an unsupported character set.
      storage/ibmdb2i/db2i_errors.cc:
        Bug#44232 Error msg should be improved when collation not supported.
                
        consolidate errors 2501 and 2511 into a single
        descriptive error message for the common case
        of an unsupported character set.
      storage/ibmdb2i/db2i_errors.h:
        Bug#44232 Error msg should be improved when collation not supported.
                
        consolidate errors 2501 and 2511 into a single
        descriptive error message for the common case
        of an unsupported character set.
      fdce1019
    • Bernt M. Johnsen's avatar
      ef65e32d
    • Alexander Barkov's avatar
      Bug#44352 UPPER/LOWER function doesn't work correctly · 0df00705
      Alexander Barkov authored
      on cp932 and sjis environment.
      Problem: case conversion erroneously changes the second bytes
      of multi-byte sequences because single-byte functions were
      called in a mistake.
      Fix: call multi-byte aware functions instead.
      0df00705