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 /mysql-test/t/rpl000017-slave.sh | |
| 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 'mysql-test/t/rpl000017-slave.sh')
| -rwxr-xr-x | mysql-test/t/rpl000017-slave.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/t/rpl000017-slave.sh b/mysql-test/t/rpl000017-slave.sh index 555427a2376..066b4880cc1 100755 --- a/mysql-test/t/rpl000017-slave.sh +++ b/mysql-test/t/rpl000017-slave.sh @@ -1,4 +1,5 @@ -rm -f $MYSQL_TEST_DIR/var/slave-data/*relay* +rm -f $MYSQL_TEST_DIR/var/log/*relay* +rm -f $MYSQL_TEST_DIR/var/slave-data/relay-log.info cat > $MYSQL_TEST_DIR/var/slave-data/master.info <<EOF master-bin.001 4 |