bzr commit into mysql-6.0 branch (dlenev:2661)

[Dmitry Lenev]

#At file:///home/dlenev/src/bzr/mysql-6.0-3726-w2/

 2661 Dmitry Lenev	2008-06-06 [merge]
      In attempt to make PushBuild tree green merged fix from
      mysql-6.0-runtime into mysql-6.0-3276.
modified:
  mysql-test/r/drop-no_root.result
  mysql-test/t/drop-no_root.test

=== modified file 'mysql-test/r/drop-no_root.result'
--- a/mysql-test/r/drop-no_root.result	2008-05-29 17:04:06 +0000
+++ b/mysql-test/r/drop-no_root.result	2008-06-04 18:10:12 +0000
@@ -12,7 +12,6 @@ use mysql_test;
 chmod 000 mysql_test/t1.frm
 
 DROP DATABASE mysql_test;
-ERROR HY000: Error dropping database (can't rmdir './mysql_test', errno: 39)
 
 SELECT DATABASE();
 DATABASE()

=== modified file 'mysql-test/t/drop-no_root.test'
--- a/mysql-test/t/drop-no_root.test	2008-05-29 17:04:06 +0000
+++ b/mysql-test/t/drop-no_root.test	2008-06-04 18:10:12 +0000
@@ -23,9 +23,14 @@ use mysql_test;
 --echo chmod 000 mysql_test/t1.frm
 --chmod 0000 $MYSQLTEST_VARDIR/master-data/mysql_test/t1.frm
 
+# NOTE: ER_DB_DROP_RMDIR contains errno, which can be different on different
+# platforms.
+
 --echo
+--disable_result_log
 --error ER_DB_DROP_RMDIR
 DROP DATABASE mysql_test;
+--enable_result_log
 
 --echo
 SELECT DATABASE();