Commit d9d7b44c authored by unknown's avatar unknown
Browse files

skip_name_resolve.result, skip_name_resolve.test: 

  Ignore columns with unpredictable values.
rpl_relayrotate.result:
  Changed result file to match change in test


mysql-test/r/rpl_relayrotate.result:
  Changed result file to match change in test
mysql-test/t/skip_name_resolve.test:
  Ignore columns with unpredictable values.
mysql-test/r/skip_name_resolve.result:
  Ignore columns with unpredictable values.
parent 1f61e98e

mysql-test/r/rpl_relayrotate.result

+0 −3
Original line number Diff line number Diff line
@@ -10,9 +10,6 @@ reset slave; 
start slave;

stop slave;

start slave;

select master_pos_wait('master-bin.001',3000)>=0;

master_pos_wait('master-bin.001',3000)>=0

1

select max(a) from t1;

max(a)

8000

mysql-test/r/skip_name_resolve.result

+2 −2
Original line number Diff line number Diff line
@@ -10,5 +10,5 @@ user() 
#

show processlist;

Id	User	Host	db	Command	Time	State	Info

#	root	#	test	Sleep	#		NULL

#	root	#	test	Query	#	NULL	show processlist
 
<id>	root	<host>	test	<command>	<time>	<state>	<info>

<id>	root	<host>	test	<command>	<time>	<state>	<info>

mysql-test/t/skip_name_resolve.test

+1 −1
Original line number Diff line number Diff line
@@ -15,6 +15,6 @@ DROP USER mysqltest_1@'127.0.0.1/255.255.255.255'; 
connect (con1, 127.0.0.1, root, , test, $MASTER_MYPORT, );

--replace_column 1 #

select user();

--replace_column 1 # 6 # 3 #

--replace_column 1 <id> 3 <host> 5 <command> 6 <time> 7 <state> 8 <info>

show processlist;

connection default;