Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0

into mysql.com:/home/mysql_src/mysql-4.0

2 files changed, 10 insertions, 20 deletions

diff --git a/mysql-test/r/rpl000009.result b/mysql-test/r/rpl000009.result
index 4a8057467f2..569dd301143 100644
--- a/mysql-test/r/rpl000009.result
+++ b/mysql-test/r/rpl000009.result
@@ -111,22 +111,10 @@ n	s
 2	two bar
 3	three bar
 4	four bar
-insert into bar.t1 values(10, 'should be there');
-flush tables;
-load data from master;
-Error on delete of './bar/t1.MYI' (Errcode: 13)
-select * from bar.t1;
-n	s
-1	one bar
-2	two bar
-3	three bar
-4	four bar
-10	should be there
 load table bar.t1 from master;
 Table 't1' already exists
 drop table bar.t1;
 load table bar.t1 from master;
-start slave;
 drop database bar;
 drop database foo;
 drop database foo;
diff --git a/mysql-test/t/rpl000009.test b/mysql-test/t/rpl000009.test
index 975cfbf9a65..e019e1fc3a7 100644
--- a/mysql-test/t/rpl000009.test
+++ b/mysql-test/t/rpl000009.test
@@ -110,13 +110,14 @@ select * from bar.t1;
 
 # Check that LOAD DATA FROM MASTER reports the error if it can't drop a
 # table to be overwritten.
-insert into bar.t1 values(10, 'should be there');
-flush tables;
-system chmod 500 var/slave-data/bar/;
---error 6
-load data from master;  # should fail (errno 13)
-system chmod 700 var/slave-data/bar/;
-select * from bar.t1; # should contain the row (10, ...)
+# DISABLED FOR NOW AS chmod IS NOT PORTABLE ON NON-UNIX
+# insert into bar.t1 values(10, 'should be there');
+# flush tables;
+# system chmod 500 var/slave-data/bar/;
+# --error 6
+# load data from master;  # should fail (errno 13)
+# system chmod 700 var/slave-data/bar/;
+# select * from bar.t1; # should contain the row (10, ...)
 
 
 # Check that LOAD TABLE FROM MASTER fails if the table exists on slave
@@ -126,7 +127,8 @@ drop table bar.t1;
 load table bar.t1 from master;
 
 # as LOAD DATA FROM MASTER failed it did not restart slave threads
-start slave;
+# DISABLED FOR NOW
+# start slave;
 
 # Now time for cleanup
 connection master;