diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-04-24 17:39:26 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-04-24 17:39:26 -0600 |
| commit | dc394cb9b5f0fafd55c2398d929fc1229b452f76 (patch) | |
| tree | 6a52fed2fc785303fcfb8cd3ae1d28e1c0bf6ecf /mysql-test | |
| parent | 0574441192273bd210232919eb72f2fc7eb153b2 (diff) | |
| download | mariadb-git-dc394cb9b5f0fafd55c2398d929fc1229b452f76.tar.gz | |
fixed redundant repetition of use db in mysqlbinlog
added support for virtual master ( replicating from a directory with binlogs)
test case for backup/restore with virtual master
client/mysqltest.c:
fix to accomodate for new test case
mysql-test/mysql-test-run.sh:
do not automagically start slave
sql/log.cc:
support for virtual master
sql/log_event.cc:
fix for mysqlbinlog
sql/log_event.h:
fix for mysqlbinlog
sql/mysqlbinlog.cc:
fix for mysqlbinlog
sql/slave.cc:
virtual master
sql/slave.h:
virtual master
sql/sql_class.h:
clean-up/fixes for virtual master
sql/sql_repl.cc:
cleanup/fixes for virtual master
sql/sql_repl.h:
virtual master
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 2 | ||||
| -rw-r--r-- | mysql-test/r/binlog-backup-restore.result | 5 | ||||
| -rw-r--r-- | mysql-test/t/binlog-backup-restore.test | 18 |
3 files changed, 24 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index cb4d750624e..008889ff521 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -490,7 +490,7 @@ start_slave() --core \ --tmpdir=$MYSQL_TMP_DIR \ --language=english \ - --skip-innodb \ + --skip-innodb --skip-slave-start \ $SMALL_SERVER \ $EXTRA_SLAVE_OPT $EXTRA_SLAVE_MYSQLD_OPT" if [ x$DO_DDD = x1 ] diff --git a/mysql-test/r/binlog-backup-restore.result b/mysql-test/r/binlog-backup-restore.result new file mode 100644 index 00000000000..ebfe8217906 --- /dev/null +++ b/mysql-test/r/binlog-backup-restore.result @@ -0,0 +1,5 @@ +n +11 +12 +13 +14 diff --git a/mysql-test/t/binlog-backup-restore.test b/mysql-test/t/binlog-backup-restore.test new file mode 100644 index 00000000000..546782c5825 --- /dev/null +++ b/mysql-test/t/binlog-backup-restore.test @@ -0,0 +1,18 @@ +reset master; +drop table if exists t1; +create table t1(n int); +insert into t1 values (1),(2),(3),(4); +flush logs; +update t1 set n = n + 10; +save_master_pos; +flush tables with read lock; +system rm -rf var/tmp/backup; +system mkdir -p var/tmp/backup; +system cp var/master-data/master-bin.* var/tmp/backup; +unlock tables; +drop table t1; +eval change master to master_host='$MYSQL_TEST_DIR/var/tmp/backup/master-bin'; +slave start; +sync_with_master; +select * from t1; + |