--replace_result in mysqltest can now use variables

mysql-test/r/rpl000014.result

@@ -8,21 +8,21 @@ File	Position	Binlog_do_db	Binlog_ignore_db
 master-bin.001	79		
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	$MASTER_MYPORT	1	master-bin.001	79	Yes			0		0	1
+127.0.0.1	root	MASTER_PORT	1	master-bin.001	79	Yes			0		0	1
 change master to master_log_pos=73;
 slave stop;
 change master to master_log_pos=73;
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	$MASTER_MYPORT	1	master-bin.001	73	No			0		0	1
+127.0.0.1	root	MASTER_PORT	1	master-bin.001	73	No			0		0	1
 slave start;
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	$MASTER_MYPORT	1	master-bin.001	73	Yes			0		0	1
+127.0.0.1	root	MASTER_PORT	1	master-bin.001	73	Yes			0		0	1
 change master to master_log_pos=173;
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	$MASTER_MYPORT	1	master-bin.001	173	Yes			0		0	1
+127.0.0.1	root	MASTER_PORT	1	master-bin.001	173	Yes			0		0	1
 show master status;
 File	Position	Binlog_do_db	Binlog_ignore_db
 master-bin.001	79		

mysql-test/r/rpl000015.result

@@ -9,16 +9,16 @@ Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Rep
 change master to master_host='127.0.0.1';
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	test	3306	60		4	No			0		0	0
+127.0.0.1	test	MASTER_PORT	60		4	No			0		0	0
 change master to master_host='127.0.0.1',master_user='root',
-master_password='',master_port=9306;
+master_password='',master_port=MASTER_PORT;
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	9306	60		4	No			0		0	0
+127.0.0.1	root	MASTER_PORT	60		4	No			0		0	0
 slave start;
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	9306	60	master-bin.001	79	Yes			0		0	1
+127.0.0.1	root	MASTER_PORT	60	master-bin.001	79	Yes			0		0	1
 drop table if exists t1;
 create table t1 (n int);
 insert into t1 values (10),(45),(90);

mysql-test/r/rpl000016.result

@@ -2,11 +2,11 @@ slave start;
 Could not initialize master info structure, check permisions on master.info
 slave start;
 Could not initialize master info structure, check permisions on master.info
-change master to master_host='127.0.0.1',master_port=9306,
+change master to master_host='127.0.0.1',master_port=MASTER_PORT,
 master_user='root';
 Could not initialize master info
 reset slave;
-change master to master_host='127.0.0.1',master_port=9306,
+change master to master_host='127.0.0.1',master_port=MASTER_PORT,
 master_user='root';
 reset master;
 slave start;
@@ -15,7 +15,7 @@ create table t1 (s text);
 insert into t1 values('Could not break slave'),('Tried hard');
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	9306	60	master-bin.001	234	Yes			0		0	3
+127.0.0.1	root	MASTER_PORT	60	master-bin.001	234	Yes			0		0	3
 select * from t1;
 s
 Could not break slave
@@ -43,7 +43,7 @@ master-bin.003
 insert into t2 values (65);
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	9306	60	master-bin.003	155	Yes			0		0	3
+127.0.0.1	root	MASTER_PORT	60	master-bin.003	155	Yes			0		0	3
 select * from t2;
 m
 34
@@ -66,7 +66,7 @@ slave stop;
 slave start;
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	9306	60	master-bin.006	445	Yes			0		0	7
+127.0.0.1	root	MASTER_PORT	60	master-bin.006	445	Yes			0		0	7
 lock tables t3 read;
 select count(*) from t3 where n >= 4;
 count(*)

mysql-test/r/rpl_log.result

@@ -16,7 +16,7 @@ load data infile '../../std_data/words.dat' into table t1;
 drop table t1;
 show binlog events;
 Log_name	Pos	Event_type	Server_id	Log_seq	Info
-master-bin.001	4	Start	1	1	Server ver: $VERSION, Binlog ver: 2
+master-bin.001	4	Start	1	1	Server ver: VERSION, Binlog ver: 2
 master-bin.001	79	Query	1	2	use test; create table t1(n int not null auto_increment primary key)
 master-bin.001	172	Intvar	1	3	INSERT_ID=1
 master-bin.001	200	Query	1	4	use test; insert into t1 values (NULL)
@@ -41,7 +41,7 @@ insert into t1 values (1);
 drop table t1;
 show binlog events;
 Log_name	Pos	Event_type	Server_id	Log_seq	Info
-master-bin.001	4	Start	1	1	Server ver: $VERSION, Binlog ver: 2
+master-bin.001	4	Start	1	1	Server ver: VERSION, Binlog ver: 2
 master-bin.001	79	Query	1	2	use test; create table t1(n int not null auto_increment primary key)
 master-bin.001	172	Intvar	1	3	INSERT_ID=1
 master-bin.001	200	Query	1	4	use test; insert into t1 values (NULL)
@@ -68,8 +68,8 @@ slave-bin.001
 slave-bin.002
 show binlog events in 'slave-bin.001' from 4;
 Log_name	Pos	Event_type	Server_id	Log_seq	Info
-slave-bin.001	4	Start	2	1	Server ver: $VERSION, Binlog ver: 2
-slave-bin.001	79	Slave	2	3	host=127.0.0.1,port=$MASTER_MYPORT,log=master-bin.001,pos=4
+slave-bin.001	4	Start	2	1	Server ver: VERSION, Binlog ver: 2
+slave-bin.001	79	Slave	2	3	host=127.0.0.1,port=MASTER_PORT,log=master-bin.001,pos=4
 slave-bin.001	132	Query	1	2	use test; create table t1(n int not null auto_increment primary key)
 slave-bin.001	225	Intvar	1	3	INSERT_ID=1
 slave-bin.001	253	Query	1	4	use test; insert into t1 values (NULL)
@@ -82,13 +82,13 @@ slave-bin.001	689	Rotate	1	4	slave-bin.002;pos=4; forced by master
 slave-bin.001	729	Stop	2	5	
 show binlog events in 'slave-bin.002' from 4;
 Log_name	Pos	Event_type	Server_id	Log_seq	Info
-slave-bin.002	4	Slave	2	10	host=127.0.0.1,port=$MASTER_MYPORT,log=master-bin.002,pos=4
+slave-bin.002	4	Slave	2	10	host=127.0.0.1,port=MASTER_PORT,log=master-bin.002,pos=4
 slave-bin.002	57	Query	1	1	use test; create table t1 (n int)
 slave-bin.002	115	Query	1	2	use test; insert into t1 values (1)
 slave-bin.002	175	Query	1	3	use test; drop table t1
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	$MASTER_MYPORT	1	master-bin.002	170	Yes			0		0	3
+127.0.0.1	root	MASTER_PORT	1	master-bin.002	170	Yes			0		0	3
 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;
 Log_name	Log_pos

mysql-test/t/join.test

@@ -85,7 +85,7 @@ drop table t1, t2;
 create table t1 (a int primary key);
 insert into t1 values(1),(2);
 select t1.a from t1 as t1 left join t1 as t2 using (a) left join t1 as t3 using (a) left join t1 as t4 using (a) left join t1 as t5 using (a) left join t1 as t6 using (a) left join t1 as t7 using (a) left join t1 as t8 using (a) left join t1 as t9 using (a) left join t1 as t10 using (a) left join t1 as t11 using (a) left join t1 as t12 using (a) left join t1 as t13 using (a) left join t1 as t14 using (a) left join t1 as t15 using (a) left join t1 as t16 using (a) left join t1 as t17 using (a) left join t1 as t18 using (a) left join t1 as t19 using (a) left join t1 as t20 using (a) left join t1 as t21 using (a) left join t1 as t22 using (a) left join t1 as t23 using (a) left join t1 as t24 using (a) left join t1 as t25 using (a) left join t1 as t26 using (a) left join t1 as t27 using (a) left join t1 as t28 using (a) left join t1 as t29 using (a) left join t1 as t30 using (a) left join t1 as t31 using (a);
---replace_result 31 XX 63 XX
+--replace_result "31 tables" "XX tables" "63 tables" "XX tables"
 --error 1116
 select t1.a from t1 as t1 left join t1 as t2 using (a) left join t1 as t3 using (a) left join t1 as t4 using (a) left join t1 as t5 using (a) left join t1 as t6 using (a) left join t1 as t7 using (a) left join t1 as t8 using (a) left join t1 as t9 using (a) left join t1 as t10 using (a) left join t1 as t11 using (a) left join t1 as t12 using (a) left join t1 as t13 using (a) left join t1 as t14 using (a) left join t1 as t15 using (a) left join t1 as t16 using (a) left join t1 as t17 using (a) left join t1 as t18 using (a) left join t1 as t19 using (a) left join t1 as t20 using (a) left join t1 as t21 using (a) left join t1 as t22 using (a) left join t1 as t23 using (a) left join t1 as t24 using (a) left join t1 as t25 using (a) left join t1 as t26 using (a) left join t1 as t27 using (a) left join t1 as t28 using (a) left join t1 as t29 using (a) left join t1 as t30 using (a) left join t1 as t31 using (a) left join t1 as t32 using (a) left join t1 as t33 using (a) left join t1 as t34 using (a) left join t1 as t35 using (a) left join t1 as t36 using (a) left join t1 as t37 using (a) left join t1 as t38 using (a) left join t1 as t39 using (a) left join t1 as t40 using (a) left join t1 as t41 using (a) left join t1 as t42 using (a) left join t1 as t43 using (a) left join t1 as t44 using (a) left join t1 as t45 using (a) left join t1 as t46 using (a) left join t1 as t47 using (a) left join t1 as t48 using (a) left join t1 as t49 using (a) left join t1 as t50 using (a) left join t1 as t51 using (a) left join t1 as t52 using (a) left join t1 as t53 using (a) left join t1 as t54 using (a) left join t1 as t55 using (a) left join t1 as t56 using (a) left join t1 as t57 using (a) left join t1 as t58 using (a) left join t1 as t59 using (a) left join t1 as t60 using (a) left join t1 as t61 using (a) left join t1 as t62 using (a) left join t1 as t63 using (a) left join t1 as t64 using (a) left join t1 as t65 using (a);
 drop table t1;

mysql-test/t/rpl000014.test

-eval_result;
 source include/master-slave.inc;
 connection master;
 show master status;
 save_master_pos;
 connection slave;
 sync_with_master;
+--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
 show slave status;
 change master to master_log_pos=73;
 slave stop;
 change master to master_log_pos=73;
+--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
 show slave status;
 slave start;
+--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
 show slave status;
 change master to master_log_pos=173;
+--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
 show slave status;
 connection master;
 show master status;

mysql-test/t/rpl000015.test

 connect (master,localhost,root,,test,0,master.sock);
 connect (slave,localhost,root,,test,0, slave.sock);
-eval_result;
 connection master;
 reset master;
 show master status;
 save_master_pos;
 connection slave;
 reset slave;
+--replace_result $MASTER_MYPORT MASTER_PORT
 show slave status;
 change master to master_host='127.0.0.1';
+# The following needs to be cleaned up when change master is fixed
+--replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT 3334 MASTER_PORT
 show slave status;
+--replace_result $MASTER_MYPORT MASTER_PORT
 eval change master to master_host='127.0.0.1',master_user='root',
  master_password='',master_port=$MASTER_MYPORT;
+--replace_result $MASTER_MYPORT MASTER_PORT
 show slave status;
 slave start;
 sync_with_master;
+--replace_result $MASTER_MYPORT MASTER_PORT
 show slave status;
 connection master;
 drop table if exists t1;

mysql-test/t/rpl000016.test

 connect (master,localhost,root,,test,0,master.sock);
 connect (slave,localhost,root,,test,0,slave.sock);
-eval_result;
 system cat /dev/null > var/slave-data/master.info;
 system chmod 000 var/slave-data/master.info;
 connection slave;
 !slave start;
 system chmod 600 var/slave-data/master.info;
 !slave start;
+--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
 !eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT,
  master_user='root'; 
 reset slave;
+--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
 eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT,
  master_user='root'; 
 connection master;
@@ -23,6 +24,7 @@ insert into t1 values('Could not break slave'),('Tried hard');
 save_master_pos;
 connection slave;
 sync_with_master;
+--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
 show slave status;
 select * from t1;
 connection master;
@@ -70,6 +72,7 @@ insert into t2 values (65);
 save_master_pos;
 connection slave;
 sync_with_master;
+--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
 show slave status;
 select * from t2;
 connection master;
@@ -91,6 +94,7 @@ connection slave;
 slave stop;
 slave start;
 sync_with_master;
+--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
 show slave status;
 # because of concurrent insert, the table may not be up to date
 # if we do not lock

mysql-test/t/rpl_log.test

 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;
-

readline/rltty.c

@@ -368,6 +368,16 @@ static TIOTYPE otio;
 #  define OUTPUT_BEING_FLUSHED(tp)  0
 #endif
 
+#if defined (_AIX) || (defined (FLUSHO) && defined (_AIX41))
+static void
+rltty_warning (msg)
+     char *msg;
+{
+  fprintf (stderr, "readline: warning: %s\n", msg);
+}
+#endif
+
+
 #if defined (_AIX)
 void
 setopost(tp)