From: Dmitry Shulga
Date: June 15 2011 9:18am
Subject: bzr commit into mysql-5.5 branch (Dmitry.Shulga:3452) Bug#60987 Bug#12403662
List-Archive: http://lists.mysql.com/commits/139220
X-Bug: 60987,12403662
Message-Id: <201106150918.p5F9IIWP010342@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4835429156559651253=="

--===============4835429156559651253==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///Users/shulga/projects/mysql/mysql-5.5-bug12403662/ based on revid:marko.makela@stripped

 3452 Dmitry Shulga	2011-06-15
      Fixed bug#12403662 (formerly known as bug#60987): LOAD DATA LOCAL INFILE
      can't parse relative paths "higher" than 3 levels up
      
      When trying to LOAD DATA LOCAL INFILE using a relative path with 3 or
      more levels up in the directory hierarchy, mysqld wrongly parses 
      the path and as a consequence, can't find the file.
      
      This bug was introduced by patch for bug#58205.
      The reason for bug is that implementaiton of function cleanup_dirname()
      doesn't take into account the begin of buffer being processed during
      handling of path to file.
     @ mysys/mf_pack.c
        function cleanup_dirname() was modified: fixed wrong comparison
        condition when handling substring "../" at the begining of the buffer.

    modified:
      mysys/mf_pack.c
=== modified file 'mysys/mf_pack.c'
--- a/mysys/mf_pack.c	2010-12-29 00:26:31 +0000
+++ b/mysys/mf_pack.c	2011-06-15 09:18:08 +0000
@@ -193,7 +193,7 @@ size_t cleanup_dirname(register char *to
 	  while (pos >= start && *pos != FN_LIBCHAR)	/* remove prev dir */
 	    pos--;
           if (pos[1] == FN_HOMELIB ||
-              (pos > start && memcmp(pos, parent, length) == 0))
+              (pos >= start && memcmp(pos, parent, length) == 0))
 	  {					/* Don't remove ~user/ */
 	    pos=strmov(end_parentdir+1,parent);
 	    *pos=FN_LIBCHAR;


--===============4835429156559651253==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/dmitry.shulga@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dmitry.shulga@stripped\
#   plmirk1gfi3vapvu
# target_branch: file:///Users/shulga/projects/mysql/mysql-5.5-\
#   bug12403662/
# testament_sha1: 8c282d2670b353f7fa0ca0a29d66fc70856700f7
# timestamp: 2011-06-15 16:18:12 +0700
# base_revision_id: marko.makela@stripped\
#   hobymycvru129t9a
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYrKiqUAAdxfgEAQWef/938l
jIC////wUAUmXbJ0eacdtze9bNNwZJNJ5Kn5kExJ+k0BPSMppsp6mT001M1D1AkqNCPTJPUxqEek
00000GjQABoGgZCAmptJiZTyhpqeKMTQAAAAMUU/U1MmaKfpTR6nqNqNDQNANAGgASRTRPEUT8o9
UbKbJ6JqNoNNTZT01A9QHqb5vfuvcnvz6iy9HIINyzTg7OigI1v/OebFJnV8RPHygW2Lrqphy1oi
Dwx9C2NiBwSPouIe1rt44j65/MdsVa5uj68BD9KWcFVfNEWXxelEyujb+LquWE+6dbYV7H+EHYUE
hHB79lgstQSTBIDqdFjsUR2XQvaA8btHPgOr09/B+/v4Z88Q5CqF5hE82BQ78tWHnOk/CSF8KzYC
Ou3camyZjfdRSC+QvbkWHRCW9NPHiIsoBGgsDRez2qwYjSFJC4yjp2CpiiAg7QWRmMgrmIDziDBQ
UI5xAedBFYyjQGirWAeKFpAuF3ksgN9Fxtj4bH1lapbXJLuKYTPsIGm8QB0vNp4mfImWCqGH5ohc
2I6gddS3AjCD2WTuXPErGNAw4nnfDHLjxze56z3VCnRlA0qOEtlgwND2T0ETGjVuMICQm26p/hwB
pAREb0Ek4OOeqvfRN+QvkLDgVnw5b4jOx7SktJ1GnRIqE2iGJWxvJ7akEw6YjaS5DbW6J25RkNN9
xEbalC6LvJRTyKJKytgM1Bm1RBtJwsZ2zMRpEzMLAesKodkp3MR0BGbdWNV8RYNbkGPdgr7BQJHB
Vq2MFSD7zAPDmi4wVyKJESknR3jw9lvR4W81Dke/W+XGI5fk4n2PUrLmYbdSbys8vrwMXEh+CoxH
EcGMQPsgWLeTx5HR4o4cIGysoDVV54fDOeSalmYqYC7xEFymuRxWThWca8IpkdhRUwebhap4JVpi
UT5kaZQeoTXnpku6jpLSuajrzaN0qkt+Ze1Ueq3LQEw0bcLiNVJuJ9l9pXzdq6M2LPhMTsI5zLNI
jFOlEghyKlAIl2VmtYveGHM1hyLZiNAQ2q0C2j+Bp4j8BK3StDbXd5FHOEXgEtYIMBOPbTRqC7o9
rYaJdFSwjg0D2FEQqcn+mqRTNndLTBTMJUaL0wxa0k5KvNAvGTHWPorxBHwKndnJNddc4T4q3DF4
6EuFoEy0AMTzEpHIdekijwp6zrLwtMZIT7dGkwd1gMD/dnahEWQyO2+AAeCq0GbUGjyNwxoNKKRM
wCqaFE86XdrKmbmePBU7qhSYMCmLLhaSLdgdqlnxX+dSsSYVlsjNYVX3mHgwQl7HOM/FlfBOCvSK
Qsb0hhzT6LyBp5Y3WY6OpXCeJphd7wlbUuWMIBY6/rI2Uy+IWCGTEJrUBeI3PYGgU7Ve7tjrBCWo
2FjjxUmL8TCwaM51RB9xaD08K25Z7XVFeRWNVe+GTHByoquHSuiHcLIQeEiRBQnChFyITPfm5i0J
iGRQRgHHOeC8zl1pq2UMtYL0iTF1Y1boozxH9HI2HIRELKAw6YA48u68iKgKLOZCaoheoKool7V1
Bp3CcZaAtQapRUDlItLAnFnNLJAwM97CG2mEZAoXzAYVeOsSaJjEXGDiiUn3vadFb4fgISGO91sn
rKq+EGVQD5ZDmpft5ckptECM2A0C9jPF8/8iDFUPw9xZmCTzDnXuGl7z2o4neo6bbhxEnjUyqjqg
NBAqBgA6TFl3kIcqqMhDV1AdgGmpi2wsITnCK26xc5lJJgpXuuXaLzFSOjKTQlLHlb1FPKrWIILU
pZlEYF2S5PKE7/F3JFOFCQisqKpQ


--===============4835429156559651253==--