Commit 761c75f3 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-5.1--main 

into  mysql.com:/home/mydev/mysql-5.1-amerge
parents 0e0755ea 0ad73944

mysql-test/extra/binlog_tests/innodb_stat.test

+2 −0
Original line number Diff line number Diff line 
# Embedded server doesn't support binlog

-- source include/not_embedded.inc

-- source include/have_innodb.inc



#

sql/log.cc

+2 −4
Original line number Diff line number Diff line
@@ -2852,7 +2852,7 @@ bool MYSQL_LOG::write(Log_event *event_info) 
    }

#endif /* HAVE_REPLICATION */



#ifdef USING_TRANSACTIONS

#if defined(USING_TRANSACTIONS) && defined(HAVE_ROW_BASED_REPLICATION)

    /*

      Should we write to the binlog cache or to the binlog on disk?

      Write to the binlog cache if:
@@ -2864,10 +2864,8 @@ bool MYSQL_LOG::write(Log_event *event_info) 
    */

    if (opt_using_transactions && thd)

    {

#ifdef HAVE_ROW_BASED_REPLICATION

      if (thd->binlog_setup_trx_data())

        goto err;

#endif /*HAVE_ROW_BASED_REPLICATION*/



      binlog_trx_data *const trx_data=

        (binlog_trx_data*) thd->ha_data[binlog_hton.slot];
@@ -2891,7 +2889,7 @@ bool MYSQL_LOG::write(Log_event *event_info) 
        LOCK_log.

      */

    }

#endif

#endif /* USING_TRANSACTIONS && HAVE_ROW_BASED_REPLICATION */

    DBUG_PRINT("info",("event type: %d",event_info->get_type_code()));



    /*

sql/sql_insert.cc

+2 −0
Original line number Diff line number Diff line
@@ -2778,7 +2778,9 @@ void select_create::binlog_show_create_table(TABLE **tables, uint count) 
    schema that will do a close_thread_tables(), destroying the

    statement transaction cache.

  */

#ifdef HAVE_ROW_BASED_REPLICATION

  DBUG_ASSERT(thd->current_stmt_binlog_row_based);

#endif

  DBUG_ASSERT(tables && *tables && count > 0);



  char buf[2048];