Merge branch '10.0' into 10.1

1 files changed, 13 insertions, 6 deletions

diff --git a/scripts/mysqlaccess.sh b/scripts/mysqlaccess.sh
index a7cc2eccf38..e7c1f8d1fd6 100644
--- a/scripts/mysqlaccess.sh
+++ b/scripts/mysqlaccess.sh
@@ -1,6 +1,6 @@
-#!/usr/bin/perl
+#!@PERL_PATH@
 
-# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
@@ -477,16 +477,23 @@ MySQLaccess::Report::Print_Header();
 # *****************************
 # Read configuration-file
   MySQLaccess::Debug::Print(1, "Reading configuration file...");
-  if (-f "./$script_conf") {
-     require "./$script_conf";
+  if (-f "@sysconfdir@/$script_conf") {
+     print "Configuration file '$script_conf' is found in '@sysconfdir@/'\n";
+     require "@sysconfdir@/$script_conf";
   }
   elsif (-f "@prefix@/$script_conf") {
+     print "Configuration file '$script_conf' is found in '@prefix@/'\n";
      require "@prefix@/$script_conf";
   }
-  elsif (-f "@sysconfdir@/$script_conf") {
-     require "@sysconfdir@/$script_conf";
+  elsif (-f "./$script_conf") {
+     print "\nERROR! Configuration file '$script_conf' is found in the current ";
+     print "directory.\nThe permissible locations for this file are either ";
+     print "@sysconfdir@/ or @prefix@/\n";
+     print "Please move it to one of these locations and retry.\n\n";
+     exit 0;
   }
 
+
 # ****************************
 # Read in all parameters
 if ($MySQLaccess::CMD) { #command-line version