MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:jonas Date:September 30 2005 10:25am
Subject:bk commit into 5.0 tree (jonas:1.2007)
View as plain text  
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.2007 05/09/30 12:25:39 jonas@stripped +2 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push

  mysys/default.c
    1.80 05/09/30 12:25:36 jonas@stripped +0 -0
    Auto merged

  include/my_sys.h
    1.171 05/09/30 12:25:36 jonas@stripped +0 -0
    Auto merged

# 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-push/RESYNC

--- 1.170/include/my_sys.h	2005-09-22 22:46:48 +02:00
+++ 1.171/include/my_sys.h	2005-09-30 12:25:36 +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.79/mysys/default.c	2005-09-20 08:16:58 +02:00
+++ 1.80/mysys/default.c	2005-09-30 12:25:36 +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= (char *) 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'
Thread
bk commit into 5.0 tree (jonas:1.2007)jonas30 Sep