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/suite/rpl/r/rpl_heartbeat.result | |
| 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/suite/rpl/r/rpl_heartbeat.result')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_heartbeat.result | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_heartbeat.result b/mysql-test/suite/rpl/r/rpl_heartbeat.result index b79545b8336..92ba8549ee4 100644 --- a/mysql-test/suite/rpl/r/rpl_heartbeat.result +++ b/mysql-test/suite/rpl/r/rpl_heartbeat.result @@ -1,8 +1,6 @@ reset master; set @restore_slave_net_timeout= @@global.slave_net_timeout; set @@global.slave_net_timeout= 10; -Warnings: -Warning 1624 The currect value for master_heartbeat_period exceeds the new value of `slave_net_timeout' sec. A sensible value for the period should be less than the timeout. change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root'; show status like 'Slave_heartbeat_period';; Variable_name Slave_heartbeat_period @@ -59,7 +57,7 @@ Slave_IO_State # Master_Host 127.0.0.1 Master_User root Master_Port MASTER_PORT -Connect_Retry 1 +Connect_Retry 60 Master_Log_File master-bin.000001 Read_Master_Log_Pos 280 Relay_Log_File # @@ -100,7 +98,7 @@ Slave_IO_State # Master_Host 127.0.0.1 Master_User root Master_Port MASTER_PORT -Connect_Retry 1 +Connect_Retry 60 Master_Log_File master-bin.000001 Read_Master_Log_Pos 280 Relay_Log_File # |