bk commit into 4.1 tree (jimw:1.2169) BUG#5354

[Jim Winstead]

Below is the list of changes that have just been committed into a local
4.1 repository of jimw. When jimw 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.2169 05/04/07 12:57:36 jimw@stripped +1 -0
  Check the shared Windows directory after the possibly
  user-specific Windows directory. (Bug #5354)

  mysys/default.c
    1.49 05/04/07 12:57:34 jimw@stripped +11 -0
    Check GetSystemWindowsDirectory() after GetWindowsDirectory()

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-4.1-5354

--- 1.48/mysys/default.c	2005-03-24 17:13:27 -08:00
+++ 1.49/mysys/default.c	2005-04-07 12:57:34 -07:00
@@ -216,6 +216,9 @@
     GetWindowsDirectory(system_dir,sizeof(system_dir));
     if ((search_default_file(&args, &alloc, system_dir, conf_file, &group)))
       goto err;
+    GetSystemWindowsDirectory(system_dir,sizeof(system_dir));
+    if ((search_default_file(&args, &alloc, system_dir, conf_file, &group)))
+      goto err;
 #endif
 #if defined(__EMX__) || defined(OS2)
     {
@@ -654,6 +657,14 @@
   {
 #ifdef __WIN__
     GetWindowsDirectory(name,sizeof(name));
+    if (!have_ext)
+    {
+      for (ext= (char**) f_extensions; *ext; *ext++)
+        printf("%s\\%s%s ", name, conf_file, *ext);
+    }
+    else
+        printf("%s\\%s ", name, conf_file);
+    GetSystemWindowsDirectory(name,sizeof(name));
     if (!have_ext)
     {
       for (ext= (char**) f_extensions; *ext; *ext++)