1. 04 May, 2009 1 commit
    • 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
  2. 29 Apr, 2009 4 commits
  3. 28 Apr, 2009 12 commits
    • Alfranio Correia's avatar
      8035473f
    • Matthias Leich's avatar
      Automatic merge, no conflicts, no changes · 93cc3be2
      Matthias Leich authored
      93cc3be2
    • Matthias Leich's avatar
      Merge latest changes into local GCA tree · a6a7a281
      Matthias Leich authored
      no conflicts
      a6a7a281
    • Matthias Leich's avatar
      Merge of latest changes into local GCA tree · d622fee5
      Matthias Leich authored
      no conflicts
      d622fee5
    • Matthias Leich's avatar
      Merge 5.0 -> 5.1 of fix for Bug 43546 · 290b6822
      Matthias Leich authored
            Several 5.0 tests do not pass MTR's --check option (moved from Bug 42308)
      290b6822
    • Matthias Leich's avatar
      Fix for Bug#43546 Several 5.0 tests do not pass MTR's --check option · 7cbc9173
      Matthias Leich authored
                        (moved from Bug 42308)
      
      Details:
      - insert_update
        Add DROP TABLE which was missing, error numbers -> names
      - varbinary
        Add DROP TABLE which was missing
      - sp_trans_log
        Add missing DROP function, improved formatting
      7cbc9173
    • Staale Smedseng's avatar
      Merge from 5.0-bugteam · 862966de
      Staale Smedseng authored
      862966de
    • Staale Smedseng's avatar
      Bug#35769 typo in mysqlhotcopy documentation · e773c1c6
      Staale Smedseng authored
            
      Fixed a number of typos, and made punctuation and
      capitalization more consistent in documentation
      and help.
      e773c1c6
    • Alexey Botchkov's avatar
      merging · 93d2da48
      Alexey Botchkov authored
      93d2da48
    • Alexey Botchkov's avatar
      Bug#38990 Arbitrary data input plus GIS functions causes mysql server crash · b3cf9cd9
      Alexey Botchkov authored
         the Point() and Linestring() functions create WKB representation of an
         object instead of an real geometry object.
         That produced bugs when these were inserted into tables.
      
         GIS tests fixed accordingly.
                  
      per-file messages:
        mysql-test/r/gis-rtree.result
      Bug#38990 Arbitrary data input plus GIS functions causes mysql server crash 
          test result
        mysql-test/r/gis.result
      Bug#38990 Arbitrary data input plus GIS functions causes mysql server crash 
          test result
        mysql-test/t/gis-rtree.test
      Bug#38990 Arbitrary data input plus GIS functions causes mysql server crash 
          test fixed - GeomFromWKB invocations removed
        mysql-test/t/gis.test
      Bug#38990 Arbitrary data input plus GIS functions causes mysql server crash 
          test fixed - AsWKB invocations added
        sql/item_geofunc.cc
      Bug#38990 Arbitrary data input plus GIS functions causes mysql server crash 
           Point() and similar functions to create a proper object
      b3cf9cd9
    • Gleb Shchepa's avatar
      manual merge 5.0-bugteam --> 5.1-bugteam · 5fcbc066
      Gleb Shchepa authored
      5fcbc066
    • Gleb Shchepa's avatar
      backport from 6.0: · 5e2fe847
      Gleb Shchepa authored
      Bug #40925: Equality propagation takes non indexed attribute
      
      Query execution plans and execution time of queries like
      
        select a, b, c from t1
          where a > '2008-11-21' and b = a limit 10
      
      depended on the order of equality operator parameters:
      "b = a" and "a = b" are not same. 
      
      
      An equality propagation algorithm has been fixed:
      the substitute_for_best_equal_field function should not
      substitute a field for an equal field if both fields belong
      to the same table.
      
      
      mysql-test/r/select.result:
        Added test case for bug #40925.
      mysql-test/t/select.test:
        Added test case for bug #40925.
      sql/item.cc:
        Bug #40925: Equality propagation takes non indexed attribute
        
        An equality propagation algorithm has been fixed:
        the substitute_for_best_equal_field function should not 
        substitute a field for an equal field if both fields belong
        to the same table.
      5e2fe847
  4. 27 Apr, 2009 1 commit
  5. 26 Apr, 2009 1 commit
    • Alfranio Correia's avatar
      Fixed rpl_innodb_mixed_ddl and rpl_000015. · 9db0946c
      Alfranio Correia authored
      Respectively, replaced "--exec diff" by "--diff_files" which is a mysqltest command to run a
      non-operating system specific diff. Removed the file rpl_000015-slave.sh as it is not
      necessary in the new MTR.
      9db0946c
  6. 24 Apr, 2009 10 commits
  7. 23 Apr, 2009 5 commits
  8. 21 Apr, 2009 4 commits
  9. 20 Apr, 2009 1 commit
    • Satya B's avatar
      Applying InnoDB snashot 5.1-ss3603. Fixes BUG#27276 · 16310354
      Satya B authored
      1) BUG#27276 - InnoDB Error: ibuf cursor restoration fails
      
      2) Follow up fix for BUG#27276 which fixes the bug introduced in
         the previous revision r2924
      
      Detailed revision comments:
      
      r2924 | marko | 2008-10-29 10:07:48 +0200 (Wed, 29 Oct 2008) | 7 lines
      branches/5.1: Merge revision 2866 from branches/zip:
      
      ibuf_delete_rec(): When the cursor to the insert buffer record cannot be
      restored, do not complain if the tablespace does not exist. (Bug #27276)
      
      Approved by Sunny Bains (rb://34)
      
      r3598 | marko | 2008-12-22 15:28:03 +0200 (Mon, 22 Dec 2008) | 6 lines
      branches/5.1: ibuf_delete_rec(): When the record cannot be found and
      the tablespace has been dropped, commit the mini-transaction, so that
      InnoDB will not hold the insert buffer tree latch in exclusive mode,
      causing a potential deadlock.  This bug was introduced in the fix of
      Bug #27276 in r2924.
      
      16310354
  10. 17 Apr, 2009 1 commit