bzr push into mysql-5.5 branch (vinay.fisrekar:3452 to 3453)

[Vinay Fisrekar]

 3453 Vinay Fisrekar	2011-06-16
      Skip test run with valgrind as test has restarts 

    modified:
      mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test
 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 'mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test'
--- a/mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test	2011-06-02 09:42:55 +0000
+++ b/mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test	2011-06-16 04:30:51 +0000
@@ -9,6 +9,8 @@
 #                                                                    #
 ######################################################################
 
+# Don't test this under valgrind, memory leaks will occur due restart
+--source include/not_valgrind.inc
 # Test restart the server and "shutdown_server" looks for pid file
 # which is not there with embedded mode
 --source include/not_embedded.inc

No bundle (reason: useless for push emails).