bk commit into 5.0 tree (kent:1.2367) BUG#19538

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-07 05:13:45+01:00, kent@stripped +1 -0
  default.c:
    If config file exists but can't be opened, exit with an error message (bug#19538)

  mysys/default.c@stripped, 2007-01-07 05:13:29+01:00, kent@stripped +9 -0
    If config file exists but can't be opened, exit with an error message (bug#19538)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	kent-amd64.(none)
# Root:	/home/kent/bk/tmp/mysql-5.0-build

--- 1.84/mysys/default.c	2007-01-07 05:13:49 +01:00
+++ 1.85/mysys/default.c	2007-01-07 05:13:49 +01:00
@@ -620,7 +620,16 @@
   }
 #endif
   if (!(fp= my_fopen(name, O_RDONLY, MYF(0))))
+  {
+#if !defined(__WIN__) && !defined(OS2) && !defined(__NETWARE__)
+    /* Check above said file exists, report if can't open */
+    fprintf(stderr, "Config file '%s' exists but is not readable\n"
+		    "by the user the server runs as\n", name);
+    return -1;					/* Fatal */
+#else
     return 1;					/* Ignore wrong files */
+#endif
+  }
 
   while (fgets(buff, sizeof(buff) - 1, fp))
   {