1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
unknown 2006-04-09 19:38:59 +03:00
commit 99afb2bafd
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/include/get_binlog_dump_thread_id.inc
View File

@ -3,9 +3,7 @@
drop table if exists t999; drop table if exists t999;
--enable_warnings --enable_warnings
create temporary table t999 (f int); create temporary table t999 (f int);
### --replace_result $MYSQL_TEST_DIR "." #failed on solaris etc bug#18906 --replace_result $MYSQLTEST_VARDIR "."
--disable_query_log
eval LOAD DATA INFILE "$MYSQLTEST_VARDIR/tmp/bl_dump_thread_id" into table t999; eval LOAD DATA INFILE "$MYSQLTEST_VARDIR/tmp/bl_dump_thread_id" into table t999;
--enable_query_log
let $id = `select f from t999`; let $id = `select f from t999`;
drop table t999; drop table t999;

1
mysql-test/r/rpl_temporary.result
View File

@ -78,6 +78,7 @@ create temporary table t4 (f int);
create table t5 (f int); create table t5 (f int);
drop table if exists t999; drop table if exists t999;
create temporary table t999 (f int); create temporary table t999 (f int);
LOAD DATA INFILE "./tmp/bl_dump_thread_id" into table t999;
drop table t999; drop table t999;
insert into t4 values (1); insert into t4 values (1);
kill `select id from information_schema.processlist where command='Binlog Dump'`; kill `select id from information_schema.processlist where command='Binlog Dump'`;

6
sql/log.cc
View File

@ -3122,7 +3122,11 @@ DBUG_skip_commit:
rotate binlog, if necessary. rotate binlog, if necessary.
*/ */
if (commit_event->get_type_code() == XID_EVENT) 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 else
rotate_and_purge(RP_LOCK_LOG_IS_ALREADY_LOCKED); rotate_and_purge(RP_LOCK_LOG_IS_ALREADY_LOCKED);
} }