1. 30 Apr, 2009 9 commits
    • Sergey Glukhov's avatar
      automerge · 765cc53c
      Sergey Glukhov authored
      765cc53c
    • Satya B's avatar
      merget to 5.1-bugteam · f74e3ee5
      Satya B authored
      f74e3ee5
    • Satya B's avatar
      Addition to the fix for BUG#40827 - Killing insert-select to MyISAM can cause · c6d6e889
      Satya B authored
                                          table corruption
      
      
      Moved the testcase from the file myisam.test to the new testfile 
      mysiam_debug.test
       
      
      mysql-test/r/myisam.result:
        Removed result file for BUG#40827
      mysql-test/r/myisam_debug.result:
        Result file for BUG#40827
      mysql-test/t/myisam.test:
        Removed testcase for BUG#40827
      mysql-test/t/myisam_debug.test:
        TestCase for BUG#40827
      c6d6e889
    • Matthias Leich's avatar
      Merge 5.0 -> 5.1 of fix for Bug 44522 · 44e61995
      Matthias Leich authored
      This is a "null" merge because the fix is
      already in 5.1
      44e61995
    • Matthias Leich's avatar
    • Sergey Glukhov's avatar
      Bug#43962 "Packets out of order" calling a SHOW TABLE STATUS · 5d41d821
      Sergey Glukhov authored
      Error happens because sp_head::MULTI_RESULTS is not set for SP
      which has 'show table status' command.
      The fix is to add a SQLCOM_SHOW_TABLE_STATUS case into
      sp_get_flags_for_command() func.
      
      
      mysql-test/r/sp.result:
        test result
      mysql-test/t/sp.test:
        test case
      sql/sp_head.cc:
        Error happens because sp_head::MULTI_RESULTS is not set for SP
        which has 'show table status' command.
        The fix is to add a SQLCOM_SHOW_TABLE_STATUS case into
        sp_get_flags_for_command() func.
      5d41d821
    • Alexey Botchkov's avatar
      merging · 88139cba
      Alexey Botchkov authored
      88139cba
    • Alexey Botchkov's avatar
      mysql_client_test fixed. · 626a272e
      Alexey Botchkov authored
      per-file comments:
        tests/mysql_client_test.c
      the test for bug 37956 isn't relevant anymore.
      The query there 'select point(?,?)' doesn't produce an error.
      626a272e
    • Satya B's avatar
      Fix for BUG#40827 - Killing insert-select to MyISAM can cause table corruption · a5badbfe
      Satya B authored
                             
      Killing the insert-select statement corrupts the MyISAM table only
      when the destination table is empty and when it has indexes. When 
      we bulk insert huge data and if the destination table is empty we 
      disable the indexes for fast inserts, data is then inserted and 
      indexes are re-enabled after bulk_insert operation
                              
      Killing the query, aborts the repair table operation during enable
      indexes phase leading to table corruption.
                            
      We now truncate the table when we detect that enable indexes is
      killed for bulk insert query.As we have an empty table before the 
      operation, we can fix by truncating the table.
      
      mysql-test/r/myisam.result:
        Result file for BUG#40827
      mysql-test/t/myisam.test:
        Testcase for BUG#40827
      storage/myisam/ha_myisam.cc:
        Fixed end_bulk_insert() method to truncate the table when we detect enable 
        index operation is killed.
      a5badbfe
  2. 29 Apr, 2009 9 commits
    • Martin Hansson's avatar
      merge · 4ba05b50
      Martin Hansson authored
      4ba05b50
    • Vladislav Vaintroub's avatar
      merge · fbc38120
      Vladislav Vaintroub authored
      fbc38120
    • Martin Hansson's avatar
      Bug#43737: Select query return bad result · 45cbd326
      Martin Hansson authored
            
      A bug in the initialization of key segment information made it point
      to the wrong bit, since a bit index was used when its int value
      was needed. This lead to misinterpretation of bit columns
      read from MyISAM record format when a NULL bit pushed them over
      a byte boundary.
      Fixed by using the int value of the bit instead.
      
      
      mysql-test/r/myisam.result:
        Bug#43737: Test result.
      mysql-test/t/myisam.test:
        Bug#43737: Test case.
      storage/myisam/mi_open.c:
        Bug#43737: fix.
      45cbd326
    • Vladislav Vaintroub's avatar
      Bug#43932 myisam index corruption with large index and large · 73d3be94
      Vladislav Vaintroub authored
      key_buffer_size.
      
      The cause of corruption was number overflow when multiplying 
      two ulong values, number of used keycache blocks with size
      of a single block. The result of multiplication exceeded ulong 
      range (4G) and this lead to incorrectly calculated  buffer offset
      in the key cache.
      
      The fix is to use size_t for multiplication result.
      
      This patch also fixes pointless cast in safemalloc 
      (size of allocated block to uint), that creates lot of false
      alarm warnings when using big keycache (> 4GB) in debug mode.
      73d3be94
    • Narayanan V's avatar
      Bug#44337 Select query using index merge fails with MCH3601 · 70f53b1a
      Narayanan V authored
      The storage engine was not correctly handling the case in 
      which rnd_pos is executed for a handler without a preceding
      rnd_next or index read operation. As a result, an unitialized
      file handle was sometimes being passed to the QMY_READ API.
      
      The fix clears the rrnAssocHandle at the beginning of each
      read operation and then checks to see whether it has been
      set to a valid handle value before attempting to use it
      in rnd_pos. If rrnAssocHandle has not been set by a previous
      read operation, rnd_pos instead falls back to the use of the
      currently active handle.
      
      storage/ibmdb2i/ha_ibmdb2i.cc:
        Bug#44337 Select query using index merge fails with MCH3601
        
        - clear the rrnAssocHandle at the beginning of each
          read operation 
        - checks to see whether it has been set to a valid
          handle value before attempting to use it in rnd_pos
      70f53b1a
    • Alexey Botchkov's avatar
      merging · e7c4b2df
      Alexey Botchkov authored
      e7c4b2df
    • Alexey Botchkov's avatar
      merging · eed92880
      Alexey Botchkov authored
      eed92880
    • Alexey Botchkov's avatar
      merging · c471896f
      Alexey Botchkov authored
      c471896f
    • Alexey Botchkov's avatar
      merging · 0e88c805
      Alexey Botchkov authored
      0e88c805
  3. 28 Apr, 2009 12 commits
    • Alfranio Correia's avatar
      7f4e2564
    • Matthias Leich's avatar
      Automatic merge, no conflicts, no changes · 2d6d1767
      Matthias Leich authored
      2d6d1767
    • Matthias Leich's avatar
      Merge latest changes into local GCA tree · ae154dca
      Matthias Leich authored
      no conflicts
      ae154dca
    • Matthias Leich's avatar
      Merge of latest changes into local GCA tree · 07748b16
      Matthias Leich authored
      no conflicts
      07748b16
    • Matthias Leich's avatar
      Merge 5.0 -> 5.1 of fix for Bug 43546 · 14982a70
      Matthias Leich authored
            Several 5.0 tests do not pass MTR's --check option (moved from Bug 42308)
      14982a70
    • Matthias Leich's avatar
      Fix for Bug#43546 Several 5.0 tests do not pass MTR's --check option · 2328f9b1
      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
      2328f9b1
    • Staale Smedseng's avatar
      Merge from 5.0-bugteam · 90815182
      Staale Smedseng authored
      90815182
    • Staale Smedseng's avatar
      Bug#35769 typo in mysqlhotcopy documentation · 9f04d270
      Staale Smedseng authored
            
      Fixed a number of typos, and made punctuation and
      capitalization more consistent in documentation
      and help.
      9f04d270
    • Alexey Botchkov's avatar
      merging · ddc9a195
      Alexey Botchkov authored
      ddc9a195
    • Alexey Botchkov's avatar
      Bug#38990 Arbitrary data input plus GIS functions causes mysql server crash · 620fb880
      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
      620fb880
    • Gleb Shchepa's avatar
      manual merge 5.0-bugteam --> 5.1-bugteam · 755d312e
      Gleb Shchepa authored
      755d312e
    • Gleb Shchepa's avatar
      backport from 6.0: · def04705
      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.
      def04705
  4. 27 Apr, 2009 1 commit
  5. 26 Apr, 2009 1 commit
    • Alfranio Correia's avatar
      Fixed rpl_innodb_mixed_ddl and rpl_000015. · 6309ce95
      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.
      6309ce95
  6. 24 Apr, 2009 8 commits