bzr commit into mysql-5.1-telco-6.3 branch (magnus.blaudd:3403)

[Magnus Blåudd]

#At file:///data0/magnus/mysql/merge-5.1.54/6.3/ based on revid:magnus.blaudd@stripped5xbm0w

 3403 Magnus Blåudd	2011-03-22
      Fix faulty mysqltest language syntax in rpl_heartbeat.test

    modified:
      mysql-test/suite/rpl/t/rpl_heartbeat.test
=== modified file 'mysql-test/suite/rpl/t/rpl_heartbeat.test'
--- a/mysql-test/suite/rpl/t/rpl_heartbeat.test	2010-10-12 11:54:35 +0000
+++ b/mysql-test/suite/rpl/t/rpl_heartbeat.test	2011-03-22 12:17:57 +0000
@@ -25,7 +25,7 @@ connection slave;
 # The warning has to be disabled as mtr can change the init value
 # for slave_net_timeout
 --disable_warnings
---let SAVE_NET_TIMEOUT=`select @@global.slave_net_timeout`;
+--let SAVE_NET_TIMEOUT=`select @@global.slave_net_timeout`
 set @@global.slave_net_timeout= 10;
 --enable_warnings
 ###

Attachment: [text/bzr-bundle] bzr/[e-mail]