bk commit into 5.0 tree (jonas:1.1985)

[jonas]

Below is the list of changes that have just been committed into a local
5.0 repository of jonas. When jonas 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.1985 05/09/30 09:54:53 jonas@stripped +2 -0
  export forced_defaults_file using global variable defaults_file
   analog with defaults_extra_file and defaults_grouop_suffix

  mysys/default.c
    1.79 05/09/30 09:54:50 jonas@stripped +4 -0
    export forced_defaults_file using global variable defaults_file

  include/my_sys.h
    1.169 05/09/30 09:54:50 jonas@stripped +1 -0
    export forced_defaults_file using global variable defaults_file

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.0

--- 1.168/include/my_sys.h	2005-09-14 13:30:09 +02:00
+++ 1.169/include/my_sys.h	2005-09-30 09:54:50 +02:00
@@ -262,6 +262,7 @@
 extern const char *charsets_dir;
 extern char *defaults_extra_file;
 extern const char *defaults_group_suffix;
+extern const char *defaults_file;
 
 extern my_bool timed_mutexes;
 

--- 1.78/mysys/default.c	2005-09-09 09:51:36 +02:00
+++ 1.79/mysys/default.c	2005-09-30 09:54:50 +02:00
@@ -42,6 +42,7 @@
 #include <winbase.h>
 #endif
 
+const char *defaults_file=0;
 const char *defaults_group_suffix=0;
 char *defaults_extra_file=0;
 
@@ -140,6 +141,9 @@
   if (forced_extra_defaults)
     defaults_extra_file= forced_extra_defaults;
   
+  if (forced_default_file)
+    defaults_file= forced_default_file;
+
   /*
     We can only handle 'defaults-group-suffix' if we are called from
     load_defaults() as otherwise we can't know the type of 'func_ctx'