diff options
| author | unknown <sasha@mysql.sashanet.com> | 2002-01-26 22:26:24 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2002-01-26 22:26:24 -0700 |
| commit | 83666b3e54fb1ae572f1125bfc171b42c9692436 (patch) | |
| tree | 7805cfd6c7eb661c4f3022b7fc37478a0908a190 /include/my_sys.h | |
| parent | 845db7c20ba28e014c5a36a6c95afd8ed111f316 (diff) | |
| download | mariadb-git-83666b3e54fb1ae572f1125bfc171b42c9692436.tar.gz | |
misc replication bugfixes including some needed modifications in IO_CACHE
likely() and unlikely() branch prediction compiler hint macros
clean-up of comments
include/my_global.h:
added likely() and unlikely() macros to help some compilers optimize
the code for architecture-specific branch prediction policies
include/my_sys.h:
coverted my_b_append_tell() from macro to a function as it needed to be more
complex to avoid a potential race condition
mysql-test/mysql-test-run.sh:
hostname-independent relay log name to have consistent SHOW SLAVE STATUS
output
mysql-test/r/rpl000014.result:
result update
mysql-test/r/rpl000015.result:
result update
mysql-test/r/rpl000016.result:
result update
mysql-test/r/rpl_log.result:
result update
mysql-test/t/rpl000017-slave.sh:
proper cleanup of old logs
mysys/mf_iocache.c:
cosmetic changes + more debugging asserts
mysys/mf_iocache2.c:
my_b_append_tell()
cleanup of comments
sql/log.cc:
fix potential bug - do not rotate log in the middle of event
sql/slave.cc:
do not write stop events when the server does not actually stop but just
rotates the log
fixed race between queue_event() and show_slave_status()
clean-up of comments
sql/slave.h:
added ignore_stop_event flag to SLAVE_LOG_INFO
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 1d7c0b7ddb1..61f93d665cd 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -436,8 +436,9 @@ typedef int (*qsort2_cmp)(const void *, const void *, const void *); #define my_b_tell(info) ((info)->pos_in_file + \ (uint) (*(info)->current_pos - (info)->request_pos)) -#define my_b_append_tell(info) ((info)->end_of_file + \ - (uint) ((info)->write_pos - (info)->write_buffer)) + +/* tell write offset in the SEQ_APPEND cache */ +my_off_t my_b_append_tell(IO_CACHE* info); #define my_b_bytes_in_cache(info) (uint) (*(info)->current_end - \ *(info)->current_pos) |