MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Daniel Fischer Date:December 7 2006 2:13pm
Subject:bk commit into 5.0 tree (df:1.2325)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of df. When df 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, 2006-12-07 15:13:12+01:00, df@stripped +2 -0
  Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
  into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
  MERGE: 1.1616.2843.21

  scripts/Makefile.am@stripped, 2006-12-07 15:13:09+01:00, df@stripped +0 -0
    Auto merged
    MERGE: 1.39.1.9

  scripts/mysqld_multi.sh@stripped, 2006-12-07 15:13:09+01:00, df@stripped +0 -0
    Auto merged
    MERGE: 1.21.1.3

# 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:	df
# Host:	kahlann.erinye.com
# Root:	/home/df/mysql/build/mysql-5.0-build-work/RESYNC

--- 1.52/scripts/Makefile.am	2006-09-01 16:55:30 +02:00
+++ 1.53/scripts/Makefile.am	2006-12-07 15:13:09 +01:00
@@ -115,6 +115,7 @@ SUFFIXES = .sh
 	  -e 's!@''pkglibdir''@!$(pkglibdir)!g' \
 	  -e 's!@''pkgincludedir''@!$(pkgincludedir)!g' \
 	  -e 's!@''pkgdatadir''@!$(pkgdatadir)!g' \
+	  -e 's!@''sysconfdir''@!$(sysconfdir)!g' \
 	  -e 's!@''CC''@!@CC@!'\
 	  -e 's!@''CXX''@!@CXX@!'\
 	  -e 's!@''GXX''@!@GXX@!'\

--- 1.30/scripts/mysqld_multi.sh	2006-05-24 14:18:07 +02:00
+++ 1.31/scripts/mysqld_multi.sh	2006-12-07 15:13:09 +01:00
@@ -464,9 +464,9 @@ sub find_groups
   }
   else
   {
-    if (-f "/etc/my.cnf" && -r "/etc/my.cnf")
+    if (-f "@sysconfdir@/my.cnf" && -r "@sysconfdir@/my.cnf")
     {
-      open(MY_CNF, "</etc/my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);
+      open(MY_CNF, "<@sysconfdir@/my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);
     }
     for ($i = 0; ($line = shift @tmp); $i++)
     {
@@ -703,7 +703,7 @@ sub example
 #   (as per Linux/Unix standard). You may even replace the
 #   /etc/init.d/mysql.server script with it.
 #
-#   Before using, you must create a my.cnf file either in /etc/my.cnf
+#   Before using, you must create a my.cnf file either in @sysconfdir@/my.cnf
 #   or /root/.my.cnf and add the [mysqld_multi] and [mysqld#] groups.
 #
 #   The script can be found from support-files/mysqld_multi.server.sh
Thread
bk commit into 5.0 tree (df:1.2325)Daniel Fischer7 Dec