bk commit into 4.1 tree (1.1622)

Below is the list of changes that have just been committed into a local
4.1 repository of jww. When jww 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1622 03/10/26 21:53:13 jww@xxxxxxxxxxxxxx +2 -0
  Makefile.am, mysqld.cc:
    Add PROGRAM_PREFIX/SUFFIX to service name
    So default TCP PORT can take effect.

  sql/Makefile.am
    1.90 03/10/26 21:44:24 jww@xxxxxxxxxxxxxx +2 -0
    Add PROGRAM_PREFIX/SUFFIX to service name
    So default TCP PORT can take effect.

  sql/mysqld.cc
    1.375 03/10/26 21:43:31 jww@xxxxxxxxxxxxxx +1 -1
    Add PROGRAM_PREFIX/SUFFIX to service name
    So default TCP PORT can take effect.

# 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: jww
# Host: sysdev.silk.ca
# Root: /usr/src/mysql/mysql-4.1

--- 1.89/sql/Makefile.am        Sat Sep 13 07:18:10 2003
+++ 1.90/sql/Makefile.am        Sun Oct 26 21:44:24 2003
@@ -95,6 +95,8 @@
                        -DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
                        -DDATADIR="\"$(MYSQLDATAdir)\"" \
                        -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
+                       -DPROGRAM_PREFIX="\"@PROGRAM_PREFIX@\""\
+                       -DPROGRAM_SUFFIX="\"@PROGRAM_SUFFIX@\""\
                        @DEFS@
 # Don't put lex_hash.h in BUILT_SOURCES as this will give infinite recursion
 BUILT_SOURCES =

--- 1.374/sql/mysqld.cc Thu Oct 23 03:34:37 2003
+++ 1.375/sql/mysqld.cc Sun Oct 26 21:43:31 2003
@@ -1007,7 +1007,7 @@
   {                                    // Get port if not from commandline
     struct  servent *serv_ptr;
     mysqld_port= MYSQL_PORT;
-    if ((serv_ptr= getservbyname("mysql", "tcp")))
+    if ((serv_ptr= getservbyname(PROGRAM_PREFIX "mysql" PROGRAM_SUFFIX, 
"tcp")))
       mysqld_port= ntohs((u_short) serv_ptr->s_port); /* purecov: inspected */
     if ((env = getenv("MYSQL_TCP_PORT")))
       mysqld_port= (uint) atoi(env);           /* purecov: inspected */

-- 
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe:    
http://lists.mysql.com/internals?unsub=gcdmd-internals@xxxxxxxxxxx