Commit 99afb2ba authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0 

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1


mysql-test/r/rpl_temporary.result:
  Auto merged
sql/log.cc:
  Auto merged
parents 2478092d 35be8c88

mysql-test/include/get_binlog_dump_thread_id.inc

+1 −3
Original line number Diff line number Diff line
@@ -3,9 +3,7 @@ 
drop table if exists t999;

--enable_warnings

create temporary table t999 (f int);

### --replace_result $MYSQL_TEST_DIR "."  #failed on solaris etc bug#18906

--disable_query_log

--replace_result $MYSQLTEST_VARDIR "."

eval LOAD DATA INFILE "$MYSQLTEST_VARDIR/tmp/bl_dump_thread_id" into table t999;

--enable_query_log

let $id = `select f from t999`;

drop table t999;

mysql-test/r/rpl_temporary.result

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ create temporary table t4 (f int); 
create table t5 (f int);

drop table if exists t999;

create temporary table t999 (f int);

LOAD DATA INFILE "./tmp/bl_dump_thread_id" into table t999;

drop table t999;

insert into t4 values (1);

kill `select id from information_schema.processlist where command='Binlog Dump'`;

sql/log.cc

+5 −1
Original line number Diff line number Diff line
@@ -3122,7 +3122,11 @@ bool MYSQL_LOG::write(THD *thd, IO_CACHE *cache, Log_event *commit_event) 
      rotate binlog, if necessary.

    */

    if (commit_event->get_type_code() == XID_EVENT)

      thread_safe_increment(prepared_xids, &LOCK_prep_xids);

    {

      pthread_mutex_lock(&LOCK_prep_xids);

      prepared_xids++;

      pthread_mutex_unlock(&LOCK_prep_xids);

    }

    else

      rotate_and_purge(RP_LOCK_LOG_IS_ALREADY_LOCKED);

  }