bk commit into 5.0 tree (df:1.2353)

[Daniel Fischer]

Below is the list of changes that have just been committed into a local
5.0 repository of df. When df 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@stripped, 2006-12-19 15:31:10+01:00, df@stripped +6 -0
  Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
  into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
  MERGE: 1.1616.2867.30

  mysql-test/t/grant_cache.test@stripped, 2006-12-19 15:28:25+01:00, df@stripped +0
-7
    Auto merged
    MERGE: 1.9.1.6

  mysql-test/t/myisam.test@stripped, 2006-12-19 15:28:26+01:00, df@stripped +0 -0
    Auto merged
    MERGE: 1.33.1.22

  mysql-test/t/query_cache_notembedded.test@stripped, 2006-12-19 15:28:26+01:00,
df@stripped +0 -0
    Auto merged
    MERGE: 1.2.1.1

  mysql-test/t/rpl000015.test@stripped, 2006-12-19 15:31:08+01:00, df@stripped +0 -0
    SCCS merged
    MERGE: 1.25.1.6

  mysql-test/t/rpl000017.test@stripped, 2006-12-19 15:31:08+01:00, df@stripped +0 -0
    SCCS merged
    MERGE: 1.11.1.2

  mysql-test/t/rpl_rotate_logs.test@stripped, 2006-12-19 15:28:26+01:00, df@stripped
+0 -1
    Auto merged
    MERGE: 1.48.1.5

# 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:	df
# Host:	kahlann.erinye.com
# Root:	/home/df/mysql/build/mysql-5.0-build-work/RESYNC

--- 1.4/mysql-test/t/query_cache_notembedded.test	2006-03-15 18:15:42 +01:00
+++ 1.5/mysql-test/t/query_cache_notembedded.test	2006-12-19 15:28:26 +01:00
@@ -81,12 +81,12 @@ drop table t1, t2, t3, t11, t21;
 #
 # do not use QC if tables locked (BUG#12385)
 #
-connect (root,localhost,root,,test,$MASTER_MYPORT,master.sock);
+connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 connection root;
 CREATE TABLE t1 ( a INT NOT NULL PRIMARY KEY AUTO_INCREMENT ) ENGINE =
 MyISAM;
 LOCK TABLE t1 READ LOCAL;
-connect (root2,localhost,root,,test,$MASTER_MYPORT,master.sock);
+connect (root2,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 connection root2;
 INSERT INTO t1 VALUES (), (), ();
 connection root;

--- 1.70/mysql-test/t/myisam.test	2006-10-09 19:51:00 +02:00
+++ 1.71/mysql-test/t/myisam.test	2006-12-19 15:28:26 +01:00
@@ -498,7 +498,7 @@ insert into t1 values (1),(2),(3),(4),(5
 insert into t2 values (1,1),(2,1);
 lock tables t1 read local, t2 read local;
 select straight_join * from t1,t2 force index (primary) where t1.a=t2.a;
-connect (root,localhost,root,,test,$MASTER_MYPORT,master.sock);
+connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 insert into t2 values(2,0);
 disconnect root;
 connection default;

--- 1.34/mysql-test/t/rpl000015.test	2006-11-27 19:56:02 +01:00
+++ 1.35/mysql-test/t/rpl000015.test	2006-12-19 15:31:08 +01:00
@@ -1,5 +1,5 @@
 connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
-connect (slave,localhost,root,,test,$SLAVE_MYPORT,slave.sock);
+connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);
 connection master;
 reset master;
 show master status;

--- 1.65/mysql-test/t/rpl_rotate_logs.test	2006-04-24 10:21:04 +02:00
+++ 1.66/mysql-test/t/rpl_rotate_logs.test	2006-12-19 15:28:26 +01:00
@@ -16,7 +16,7 @@ connect (master,localhost,root,,test,$MA
 --disable_warnings
 drop table if exists t1, t2, t3, t4;
 --enable_warnings
-connect (slave,localhost,root,,test,$SLAVE_MYPORT,slave.sock);
+connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);
 system cat /dev/null > $MYSQLTEST_VARDIR/slave-data/master.info;
 system chmod 000 $MYSQLTEST_VARDIR/slave-data/master.info;
 connection slave;

--- 1.14/mysql-test/t/rpl000017.test	2006-01-26 17:54:28 +01:00
+++ 1.15/mysql-test/t/rpl000017.test	2006-12-19 15:31:08 +01:00
@@ -1,5 +1,5 @@
 connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
-connect (slave,localhost,root,,test,$SLAVE_MYPORT,slave.sock);
+connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);
 connection master;
 reset master;
 grant replication slave on *.* to replicate@localhost identified by 'aaaaaaaaaaaaaaab';