bk commit into 4.0 tree (ramil:1.2083) BUG#5056

[ramil]

Below is the list of changes that have just been committed into a local
4.0 repository of ram. When ram 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
  1.2083 05/03/10 11:34:30 ramil@stripped +1 -0
  a fix (bug #5056: defaults-extra-file throws no error when file is inaccessible).

  mysys/default.c
    1.38 05/03/10 11:34:27 ramil@stripped +6 -7
    Display error message if default file is inaccessible.

# 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:	ramil
# Host:	gw.mysql.r18.ru
# Root:	/usr/home/ram/work/4.0

--- 1.37/mysys/default.c	2005-02-25 16:34:16 +04:00
+++ 1.38/mysys/default.c	2005-03-10 11:34:27 +04:00
@@ -169,9 +169,8 @@
     goto err;
   if (forced_default_file)
   {
-    if ((error= search_default_file_with_ext(&args, &alloc, "", "",
-					     forced_default_file, 
-					     &group)))
+    if (search_default_file_with_ext(&args, &alloc, "", "", forced_default_file,
+                                     &group))
     {
       fprintf(stderr, "Error reading '%s' file.\n", forced_default_file);
       goto err;
@@ -210,11 +209,11 @@
       }
       else if (defaults_extra_file)
       {
-	if (search_default_file(&args, &alloc, NullS, defaults_extra_file,
-                                &group))
+        if (search_default_file_with_ext(&args, &alloc, "", "",
+                                         defaults_extra_file, &group))
         {
           fprintf(stderr, "Error reading '%s' file.\n", defaults_extra_file);
-	  goto err;				/* Fatal error */
+          goto err;
         }
       }
     }
@@ -356,7 +355,7 @@
   }
 #endif
   if (!(fp = my_fopen(fn_format(name,name,"","",4),O_RDONLY,MYF(0))))
-    return 0;					/* Ignore wrong files */
+    return 1;
 
   while (fgets(buff,sizeof(buff)-1,fp))
   {