1. 13 May, 2009 1 commit
    • Anurag Shekhar's avatar
      Bug #39802 On Windows, 32-bit time_t should be enforced · 8fd498bc
      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.
      8fd498bc
  2. 12 May, 2009 1 commit
    • Gleb Shchepa's avatar
      Bug #44290: explain crashes for subquery with distinct in · 555cbdb7
      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.
      555cbdb7
  3. 11 May, 2009 2 commits
    • Mats Kindahl's avatar
      Merging with 5.1-bugteam tree. · 0a99b633
      Mats Kindahl authored
      0a99b633
    • Mats Kindahl's avatar
      Bug #44442: Incident events are silent in mysqlbinlog output · 014dc99c
      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.
      014dc99c
  4. 10 May, 2009 2 commits
    • Ramil Kalimullin's avatar
      Manual merge. · d14d473c
      Ramil Kalimullin authored
      d14d473c
    • Ramil Kalimullin's avatar
      Fix for bug#42009: SELECT into variable gives different results to direct SELECT · 000049f0
      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.
      000049f0
  5. 08 May, 2009 7 commits
  6. 07 May, 2009 2 commits
    • Alexey Kopytov's avatar
      Bug #41943: mysqlbinlog.exe crashes if --hexdump option is used · 37d8a047
      Alexey Kopytov authored
        
      The --hexdump option crashed mysqlbinlog when used together  
      with the --read-from-remote-server option due to use of  
      uninitialized memory.  
        
      Since Log_event::print_header() relies on temp_buf to be  
      initialized when the --hexdump option is present,  
      dump_remote_log_entries() was fixed to setup temp_buf to point  
      to the start of a binlog event as done in  
      dump_local_log_entries().  
       
      The root cause of this bug is identical to the one for 
      bug #17654. The latter was fixed in 5.1 and up, so this 
      patch is backport of the patches for bug #17654 to 5.0. 
       
      Only 5.0 needs a changelog entry. 
      
      client/mysqlbinlog.cc:
        Fixed dump_remote_log_entries() so that temp_buf is initialized 
        as it may be used later by Log_event::print_header() if the 
        --hexdump option is present.
      mysql-test/r/mysqlbinlog.result:
        Added a test case for bug #41943.
      mysql-test/t/mysqlbinlog.test:
        Added a test case for bug #41943.
      37d8a047
    • Bernt M. Johnsen's avatar
      2dab98fc
  7. 06 May, 2009 4 commits
  8. 05 May, 2009 7 commits
    • Davi Arnaut's avatar
      Remove unused variable. · 58e7ee05
      Davi Arnaut authored
      58e7ee05
    • Jim Winstead's avatar
      Merge with 5.1-bugteam. · 58e01f56
      Jim Winstead authored
      58e01f56
    • Bernt M. Johnsen's avatar
      437fce8d
    • Narayanan V's avatar
      merging with mysql-5.1-bugteam · 6d3c4a60
      Narayanan V authored
      6d3c4a60
    • Narayanan V's avatar
      Bug#44232 Error msg should be improved when collation not supported. · b593e4cf
      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.
      b593e4cf
    • Bernt M. Johnsen's avatar
      453c82db
    • Alexander Barkov's avatar
      Bug#44352 UPPER/LOWER function doesn't work correctly · cdcfdf07
      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.
      cdcfdf07
  9. 04 May, 2009 6 commits
    • Sergei Golubchik's avatar
      bug#44166 · e85cd198
      Sergei Golubchik authored
      removed few sprintf's
      e85cd198
    • Martin Hansson's avatar
      Bug#44306: Assertion fail on duplicate key error in · 973c7793
      Martin Hansson authored
      'INSERT ... SELECT' statements
      
      Merge
      973c7793
    • Martin Hansson's avatar
      Bug#44306: Assertion fail on duplicate key error in · 221c8174
      Martin Hansson authored
      'INSERT ... SELECT' statements
                  
      The code that produces result rows expected that a duplicate row
      error could not occur in INSERT ... SELECT statements with 
      unfulfilled WHERE conditions. This may happen, however, if the 
      SELECT list contains only aggregate functions.
      Fixed by checking if an error occured before trying to send EOF
      to the client.
      
      
      mysql-test/r/insert_select.result:
        Bug#44306: Test result
      mysql-test/t/insert_select.test:
        Bug#44306: Test case
      sql/sql_select.cc:
        Bug#44306: Fix
      221c8174
    • Narayanan V's avatar
      BUG#39802 On Windows, 32-bit time_t should be enforced · e558c1c0
      Narayanan V authored
      A backport of fix for "BUG40092 - Storage engine API uses
      time_t datatype".
      
      Starting from MSVC C++ 2005 (v8), the default size of time_t
      is changed from 32-bit to 64-bit. As the result, the binaries
      built with pre-v8 MSVC C++ do not work with the binaries
      (storage engine plugins) built with v8 or after (server
      crashes).
      
      Fixed storage engine API to use datatype with known size
      (ulong) instead of time_t.
      
      sql/handler.h:
        Bug#39802 On Windows, 32-bit time_t should be enforced
        
        Change create_time, check_time, update_time
        in the ha_statistics and PARTITION_INFO
        structures to ulong.
      e558c1c0
    • Andrei Elkin's avatar
      9919a107
    • Satya B's avatar
      Additional Fix for BUG#40827 - Killing insert-select to MyISAM can cause · 9dc36a6e
      Satya B authored
                                     table corruption
      
      Disabling the mysiam_debug.test in embedded mode because of BUG#43733
      
      mysql-test/t/myisam_debug.test:
        Disable the test in embedded mode
      9dc36a6e
  10. 02 May, 2009 1 commit
    • Serge Kozlov's avatar
      Bug#38077. · 57d7b826
      Serge Kozlov authored
      1. Replace waiting of SQL thread stop by waiting of SQL error on slave and stopped
      SQL thread.
      2. Remove debug code because it already implemented in MTR2.
      57d7b826
  11. 30 Apr, 2009 7 commits