From: Sergey Vojtovich
Date: March 29 2010 2:52pm
Subject: bzr commit into mysql-5.1-bugteam branch (svoj:3431) Bug#40980
List-Archive: http://lists.mysql.com/commits/104568
X-Bug: 40980
Message-Id: <0L0100K4STB9KU60@fe-emea-09.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_caq+YohrVxjpjG4YsNZa8A)"

--Boundary_(ID_caq+YohrVxjpjG4YsNZa8A)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///home/svoj/devel/bzr-mysql/mysql-5.1-bugteam-bug40980/ based on revid:li-bing.song@stripped

 3431 Sergey Vojtovich	2010-03-29
      BUG#40980 - Drop table can remove another MyISAM table's
                  data and index files
      
      It was possible if DATA/INDEX DIRECTORY is pointing to
      symlinked MySQL data home directory.
      
      Do not allow to drop data/index files implicitly symlinked
      to data home directory.
     @ storage/myisam/mi_delete_table.c
        Do not allow to drop data/index files implicitly symlinked
        to data home directory.

    modified:
      storage/myisam/mi_delete_table.c
=== modified file 'storage/myisam/mi_delete_table.c'
--- a/storage/myisam/mi_delete_table.c	2006-12-31 00:32:21 +0000
+++ b/storage/myisam/mi_delete_table.c	2010-03-29 14:52:06 +0000
@@ -58,9 +58,14 @@ int mi_delete_table(const char *name)
 #endif /* USE_RAID */
 
   fn_format(from,name,"",MI_NAME_IEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT);
+  if (my_is_symlink(from) && (*myisam_test_invalid_symlink)(from))
+    DBUG_RETURN(my_errno= HA_WRONG_CREATE_OPTION);
   if (my_delete_with_symlink(from, MYF(MY_WME)))
     DBUG_RETURN(my_errno);
+
   fn_format(from,name,"",MI_NAME_DEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT);
+  if (my_is_symlink(from) && (*myisam_test_invalid_symlink)(from))
+    DBUG_RETURN(my_errno= HA_WRONG_CREATE_OPTION);
 #ifdef USE_RAID
   if (raid_type)
     DBUG_RETURN(my_raid_delete(from, raid_chunks, MYF(MY_WME)) ? my_errno : 0);


--Boundary_(ID_caq+YohrVxjpjG4YsNZa8A)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/svoj@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/svoj@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: svoj@stripped
# target_branch: file:///home/svoj/devel/bzr-mysql/mysql-5.1-bugteam-\
#   bug40980/
# testament_sha1: 56b561d83f9f321098b52e3d26e13904d4365524
# timestamp: 2010-03-29 18:52:11 +0400
# base_revision_id: li-bing.song@stripped\
#   4lpsnybf8hftnpug
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTjfyv4AAfXfgEBQWfP//37n
/+C////wUAT+1m66VhrNty7budrAkkgJGKeT1H6KbSbKeqbakz1GgRk0wRgGhMJKTTQZMpiT1T9R
6mU2ITI0NANppMgABoJFBE9JlTepPKep5RtRp6h6nk1AB6nqHpA0DaTQcNNMjEYTTAQwCaYRgmJk
NMjQ0AkpqniZJgptJo9EwUHqGQNGgDQ0DJk9RY9W8VvW2nRS5vzwyM15N5FQHBJ2EaXvckPiNXRg
1MNxmQUosO7Af2j8D3zMYwPr8Vm/LqtTi/Y5E2eiiezs27jszb7D7fcydGg7B6YobeuvAmtRDvFZ
D8TGpLWiWNMxGYemAPP5JssG7kqzVvzw1RMZUmqfTCkdP3No0tmYjLR3YMXQGxIRjEkhxksynvSI
MW6tMW8ooq+FUCyfbccujmr5KdOh849HKI1rA26zqspmRfVXPCEdFiGsU7GTvRtViRARFQV7UEiI
okIGZVBOqlDT781DrFdkMEwG7JoyQTMFv2Keyy2tt24xKICvVUZaJp4ehTzNp5Ra5qi0xRkkYxVE
CMOPjyKxiku1qEyPcKL1AYLPhIbSEiJjVChNTpTfwpmQSnVf94Cxak8xrjVDr42mLiLUuXRpN6J0
1q95kN385rquFEmVM8lkZSXAYnC06GzCpeMsTF5IbCJdipNJyFI+ZRJZTa9gbi4T02K2+BZqjvFp
Iq+uDEWnOKUX4GYqVrZhuY4iojAw5q4mROdYUCbHQUgyR7S7JBQLZVWhYTqcrpVxIwGrpsc5oesv
M+44q4C+DXrLtNRgI+SJe2uZnLzmzbGqEXU4yKbNSYunp+/QfgpiYx45k+senUbYeWkOBBrBcdVY
yoySJ5MHVurLDgcGMgXlkjL2kYFhvIvrz1L+k+E5lWW1j7eoYcTPYioz7NbDECJFEeXfObiaCpG8
kHOysJnpN0ktewpPXhTQ8lvFDg7LVD1105mQ3SFtvV4m5ec3FQewxUrlZvME/VgulUHOL1B7jfgR
MPv1mk769pe9kWF7Bwh9KtSozXfIzvXJT0xVRDpOkiBM7bEQOVEpLjNBFHz3WXJqti3t/N5zxH0j
QXbwc1imSxGu1SRBGVzWtdC7BqqU/Eua5DaRmdMRjY62PV5cjgFJaTPgqhlLkOiBqqNSYxSxrXrD
WJRnmvtKcpISg1Dv3rOytH4pqIF4BmUb4rWTMq3DAOpoXjE6w33kyzOrBtzDDvqmZPRsTqdaLoSm
oL5ciTSs8Ni1kFlxIKBy1gzuLuF2dWJX6bTZKnhAuTQPOGYDAvoq2CrS8i501Bglvy0LAE919d78
rDMhgwJltot2y4tNhJlneWK1z6ygSpXQmHKmNTFZx7Li3JTvVvEk/PCA8w4w4Yf44KH14iIJaFlk
TSkMTUOOKWMtrJ58S41W02ho5FJ6OobaU8wp82vwpf7XQDkEE6sCfLYoiLBVrGwnRV8BaYbR6kJ9
5n2agpgUCcRxuzyknFKkvEuXbkw6zqNDliFY9WY5BYroMbKC8R3lOT0BDcVUC0CvBRgxP/MvvhhG
4mNMOSTLSUgITVi9i1GJ4DLqLAygRn0CHaZSVNfCcox6p/b9VK6Fw2SkROchAK+Voe+lEuKBEnKs
1DzHgblrT8g4tFGCcXOUnKTBryLkc4djmkVCyTGcrfBieBBJi/dz8HvFQpaugWxPDJgWDAx3FQYr
kwXJWtemmLDMVPfl/4u5IpwoSBxv5X8A


--Boundary_(ID_caq+YohrVxjpjG4YsNZa8A)--