bk commit into 5.0 tree (msvensson:1.1953)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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.1953 05/10/28 14:03:24 msvensson@neptunus.(none) +2 -0
  Use replace_result to mask portnumber printed from failing connect 

  mysql-test/t/connect.test
    1.18 05/10/28 14:02:59 msvensson@neptunus.(none) +10 -10
    Fix test to work also when no running on standard ports.

  mysql-test/r/connect.result
    1.19 05/10/28 14:02:59 msvensson@neptunus.(none) +10 -10
    Update test result

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0

--- 1.18/mysql-test/r/connect.result	2005-10-12 13:55:54 +02:00
+++ 1.19/mysql-test/r/connect.result	2005-10-28 14:02:59 +02:00
@@ -20,9 +20,9 @@
 user
 show tables;
 Tables_in_test
-connect(localhost,root,z,test2,9306,MYSQL_TEST_DIR/var/tmp/master.sock);
+connect(localhost,root,z,test2,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock);
 ERROR 28000: Access denied for user 'root'@'localhost' (using password: YES)
-connect(localhost,root,z,test,9306,MYSQL_TEST_DIR/var/tmp/master.sock);
+connect(localhost,root,z,test,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock);
 ERROR 28000: Access denied for user 'root'@'localhost' (using password: YES)
 grant ALL on *.* to test@localhost identified by "gambling";
 grant ALL on *.* to test@stripped identified by "gambling";
@@ -47,13 +47,13 @@
 user
 show tables;
 Tables_in_test
-connect(localhost,test,,test2,9306,MYSQL_TEST_DIR/var/tmp/master.sock);
+connect(localhost,test,,test2,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock);
 ERROR 28000: Access denied for user 'test'@'localhost' (using password: NO)
-connect(localhost,test,,"",9306,MYSQL_TEST_DIR/var/tmp/master.sock);
+connect(localhost,test,,"",MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock);
 ERROR 28000: Access denied for user 'test'@'localhost' (using password: NO)
-connect(localhost,test,zorro,test2,9306,MYSQL_TEST_DIR/var/tmp/master.sock);
+connect(localhost,test,zorro,test2,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock);
 ERROR 28000: Access denied for user 'test'@'localhost' (using password: YES)
-connect(localhost,test,zorro,test,9306,MYSQL_TEST_DIR/var/tmp/master.sock);
+connect(localhost,test,zorro,test,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock);
 ERROR 28000: Access denied for user 'test'@'localhost' (using password: YES)
 update mysql.user set password=old_password("gambling2") where user=_binary"test";
 flush privileges;
@@ -82,13 +82,13 @@
 user
 show tables;
 Tables_in_test
-connect(localhost,test,,test2,9306,MYSQL_TEST_DIR/var/tmp/master.sock);
+connect(localhost,test,,test2,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock);
 ERROR 28000: Access denied for user 'test'@'localhost' (using password: NO)
-connect(localhost,test,,test,9306,MYSQL_TEST_DIR/var/tmp/master.sock);
+connect(localhost,test,,test,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock);
 ERROR 28000: Access denied for user 'test'@'localhost' (using password: NO)
-connect(localhost,test,zorro,test2,9306,MYSQL_TEST_DIR/var/tmp/master.sock);
+connect(localhost,test,zorro,test2,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock);
 ERROR 28000: Access denied for user 'test'@'localhost' (using password: YES)
-connect(localhost,test,zorro,test,9306,MYSQL_TEST_DIR/var/tmp/master.sock);
+connect(localhost,test,zorro,test,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock);
 ERROR 28000: Access denied for user 'test'@'localhost' (using password: YES)
 delete from mysql.user where user=_binary"test";
 flush privileges;

--- 1.17/mysql-test/t/connect.test	2005-10-12 13:55:54 +02:00
+++ 1.18/mysql-test/t/connect.test	2005-10-28 14:02:59 +02:00
@@ -17,10 +17,10 @@
 connect (con2,localhost,root,,test);
 show tables;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
 --error 1045
 connect (fail_con,localhost,root,z,test2);
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
 --error 1045
 connect (fail_con,localhost,root,z,);
 
@@ -35,16 +35,16 @@
 connect (con4,localhost,test,gambling,test);
 show tables;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
 --error 1045
 connect (fail_con,localhost,test,,test2);
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
 --error 1045
 connect (fail_con,localhost,test,,"");
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
 --error 1045
 connect (fail_con,localhost,test,zorro,test2);
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
 --error 1045
 connect (fail_con,localhost,test,zorro,);
 
@@ -63,16 +63,16 @@
 connect (con6,localhost,test,gambling3,test);
 show tables;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
 --error 1045
 connect (fail_con,localhost,test,,test2);
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
 --error 1045
 connect (fail_con,localhost,test,,);
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
 --error 1045
 connect (fail_con,localhost,test,zorro,test2);
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
 --error 1045
 connect (fail_con,localhost,test,zorro,);