Commit 2f13d1c0 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bkroot/mysql-5.1-new 

into  mysql.com:/home/bk/b15924-mysql-5.1-new


sql/sql_class.cc:
  Auto merged
mysql-test/t/disabled.def:
  Merge with mysql-5.1-new
parents 1aacfd4f 54231e45

mysql-test/t/disabled.def

+2 −1
Original line number Diff line number Diff line
@@ -23,5 +23,6 @@ subselect : Bug#15706 
type_time       : Bug#15805

#rpl000002       : Bug#15920 Temporary tables are not binlogged in SBR

ps_7ndb         : Bug#15923 Core dump in RBR mode when executing test suite

sp_trans        : Bug#15924 Code dump in RBR mode when executing test suite

#sp_trans        : Bug#15924 Code dump in RBR mode when executing test suite

mysqlslap       : Bug#16167

sql/log.cc

+11 −7
Original line number Diff line number Diff line
@@ -241,13 +241,15 @@ static int binlog_savepoint_set(THD *thd, void *sv) 
  DBUG_ENTER("binlog_savepoint_set");

  binlog_trx_data *const trx_data=

    (binlog_trx_data*) thd->ha_data[binlog_hton.slot];

  IO_CACHE *trans_log= &trx_data->trans_log;

  DBUG_ASSERT(mysql_bin_log.is_open() && my_b_tell(trans_log));

  DBUG_ASSERT(mysql_bin_log.is_open() && my_b_tell(&trx_data->trans_log));



  *(my_off_t *)sv= my_b_tell(trans_log);

  *(my_off_t *)sv= my_b_tell(&trx_data->trans_log);

  /* Write it to the binary log */

  Query_log_event qinfo(thd, thd->query, thd->query_length, TRUE, FALSE);

  DBUG_RETURN(mysql_bin_log.write(&qinfo));

  

  int const error=

    thd->binlog_query(THD::STMT_QUERY_TYPE,

                      thd->query, thd->query_length, TRUE, FALSE);

  DBUG_RETURN(error);

}



static int binlog_savepoint_rollback(THD *thd, void *sv)
@@ -265,8 +267,10 @@ static int binlog_savepoint_rollback(THD *thd, void *sv) 
  */

  if (unlikely(thd->options & OPTION_STATUS_NO_TRANS_UPDATE))

  {

    Query_log_event qinfo(thd, thd->query, thd->query_length, TRUE, FALSE);

    DBUG_RETURN(mysql_bin_log.write(&qinfo));

    int const error=

      thd->binlog_query(THD::STMT_QUERY_TYPE,

                        thd->query, thd->query_length, TRUE, FALSE);

    DBUG_RETURN(error);

  }

  reinit_io_cache(trans_log, WRITE_CACHE, *(my_off_t *)sv, 0, 0);

  DBUG_RETURN(0);

sql/sql_class.cc

+17 −0
Original line number Diff line number Diff line
@@ -1976,6 +1976,23 @@ void THD::reset_sub_statement_state(Sub_statement_state *backup, 
  backup->client_capabilities= client_capabilities;

  backup->savepoints= transaction.savepoints;



  /*

    For row-based replication and before executing a function/trigger,

    the pending rows event has to be flushed.  The function/trigger

    might execute statement that require the pending event to be

    flushed. A simple example:



      CREATE FUNCTION foo() RETURNS INT

      BEGIN

        SAVEPOINT x;

        RETURN 0;

      END



      INSERT INTO t1 VALUES (1), (foo()), (2);

  */

  if (binlog_row_based)

    thd->binlog_flush_pending_rows_event(false);



  if ((!lex->requires_prelocking() || is_update_query(lex->sql_command)) &&

      !binlog_row_based)

    options&= ~OPTION_BIN_LOG;