--replace_result in mysqltest can now use variables

client/mysqltest.c:
  --replace_result can now use variables
mysql-test/r/rpl000014.result:
  Fix to use new replace
mysql-test/r/rpl000015.result:
  Fix to use new replace
mysql-test/r/rpl000016.result:
  Fix to use new replace
mysql-test/r/rpl_log.result:
  Fix to use new replace
mysql-test/t/join.test:
  Fix to use new replace
mysql-test/t/rpl000014.test:
  Fix to use new replace
mysql-test/t/rpl000015.test:
  Fix to use new replace
mysql-test/t/rpl000016.test:
  Fix to use new replace
mysql-test/t/rpl_log.test:
  Fix to use new replace
readline/rltty.c:
  Add missing function

1 files changed, 6 insertions, 3 deletions

diff --git a/mysql-test/t/rpl_log.test b/mysql-test/t/rpl_log.test
index 841524d57e6..1732e88b9de 100644
--- a/mysql-test/t/rpl_log.test
+++ b/mysql-test/t/rpl_log.test
@@ -1,11 +1,11 @@
 source include/master-slave.inc;
-eval_result; #result depends on some server specific params
 
 #clean up slave binlogs
 connection slave;
 slave stop;
 reset master;
 reset slave;
+let $VERSION=`select version()`;
 
 connection master;
 reset master;
@@ -16,6 +16,7 @@ drop table t1;
 create table t1 (word char(20) not null);
 load data infile '../../std_data/words.dat' into table t1;
 drop table t1;
+--replace_result $VERSION VERSION
 show binlog events;
 show binlog events from 79 limit 1;
 show binlog events from 79 limit 2;
@@ -24,17 +25,20 @@ flush logs;
 create table t1 (n int);
 insert into t1 values (1);
 drop table t1;
+--replace_result $VERSION VERSION
 show binlog events;
 show binlog events in 'master-bin.002';
 show master logs;
 save_master_pos;
 connection slave;
-let $VERSION=`select version()`;
 slave start;
 sync_with_master;
 show master logs;
+--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT $VERSION VERSION
 show binlog events in 'slave-bin.001' from 4;
+--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT $VERSION VERSION
 show binlog events in 'slave-bin.002' from 4;
+--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
 show slave status;
 show new master for slave with master_log_file='master-bin.001' and
  master_log_pos=4 and master_log_seq=1 and master_server_id=1;
@@ -46,4 +50,3 @@ show new master for slave with master_log_file='master-bin.002' and
  master_log_pos=4 and master_log_seq=1 and master_server_id=1;
 show new master for slave with master_log_file='master-bin.002' and
  master_log_pos=137 and master_log_seq=3 and master_server_id=1;
-