diff options
| author | Alexander Nozdrin <alik@ibmvm> | 2009-10-09 18:52:49 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@ibmvm> | 2009-10-09 18:52:49 +0400 |
| commit | be8e39749674e23433729d6586e92d664abb1328 (patch) | |
| tree | c9cebcb70721ed2488cb92f159b3692ab3ae214a /mysql-test/r/drop-no_root.result | |
| parent | f38006b5329a549cc4e4f5c9bc8f71bac4016ee0 (diff) | |
| download | mariadb-git-be8e39749674e23433729d6586e92d664abb1328.tar.gz | |
Backporting of Bug#40128 from 6.0 to next-mr.
Original revision in 6.0:
------------------------------------------------------------
revno: 2599.108.1
committer: Alexander Nozdrin <alik@sun.com>
branch nick: 6.0-rpl-bug40128
timestamp: Wed 2009-01-21 15:33:42 +0300
message:
Fix for Bug#40128: drop-no_root fails under windows in 6.0-rpl.
The problem was that directories with no permission (000) files
are deleted differently on UNIX and on Windows.
On UNIX, 000-permission file is deleted perfectly, but other files
are left in the directory.
On Windows, 000-permission file is not deleted, but other files
are deleted.
Also, the fix needed a change in mysqltest.c: 'chmod' directive
should return a positive error code (in order to be handled).
It's decided to return a constant '1' for all error codes
just to be OS-independent.
------------------------------------------------------------
Diffstat (limited to 'mysql-test/r/drop-no_root.result')
| -rw-r--r-- | mysql-test/r/drop-no_root.result | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/r/drop-no_root.result b/mysql-test/r/drop-no_root.result index d74ce47dedd..3e1f2fe2cf0 100644 --- a/mysql-test/r/drop-no_root.result +++ b/mysql-test/r/drop-no_root.result @@ -12,13 +12,14 @@ 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() mysql_test -rm mysql_test/t1.MYD mysql_test/t1.MYI +rm -f mysql_test/t1.MYD mysql_test/t1.MYI +chmod 666 mysql_test/t1.frm +rm -f mysql_test/t1.frm DROP DATABASE mysql_test; |