Below is the list of changes that have just been committed into a local
4.1 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:10:15+01:00, df@stripped +6 -0
remove hard-coded socket paths from some tests
mysql-test/t/grant_cache.test@stripped, 2006-12-19 15:10:14+01:00, df@stripped +7 -7
replace hard-coded socket paths with variable containing the appropriate path
mysql-test/t/myisam.test@stripped, 2006-12-19 15:10:14+01:00, df@stripped +1 -1
replace hard-coded socket paths with variable containing the appropriate path
mysql-test/t/query_cache_notembedded.test@stripped, 2006-12-19 15:10:14+01:00, df@stripped +2 -2
replace hard-coded socket paths with variable containing the appropriate path
mysql-test/t/rpl000015.test@stripped, 2006-12-19 15:10:14+01:00, df@stripped +2 -2
replace hard-coded socket paths with variable containing the appropriate path
mysql-test/t/rpl000017.test@stripped, 2006-12-19 15:10:14+01:00, df@stripped +2 -2
replace hard-coded socket paths with variable containing the appropriate path
mysql-test/t/rpl_rotate_logs.test@stripped, 2006-12-19 15:10:14+01:00, df@stripped +2 -2
replace hard-coded socket paths with variable containing the appropriate path
# 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-4.1-build-work-copy-with-a-very-long-path-name-some-random-stuff-follows-here-123gbasd0813boasydg1o3b1923gb9bda9sfd912fg3912bv39182g39vbd9asvgd912g391
--- 1.2/mysql-test/t/query_cache_notembedded.test 2005-08-11 12:06:26 +02:00
+++ 1.3/mysql-test/t/query_cache_notembedded.test 2006-12-19 15:10:14 +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.54/mysql-test/t/myisam.test 2006-10-09 19:40:15 +02:00
+++ 1.55/mysql-test/t/myisam.test 2006-12-19 15:10:14 +01:00
@@ -495,7 +495,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.14/mysql-test/t/grant_cache.test 2005-09-15 16:17:13 +02:00
+++ 1.15/mysql-test/t/grant_cache.test 2006-12-19 15:10:14 +01:00
@@ -14,7 +14,7 @@ set GLOBAL query_cache_size=1355776;
reset query cache;
flush status;
-connect (root,localhost,root,,test,$MASTER_MYPORT,master.sock);
+connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
connection root;
show grants for current_user;
show grants;
@@ -29,7 +29,7 @@ insert into mysqltest.t2 values (3,3,3);
create table test.t1 (a char (10));
insert into test.t1 values ("test.t1");
select * from t1;
-connect (root2,localhost,root,,mysqltest,$MASTER_MYPORT,master.sock);
+connect (root2,localhost,root,,mysqltest,$MASTER_MYPORT,$MASTER_MYSOCK);
connection root2;
# put queries in cache
select * from t1;
@@ -47,7 +47,7 @@ grant SELECT on test.t1 to mysqltest_2@l
grant SELECT(a) on mysqltest.t1 to mysqltest_3@localhost;
# The following queries should be fetched from cache
-connect (user1,localhost,mysqltest_1,,mysqltest,$MASTER_MYPORT,master.sock);
+connect (user1,localhost,mysqltest_1,,mysqltest,$MASTER_MYPORT,$MASTER_MYSOCK);
connection user1;
show grants for current_user();
show status like "Qcache_queries_in_cache";
@@ -72,12 +72,12 @@ show status like "Qcache_hits";
show status like "Qcache_not_cached";
# Don't use '' as user because it will pick Unix login
-connect (unkuser,localhost,unkuser,,,$MASTER_MYPORT,master.sock);
+connect (unkuser,localhost,unkuser,,,$MASTER_MYPORT,$MASTER_MYSOCK);
connection unkuser;
show grants for current_user();
# The following queries should be fetched from cache
-connect (user2,localhost,mysqltest_2,,mysqltest,$MASTER_MYPORT,master.sock);
+connect (user2,localhost,mysqltest_2,,mysqltest,$MASTER_MYPORT,$MASTER_MYSOCK);
connection user2;
select "user2";
select * from t1;
@@ -92,7 +92,7 @@ show status like "Qcache_hits";
show status like "Qcache_not_cached";
# The following queries should not be fetched from cache
-connect (user3,localhost,mysqltest_3,,mysqltest,$MASTER_MYPORT,master.sock);
+connect (user3,localhost,mysqltest_3,,mysqltest,$MASTER_MYPORT,$MASTER_MYSOCK);
connection user3;
select "user3";
--replace_result 127.0.0.1 localhost
@@ -113,7 +113,7 @@ show status like "Qcache_hits";
show status like "Qcache_not_cached";
# Connect without a database
-connect (user4,localhost,mysqltest_1,,*NO-ONE*,$MASTER_MYPORT,master.sock);
+connect (user4,localhost,mysqltest_1,,*NO-ONE*,$MASTER_MYPORT,$MASTER_MYSOCK);
connection user4;
select "user4";
show grants;
--- 1.30/mysql-test/t/rpl000015.test 2006-10-19 10:54:21 +02:00
+++ 1.31/mysql-test/t/rpl000015.test 2006-12-19 15:10:14 +01:00
@@ -1,5 +1,5 @@
-connect (master,localhost,root,,test,$MASTER_MYPORT,master.sock);
-connect (slave,localhost,root,,test,$SLAVE_MYPORT,slave.sock);
+connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
+connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);
connection master;
reset master;
show master status;
--- 1.52/mysql-test/t/rpl_rotate_logs.test 2005-09-01 17:19:16 +02:00
+++ 1.53/mysql-test/t/rpl_rotate_logs.test 2006-12-19 15:10:14 +01:00
@@ -9,11 +9,11 @@
# changes
# - Test creating a duplicate key error and recover from it
-connect (master,localhost,root,,test,$MASTER_MYPORT,master.sock);
+connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
--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 > var/slave-data/master.info;
system chmod 000 var/slave-data/master.info;
connection slave;
--- 1.12/mysql-test/t/rpl000017.test 2005-07-28 02:21:47 +02:00
+++ 1.13/mysql-test/t/rpl000017.test 2006-12-19 15:10:14 +01:00
@@ -1,5 +1,5 @@
-connect (master,localhost,root,,test,$MASTER_MYPORT,master.sock);
-connect (slave,localhost,root,,test,$SLAVE_MYPORT,slave.sock);
+connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
+connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);
connection master;
reset master;
grant replication slave on *.* to replicate@localhost identified by 'aaaaaaaaaaaaaaab';
| Thread |
|---|
| • bk commit into 4.1 tree (df:1.2586) | Daniel Fischer | 19 Dec |
