bk commit into 5.0 tree (kent:1.1996)

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent 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
  1.1996 05/12/12 16:58:20 kent@stripped +3 -0
  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/skip_name_resolve.result
    1.3 05/12/12 16:56:06 kent@stripped +2 -2
    Ignore columns with unpredictable values.

  mysql-test/t/skip_name_resolve.test
    1.5 05/12/12 16:56:05 kent@stripped +1 -1
    Ignore columns with unpredictable values.

  mysql-test/r/rpl_relayrotate.result
    1.19 05/12/11 17:03:11 kent@stripped +0 -3
    Changed result file to match change in test

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	c-664072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.0-release

--- 1.18/mysql-test/r/rpl_relayrotate.result	2005-12-05 17:56:20 +01:00
+++ 1.19/mysql-test/r/rpl_relayrotate.result	2005-12-11 17:03:11 +01:00
@@ -10,9 +10,6 @@
 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

--- 1.2/mysql-test/r/skip_name_resolve.result	2005-09-22 21:03:48 +02:00
+++ 1.3/mysql-test/r/skip_name_resolve.result	2005-12-12 16:56:06 +01:00
@@ -10,5 +10,5 @@
 #
 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>

--- 1.4/mysql-test/t/skip_name_resolve.test	2005-09-22 21:03:48 +02:00
+++ 1.5/mysql-test/t/skip_name_resolve.test	2005-12-12 16:56:05 +01:00
@@ -15,6 +15,6 @@
 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;