diff options
| author | unknown <sasha@mysql.sashanet.com> | 2002-01-31 11:02:11 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2002-01-31 11:02:11 -0700 |
| commit | 1d76e90c1b61981e284bd583e54345cce9fe3551 (patch) | |
| tree | e9757e623a6a58c1cd6e97de7906ec6674e23046 /mysys/mf_iocache2.c | |
| parent | 6987f146cda13f6b817e4fca105c51beca9d4c9c (diff) | |
| download | mariadb-git-1d76e90c1b61981e284bd583e54345cce9fe3551.tar.gz | |
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()
Diffstat (limited to 'mysys/mf_iocache2.c')
| -rw-r--r-- | mysys/mf_iocache2.c | 10 |
1 files changed, 8 insertions, 2 deletions
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); |