summaryrefslogtreecommitdiff
path: root/sql/slave.h
diff options
context:
space:
mode:
authorsasha@mysql.sashanet.com <>2001-07-10 18:08:37 -0600
committersasha@mysql.sashanet.com <>2001-07-10 18:08:37 -0600
commit5527f9bfc3e41117011104c3e91f574b7e2a3618 (patch)
tree918623c8d3e11e080897527e76b707833b1add58 /sql/slave.h
parentdb4a86020313514c181eab47efd1270cef934f15 (diff)
downloadmariadb-git-5527f9bfc3e41117011104c3e91f574b7e2a3618.tar.gz
mysql-test/t/rpl_sporadic_master.test
fixed test case to produce same results on txn-enabled binary. temporary fix - permanent fix is it make mysqld behave the same with MyISAM on auto_increment insert after delete from tbl_name regardless of how the binary was compiled sql/slave.cc fixed concurrency bug with log_seq sql/slave.h last_log_seq needs to be updated atomically with pos sql/sql_repl.cc cleared up comment and fixed concurrency bug
Diffstat (limited to 'sql/slave.h')
-rw-r--r--sql/slave.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/slave.h b/sql/slave.h
index eab73157799..8e49511e08d 100644
--- a/sql/slave.h
+++ b/sql/slave.h
@@ -36,11 +36,12 @@ typedef struct st_master_info
{
pending += val;
}
- inline void inc_pos(ulonglong val)
+ inline void inc_pos(ulonglong val, uint32 log_seq)
{
pthread_mutex_lock(&lock);
pos += val + pending;
pending = 0;
+ last_log_seq = log_seq;
pthread_cond_broadcast(&cond);
pthread_mutex_unlock(&lock);
}