diff options
| author | Luis Soares <luis.soares@sun.com> | 2009-11-04 12:28:20 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@sun.com> | 2009-11-04 12:28:20 +0000 |
| commit | fb175a1beb109efd095e2da4a391b52976b4a842 (patch) | |
| tree | b80f9a53099f9ca553f3731d7db011c4c110239e /mysql-test/include/master-slave.inc | |
| parent | 39f7da882e2a90e8d5eb3f49c4ba361f2b631ad9 (diff) | |
| download | mariadb-git-fb175a1beb109efd095e2da4a391b52976b4a842.tar.gz | |
BUG#48048: Deprecated constructs need removal in Betony
NOTE: Backport of:
bzr log -r revid:sp1r-serg@sergbook.mysql.com-20070505200319-38337
------------------------------------------------------------
revno: 2469.263.4
committer: serg@sergbook.mysql.com
timestamp: Sat 2007-05-05 13:03:19 -0700
message:
Removing deprecated features:
--master-XXX command-line options
log_bin_trust_routine_creators
table_type
BACKUP TABLE ...
RESTORE TABLE ...
SHOW PLUGIN
LOAD TABLE ... FROM MASTER
LOAD DATA FROM MASTER
SHOW INNODB STATUS
SHOW MUTEX STATUS
SHOW TABLE TYPES
... TIMESTAMP(N)
... TYPE=engine
RESET SLAVE don't reset connection parameters anymore
LOAD DATA: check opt_secure_file_priv before access(filename)
improved WARN_DEPRECATED macro
Diffstat (limited to 'mysql-test/include/master-slave.inc')
| -rw-r--r-- | mysql-test/include/master-slave.inc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mysql-test/include/master-slave.inc b/mysql-test/include/master-slave.inc index 25e0150dd0a..134bb61ddab 100644 --- a/mysql-test/include/master-slave.inc +++ b/mysql-test/include/master-slave.inc @@ -1,4 +1,6 @@ # Replication tests need binlog +# +# $skip_slave_start If true, the slave will not be started source include/have_log_bin.inc; connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,); @@ -8,7 +10,10 @@ connect (slave1,127.0.0.1,root,,test,$SLAVE_MYPORT,); -- source include/master-slave-reset.inc -connection master; -sync_slave_with_master; +if (!$skip_slave_start) { + connection master; + sync_slave_with_master; +} + # Set the default connection to 'master' connection master; |