bzr commit into mysql-6.0-rpl branch (msvensson:2764)

[Magnus Svensson]

#At file:///home/msvensson/mysql/tmp/6.0-rpl/ based on revid:aelkin@stripped

 2764 Magnus Svensson	2008-12-19 [merge]
      Merge
modified:
  mysql-test/t/drop-no_root.test

=== modified file 'mysql-test/t/drop-no_root.test'
--- a/mysql-test/t/drop-no_root.test	2008-10-29 08:45:14 +0000
+++ b/mysql-test/t/drop-no_root.test	2008-12-19 14:38:13 +0000
@@ -1,6 +1,11 @@
 # This test uses chmod, can't be run with root permissions
 --source include/not_as_root.inc
 
+
+# BUG#40128 drop-no_root fails under windows in 6.0-rpl
+# Temporarily disable on windows until bug is fixed.
+--source include/not_windows.inc
+
 ###########################################################################
 
 --echo