From 9330f85b35b734a9b19db2f390c6340add5d976d Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 29 Jan 2002 13:50:09 -0700 Subject: temporary commit - need to pull Monty's changes mysql-test/t/rpl000001.test: modified test to break current replicatioin on a large log with a large lag in slave thread between append and read of the relay log mysys/mf_iocache.c: fixed one bug in IO_CACHE but there is another one not fixed yet sql/slave.cc: fixed bug in 3.23 master replication --- mysys/mf_iocache.c | 1 + 1 file changed, 1 insertion(+) (limited to 'mysys') diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index 6095cc23716..872757f77c5 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -823,6 +823,7 @@ int my_b_append(register IO_CACHE *info, const byte *Buffer, uint Count) } Count-=length; Buffer+=length; + info->end_of_file+=length; } end: -- cgit v1.2.1 From 1d76e90c1b61981e284bd583e54345cce9fe3551 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 31 Jan 2002 11:02:11 -0700 Subject: temporary commit to pull Monty's changes include/my_global.h: added dbug_volatile mysys/mf_iocache2.c: some debugging code to investigate failed assert in my_b_append_tell() sql/item_func.cc: fixed logging bug in DO RELEASE_LOCK() --- mysys/mf_iocache2.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'mysys') diff --git a/mysys/mf_iocache2.c b/mysys/mf_iocache2.c index a343829d32e..00ebf1e6846 100644 --- a/mysys/mf_iocache2.c +++ b/mysys/mf_iocache2.c @@ -27,7 +27,10 @@ my_off_t my_b_append_tell(IO_CACHE* info) { - my_off_t res; + /* prevent optimizer from putting res in a register when debugging + we need this to be able to see the value of res when the assert fails + */ + dbug_volatile my_off_t res; /* we need to lock the append buffer mutex to keep flush_io_cache() from messing with the variables that we need in order to provide the answer to the question. @@ -35,8 +38,11 @@ my_off_t my_b_append_tell(IO_CACHE* info) #ifdef THREAD pthread_mutex_lock(&info->append_buffer_lock); #endif + /* save the value of my_tell in res so we can see it when studying + coredump + */ DBUG_ASSERT(info->end_of_file - (info->append_read_pos-info->write_buffer) - == my_tell(info->file,MYF(0))); + == (res=my_tell(info->file,MYF(0)))); res = info->end_of_file + (info->write_pos-info->append_read_pos); #ifdef THREAD pthread_mutex_unlock(&info->append_buffer_lock); -- cgit v1.2.1