bk commit into 6.0 tree (hakank:1.2574)

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
6.0 repository of hakank.  When hakank does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-26 00:53:00+01:00, hakank@lu0011.(none) +1 -0
  After merge fix.

  mysql-test/suite/rpl/r/rpl_heartbeat.result@stripped, 2008-02-26 00:52:54+01:00,
hakank@lu0011.(none) +4 -4
    After merge fix.

diff -Nrup a/mysql-test/suite/rpl/r/rpl_heartbeat.result
b/mysql-test/suite/rpl/r/rpl_heartbeat.result
--- a/mysql-test/suite/rpl/r/rpl_heartbeat.result	2008-02-26 00:05:02 +01:00
+++ b/mysql-test/suite/rpl/r/rpl_heartbeat.result	2008-02-26 00:52:54 +01:00
@@ -11,13 +11,13 @@ Variable_name	Slave_heartbeat_period
 Value	5.000
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root',
master_heartbeat_period= 0.0009999;
 Warnings:
-Warning	1666	The requested value for the heartbeat period  is less than 1 msec.  The
period is reset to zero which means no heartbeats will be sending
+Warning	1667	The requested value for the heartbeat period  is less than 1 msec.  The
period is reset to zero which means no heartbeats will be sending
 show status like 'Slave_heartbeat_period';;
 Variable_name	Slave_heartbeat_period
 Value	0.000
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root',
master_heartbeat_period= 4294967;
 Warnings:
-Warning	1666	The requested value for the heartbeat period  exceeds the value of
`slave_net_timeout' sec.  A sensible value for the period should be less than the
timeout.
+Warning	1667	The requested value for the heartbeat period  exceeds the value of
`slave_net_timeout' sec.  A sensible value for the period should be less than the
timeout.
 show status like 'Slave_heartbeat_period';;
 Variable_name	Slave_heartbeat_period
 Value	4294967.000
@@ -29,7 +29,7 @@ reset slave;
 set @@global.slave_net_timeout= 5;
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root',
master_heartbeat_period= 5.001;
 Warnings:
-Warning	1666	The requested value for the heartbeat period  exceeds the value of
`slave_net_timeout' sec.  A sensible value for the period should be less than the
timeout.
+Warning	1667	The requested value for the heartbeat period  exceeds the value of
`slave_net_timeout' sec.  A sensible value for the period should be less than the
timeout.
 show status like 'Slave_heartbeat_period';;
 Variable_name	Slave_heartbeat_period
 Value	5.001
@@ -41,7 +41,7 @@ Variable_name	Slave_heartbeat_period
 Value	4.000
 set @@global.slave_net_timeout= 3 /* must be a warning */;
 Warnings:
-Warning	1666	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.
+Warning	1667	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.
 reset slave;
 drop table if exists t1;
 set @@global.slave_net_timeout= 10;