1. 12 Feb, 2010 14 commits
  2. 11 Feb, 2010 6 commits
    • Joerg Bruehe's avatar
      Upmerge changes done to the generic spec file in 5.0 to 5.1, · 2813cd58
      Joerg Bruehe authored
      this includes a major whitespace (formatting) alignment
      and sequence changes to better agree with other spec files.
      
      Further changes:
      - All features are controlled by "%define" set from call
        options or builtin.
      - "bundled zlib" is on by default.
      - "with libgcc" is controlled by runtime detection of gcc.
      - Handling of "CFLAGS" and "CXXFLAGS" is more concentrated.
      - Several missing man pages were added.
      2813cd58
    • Magne Mahre's avatar
      merge from mysql-trunk-bugfixing · 4480e803
      Magne Mahre authored
      4480e803
    • Magne Mahre's avatar
      Bug#50574 5.5.x allows spatial indexes on non-spatial columns, · 20379351
      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.
      20379351
    • Magne Mahre's avatar
      merge · fe70c237
      Magne Mahre authored
      fe70c237
    • Magne Mahre's avatar
      Bug#50542 5.5.x doesn't check length of key prefixes: · 93cd02bc
      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.
      
      93cd02bc
    • Luis Soares's avatar
      Automerge from mysql-next-mr-bugfixing. · c4f1de9f
      Luis Soares authored
      c4f1de9f
  3. 10 Feb, 2010 8 commits
    • Luis Soares's avatar
      Manual merge from mysql-next-mr bug branch. · 7ae4c06d
      Luis Soares authored
      Conflicts
      =========
        Text conflict in sql/sql_base.cc
      7ae4c06d
    • Luis Soares's avatar
      BUG#51021: current_stmt_binlog_row_based not removed in next-mr · 87a589f8
      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().
      87a589f8
    • Luis Soares's avatar
      BUG#51021: current_stmt_binlog_row_based not removed in next-mr · 563ba7db
      Luis Soares authored
      Deployed DBUG_ASSERT before the conditional binlog format
      restore.
      563ba7db
    • Luis Soares's avatar
      Automerge from mysql-trunk-bugfixing. · 4eda0bf0
      Luis Soares authored
      4eda0bf0
    • Luis Soares's avatar
      BUG#50984: check_testcase fails for rpl_tmp_table_and_DDL · 5df69267
      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).
      5df69267
    • Mattias Jonsson's avatar
      merge · 6cd0eebe
      Mattias Jonsson authored
      6cd0eebe
    • Mattias Jonsson's avatar
      Bug#50201: Server crashes in explain_filename on an InnoDB partitioned table · dca67006
      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.
      dca67006
    • Luis Soares's avatar
      Post-push fix: float/double to string conversions and vice versa · d142fca3
      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.
      d142fca3
  4. 09 Feb, 2010 12 commits