1. 16 Feb, 2010 2 commits
    • Serge Kozlov's avatar
      Bug#48308 · 25427713
      Serge Kozlov authored
      Merge mysql-trunk-bugfixing -> mysql-next-mr-bugfixing
      25427713
    • Serge Kozlov's avatar
      Bug#48308. · 67864dbf
      Serge Kozlov authored
      1. Now test use fake_relay_log primitive
      2. Added RESET SLAVE to include/setup_fake_relay_log.inc for removing relay log info file
      3. Added RESET SLAVE to include/cleanup_fake_relay_log.inc
      4. Test moved to rpl suite as rpl_binlog_auto_inc_bug33029.test
      5. Updated result file
      67864dbf
  2. 14 Feb, 2010 5 commits
    • Magne Mahre's avatar
      Bug#48929 Error in Accept() if using many file descriptors · e535a205
      Magne Mahre authored
      In POSIX systems, the file descriptor set used in the select(2)
      system call is represented by a bit vector of size FD_SETSIZE.
      When select(2) is used on file/socket descriptors with a value
      that is beyond this size, unpredictable errors may occur.
      
      In this case, the error happens when there are a large number
      of tables that need repair.  These tables are opened before
      the sockets for incoming connections are acquired, resulting
      in these sockets getting descriptor id which is higher than
      FD_SETSIZE.
      
      Replacing the call to select(2) with poll(2) fixes the problem,
      as poll takes an array of the wanted descriptors, instead of
      a bit vector.  
      
      MS Windows has a different implementation of 'select', and is not
      affected by this bug.  
      
      
      configure.in:
        Added a test for the <poll.h> file
      sql/mysqld.cc:
        Restructured some of the code to reduce the number of
        #ifdef's.  Removed some HP/UX 10-specific code.
      e535a205
    • Alexander Nozdrin's avatar
      Merge from mysql-trunk-bugfixing. · b494bedd
      Alexander Nozdrin authored
      b494bedd
    • Alexander Nozdrin's avatar
      Null-merge from mysql-trunk. · 67b7b282
      Alexander Nozdrin authored
      67b7b282
    • Alexander Nozdrin's avatar
      Empty merge from mysql-trunk. · 1f35368d
      Alexander Nozdrin authored
      1f35368d
    • Alexander Nozdrin's avatar
      Fix tree name. · ad703ca5
      Alexander Nozdrin authored
      ad703ca5
  3. 13 Feb, 2010 1 commit
  4. 12 Feb, 2010 15 commits
  5. 11 Feb, 2010 6 commits
    • Joerg Bruehe's avatar
      Upmerge changes done to the generic spec file in 5.0 to 5.1, · d8fe3cec
      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.
      d8fe3cec
    • 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
  6. 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
  7. 09 Feb, 2010 3 commits
    • Luis Soares's avatar
      BUG#51021: current_stmt_binlog_row_based not removed in next-mr · 347bbdd8
      Luis Soares authored
      As part of BUG@39934 fix, the public:
       - THD::current_stmt_binlog_row_based 
      variable had been removed and replaced by a private variable:
       - THD::current_stmt_binlog_format. 
      
      THD was refactored and some modifiers and accessors were
      implemented for the new variable.
      
      However, due to a bad merge, the
      THD::current_stmt_binlog_row_based variable is back as a public
      member of THD. This in itself is already potentially
      harmful. What's even worse is that while merging some more
      patches and resolving conflicts, the variable started being used
      again, which is obviously wrong.
      
      To fix this we:
        1. remove the extraneous variable from sql_class.h
        2. revert a bad merge for BUG#49132
        3. merge BUG#49132 properly again (actually, making use of the
           cset used to merge the original patch to mysql-pe).
      347bbdd8
    • Guilhem Bichot's avatar
      merge with latest next-mr-bugfixing · 14f6389d
      Guilhem Bichot authored
      14f6389d
    • Luis Soares's avatar
      Automerge from mysql-next-mr. · c3e3fc81
      Luis Soares authored
      c3e3fc81