Merge rurik.mysql.com:/home/igor/mysql-4.1

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

mysql-test/r/connect.result

@@ -44,3 +44,5 @@ tables_priv
 user
 show tables;
 Tables_in_test
+delete from mysql.user where user="test";
+flush privileges;

mysql-test/t/connect.test

@@ -62,3 +62,8 @@ show tables;
 #--error 1045
 #connect (con1,localhost,test,zorro,);
 #--error 1045
+
+# remove user 'test' so that other tests which may use 'test'
+# do not depend on this test.
+delete from mysql.user where user="test";
+flush privileges;

mysql-test/t/rpl_temporary.test

@@ -19,9 +19,7 @@ connection master;
 
 connect (con1,localhost,root,,);
 connect (con2,localhost,root,,);
-# user 'boo' does not exist, because we want to be ''@localhost or ''@127.0.0.1
-# (using user 'test' conflicts with what connect.test does). 
-connect (con3,localhost,boo,,);
+connect (con3,localhost,,,);
 
 # We are going to use SET PSEUDO_THREAD_ID in this test;
 # check that it requires the SUPER privilege.