1. 12 Feb, 2010 7 commits
    • Guilhem Bichot's avatar
      merge with latest next-mr-bugfixing · 8cbae09d
      Guilhem Bichot authored
      8cbae09d
    • Alexander Nozdrin's avatar
      Fix tree name. · f625f7fd
      Alexander Nozdrin authored
      f625f7fd
    • Alexander Nozdrin's avatar
      bad2ea68
    • Evgeny Potemkin's avatar
      Auto-merged fix for the bug#50539. · be18172a
      Evgeny Potemkin authored
      be18172a
    • Evgeny Potemkin's avatar
      Bug#50539: Wrong result when loose index scan is used for an aggregate · 2d18c5be
      Evgeny Potemkin authored
                 function with distinct.
      Loose index scan is used to find MIN/MAX values using appropriate index and
      thus allow to avoid grouping. For each found row it updates non-aggregated
      fields with values from row with found MIN/MAX value.
      Without loose index scan non-aggregated fields are copied by end_send_group
      function. With loose index scan there is no need in end_send_group and
      end_send is used instead. Non-aggregated fields still need to be copied and
      this was wrongly implemented in QUICK_GROUP_MIN_MAX_SELECT::get_next.
      WL#3220 added a case when loose index scan can be used with end_send_group to
      optimize calculation of aggregate functions with distinct. In this case
      the row found by QUICK_GROUP_MIN_MAX_SELECT::get_next might belong to a next
      group and copying it will produce wrong result.
      
      Update of non-aggregated fields is moved to the end_send function from
      QUICK_GROUP_MIN_MAX_SELECT::get_next.
      
      
      mysql-test/r/group_min_max.result:
        Added a test case for the bug#50539.
      mysql-test/t/group_min_max.test:
        Added a test case for the bug#50539.
      sql/opt_range.cc:
        Bug#50539: Wrong result when loose index scan is used for an aggregate
        function with distinct.
        Update of non-aggregated fields is moved to the end_send function from
        QUICK_GROUP_MIN_MAX_SELECT::get_next.
      sql/sql_select.cc:
        Bug#50539: Wrong result when loose index scan is used for an aggregate
        function with distinct.
        Update of non-aggregated fields is moved to the end_send function from
        QUICK_GROUP_MIN_MAX_SELECT::get_next.
      2d18c5be
    • unknown's avatar
      Bug #43913 rpl_cross_version can't pass on conflicts complainig clash with · 125d5ea6
      unknown authored
      --slave-load-tm
            
      The MDL_SHARED lock was introduced for an object in 5.4, but the 'TABLE_LIST' 
      object was not initialized with the MDL_SHARED lock when applying event with 
      LOAD DATA INFILE into table. So the failure is caused when checking the 
      MDL_SHARED lock for the object.
            
      To fix the problem, the 'TABLE_LIST' object was initialized with the MDL_SHARED 
      lock when applying event with LOAD DATA INFILE into table.
      125d5ea6
    • unknown's avatar
      Bug #43913 rpl_cross_version can't pass on conflicts complainig clash with · d9338ad3
      unknown authored
      --slave-load-tm
            
      The MDL_SHARED lock was introduced for an object in 5.4, but the 'TABLE_LIST' 
      object was not initialized with the MDL_SHARED lock when applying event with 
      LOAD DATA INFILE into table. So the failure is caused when checking the 
      MDL_SHARED lock for the object.
      To fix the problem, the 'TABLE_LIST' object was initialized with the MDL_SHARED 
      lock when applying event with LOAD DATA INFILE into table.
      
      
      mysql-test/suite/rpl/t/disabled.def:
        Got rid of the line for enabling 'rpl_cross_version' test.
      d9338ad3
  2. 11 Feb, 2010 5 commits
    • Magne Mahre's avatar
      merge from mysql-trunk-bugfixing · f9509e9f
      Magne Mahre authored
      f9509e9f
    • Magne Mahre's avatar
      Bug#50574 5.5.x allows spatial indexes on non-spatial columns, · d80dc746
      Magne Mahre authored
                causing crashes!
      
      Adding a SPATIAL INDEX on a non-geometrical column caused a
      segmentation fault when the table was subsequently 
      inserted into.
            
      A test was added in mysql_prepare_create_table to explicitly
      check whether non-geometrical columns are used in a
      spatial index, and throw an error if so.
      
      
      mysql-test/t/gis.test:
        Added test cases to verify that only geometrical
        columns can get a spatial index.
                
        In addition, verify that only a single geom.
        column can participate in a spatial index.
      d80dc746
    • Magne Mahre's avatar
      merge · c1ccac83
      Magne Mahre authored
      c1ccac83
    • Magne Mahre's avatar
      Bug#50542 5.5.x doesn't check length of key prefixes: · 326e8681
      Magne Mahre authored
                corruption and crash results
            
      An index creation statement where the index key
      is larger/wider than the column it references 
      should throw an error.
            
      A statement like:
        CREATE TABLE t1 (a CHAR(1), PRIMARY KEY (A(255)))
      did not error, but a segmentation fault followed when
      an insertion was attempted on the table
            
      The partial key validiation clause has been 
      restructured to (hopefully) better document which
      uses of partial keys are valid.
      
      326e8681
    • Luis Soares's avatar
      Automerge from mysql-next-mr-bugfixing. · 8e8f5128
      Luis Soares authored
      8e8f5128
  3. 10 Feb, 2010 8 commits
    • Luis Soares's avatar
      Manual merge from mysql-next-mr bug branch. · 1f93408c
      Luis Soares authored
      Conflicts
      =========
        Text conflict in sql/sql_base.cc
      1f93408c
    • Luis Soares's avatar
      BUG#51021: current_stmt_binlog_row_based not removed in next-mr · 52d17ab4
      Luis Soares authored
      A closely related problem, hardly worth a new bug report:
      Removed a spurious call to:  
        thd->set_current_stmt_binlog_format_row_if_mixed()
      in sql_base.cc:lock_tables().
      52d17ab4
    • Luis Soares's avatar
      BUG#51021: current_stmt_binlog_row_based not removed in next-mr · 0e687023
      Luis Soares authored
      Deployed DBUG_ASSERT before the conditional binlog format
      restore.
      0e687023
    • Luis Soares's avatar
      Automerge from mysql-trunk-bugfixing. · e23f8e80
      Luis Soares authored
      e23f8e80
    • Luis Soares's avatar
      BUG#50984: check_testcase fails for rpl_tmp_table_and_DDL · b074aa64
      Luis Soares authored
            
      We found that there are some tests that are not cleaning
      up properly:
            
        1. rpl_tmp_table_and_DDL
        2. rpl_do_grant
        3. rpl_sync
            
      For #1 and #2 we found that the slave would not, for some
      cases, replicate all the instructions the master processed 
      in the cleanup section. We fix these by deploying some 
      synchronization commands in the test cases so that slave 
      processes all clean up instructions.
            
      As for #3, this is tracked as part of another bug 
      (BUG@50442).
      b074aa64
    • Mattias Jonsson's avatar
      merge · 744e026a
      Mattias Jonsson authored
      744e026a
    • Mattias Jonsson's avatar
      Bug#50201: Server crashes in explain_filename on an InnoDB partitioned table · f1f9ea40
      Mattias Jonsson authored
      Problem was that in mysql-trunk the ER() macro is now dependent on current_thd
      and the innodb monitor thread has no binding to that thd object. This cause 
      the crash because of bad derefencing.
      
      Solution was to add a new macro which take the thd as an argument (which the innodb
      thread uses for the call).
      
      (Updated according to reviewers comments, i.e. added ER_THD_OR_DEFAULT and
      moved test to suite parts.)
      
      mysql-test/suite/parts/r/partition_innodb_status_file.result:
        Bug#50201: Server crashes in explain_filename on an InnoDB partitioned table
        
        New test result file
      mysql-test/suite/parts/t/partition_innodb_status_file-master.opt:
        Bug#50201: Server crashes in explain_filename on an InnoDB partitioned table
        
        New test opt file
      mysql-test/suite/parts/t/partition_innodb_status_file.test:
        Bug#50201: Server crashes in explain_filename on an InnoDB partitioned table
        
        New test.
        Note that the innodb monitor thread only runs every 15 seconds, so this
        test will take at least 15 seconds, so I have moved it to the parts suite.
      sql/sql_table.cc:
        Bug#50201: Server crashes in explain_filename on an InnoDB partitioned table
        
        Using thd safe ER macro.
      sql/unireg.h:
        Bug#50201: Server crashes in explain_filename on an InnoDB partitioned table
        
        Added ER macros for use with specified thd pointer.
      f1f9ea40
    • Luis Soares's avatar
      Post-push fix: float/double to string conversions and vice versa · 45c2b723
      Luis Soares authored
      changed in mysql-next-mr (see: WL@2934). Thence, we need to 
      update the result file for rpl_stm_user_variables test case.
      45c2b723
  4. 09 Feb, 2010 13 commits
  5. 08 Feb, 2010 4 commits
  6. 05 Feb, 2010 3 commits