From: Sunanda Menon Date: October 14 2011 11:05pm Subject: bzr push into mysql-5.5 branch (sunanda.menon:3558 to 3559) List-Archive: http://lists.mysql.com/commits/141459 Message-Id: <20111014230511.241.qmail@helheim> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3559 hery.ramilison@stripped 2011-10-15 fix for bug 11764246 modified: scripts/mysqld_safe.sh 3558 Joerg Bruehe 2011-10-07 Experimental: Try a fix for test "file_contents" to help in non-community SuSE RPMs (path name problem). modified: mysql-test/t/file_contents.test === modified file 'scripts/mysqld_safe.sh' --- a/scripts/mysqld_safe.sh 2010-07-05 21:19:14 +0000 +++ b/scripts/mysqld_safe.sh 2011-10-14 23:01:37 +0000 @@ -464,6 +464,9 @@ export MYSQL_HOME if test -x "$MY_BASEDIR_VERSION/bin/my_print_defaults" then print_defaults="$MY_BASEDIR_VERSION/bin/my_print_defaults" +elif test -x `dirname $0`/my_print_defaults +then + print_defaults="`dirname $0`/my_print_defaults" elif test -x ./bin/my_print_defaults then print_defaults="./bin/my_print_defaults" No bundle (reason: useless for push emails).