diff options
| author | unknown <aelkin@mysql.com> | 2006-04-09 19:38:59 +0300 |
|---|---|---|
| committer | unknown <aelkin@mysql.com> | 2006-04-09 19:38:59 +0300 |
| commit | 99afb2bafd9b8be8f3e202e0de3a204bb6a65740 (patch) | |
| tree | bcb4b46936d69530d573981b9b02159646f3685e /sql | |
| parent | 2478092d131030b6b2dd8b834e2193bb21b1058b (diff) | |
| parent | 35be8c8892c1d6cc2b73abf1652b110f86cdbd30 (diff) | |
| download | mariadb-git-99afb2bafd9b8be8f3e202e0de3a204bb6a65740.tar.gz | |
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
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/log.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc index b93b5319ffb..5c67443d238 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -3122,7 +3122,11 @@ DBUG_skip_commit: 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); } |