MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:Patrick Galbraith Date:August 5 2005 9:21pm
Subject:bk commit into 4.1 tree (patg:1.2361) BUG#11913
View as plain text  
Below is the list of changes that have just been committed into a local
4.1 repository of patg. When patg 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.2361 05/08/05 23:21:23 patg@stripped +2 -0
  BUG# 11913
  "mysql_install_db is not aware of --program-suffix configure   option".
   Changes to Makefile.am and mysql_install_db.sh where the value  
  supplied via --program-suffix is the part of a regex, the value of 
   @program_transform_name@. So to get this to work, define a variable, 
  set that to `echo programname | sed '@program_transform_name@'`, which
   after  regexed, comes out to 
  `echo programname | sed 's,$,somesuffix,'`, 
  then mysql_install_db calls the correctly transformed (renamed) 
  executeable.

  scripts/mysql_install_db.sh
    1.73 05/08/05 23:21:10 patg@stripped +33 -24
    BUG# 11913
    bug 11913 - turned literals into variables that are set according to the 
    value of what autoconf regexes @program_transform_name@ into 
    (another regex that will substitute the value of --program-suffix or 
    --program-prefix). 

  scripts/Makefile.am
    1.46 05/08/05 23:21:10 patg@stripped +1 -0
    BUG# 11913
    
    bug 11913 - added sed line for regexing @program_transform_name@ in 
    scripts that contain it to be translated to a regex,.

# 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:	patg
# Host:	radha.local
# Root:	/Users/patg/mysql-build/mysql-4.1.clean

--- 1.45/scripts/Makefile.am	2005-07-25 14:39:20 +02:00
+++ 1.46/scripts/Makefile.am	2005-08-05 23:21:10 +02:00
@@ -110,6 +110,7 @@
 	  -e 's!@''pkglibdir''@!$(pkglibdir)!g' \
 	  -e 's!@''pkgincludedir''@!$(pkgincludedir)!g' \
 	  -e 's!@''pkgdatadir''@!$(pkgdatadir)!g' \
+	  -e 's!@''program_transform_name''@!@program_transform_name@!'\
 	  -e 's!@''CC''@!@CC@!'\
 	  -e 's!@''CXX''@!@CXX@!'\
 	  -e 's!@''GXX''@!@GXX@!'\

--- 1.72/scripts/mysql_install_db.sh	2005-05-09 09:21:49 +02:00
+++ 1.73/scripts/mysql_install_db.sh	2005-08-05 23:21:10 +02:00
@@ -3,7 +3,7 @@
 # For a more info consult the file COPYRIGHT distributed with this file.
 
 # This scripts creates the privilege tables db, host, user, tables_priv,
-# columns_priv in the mysql database, as well as the func table.
+# columns_priv, procs_priv in the mysql database, as well as the func table.
 #
 # All unrecognized arguments to this script are passed to mysqld.
 
@@ -11,6 +11,15 @@
 windows=0
 defaults=""
 user=""
+mysqld=`echo mysqld| sed -e '@program_transform_name@'`
+mysql=`echo mysql| sed -e '@program_transform_name@'`
+mysqladmin=`echo mysqladmin| sed -e '@program_transform_name@'`
+mysqlbug=`echo mysqlbug| sed -e '@program_transform_name@'`
+mysqld_safe=`echo mysqld_safe| sed -e '@program_transform_name@'`
+mysql_install_db=`echo mysql_install_db| sed -e '@program_transform_name@'`
+resolveip=`echo resolveip| sed -e '@program_transform_name@'`
+mysql_create_system_tables=`echo mysql_create_system_tables| sed -e '@program_transform_name@'`
+mysql_fix_privilege_tables=`echo mysql_fix_privilege_tables| sed -e '@program_transform_name@'`
 
 case "$1" in
     --no-defaults|--defaults-file=*|--defaults-extra-file=*)
@@ -82,7 +91,7 @@
 verbose=0
 fill_help_tables=""
 
-parse_arguments `$print_defaults $defaults mysqld mysql_install_db`
+parse_arguments `$print_defaults $defaults $mysqld $mysql_install_db`
 parse_arguments PICK-ARGS-FROM-ARGV "$@"
 
 test -z "$ldata" && ldata=@localstatedir@
@@ -94,10 +103,10 @@
   pkgdatadir=@pkgdatadir@
 else
   bindir="$basedir/bin"
-  if test -x "$basedir/libexec/mysqld"
+  if test -x "$basedir/libexec/$mysqld"
   then
     execdir="$basedir/libexec"
-  elif test -x "$basedir/sbin/mysqld"
+  elif test -x "$basedir/sbin/$mysqld"
   then
     execdir="$basedir/sbin"
   else
@@ -123,13 +132,13 @@
 fi
 
 mdata=$ldata/mysql
-mysqld=$execdir/mysqld
+mysqld="$execdir/$mysqld"
 mysqld_opt=""
 scriptdir=$bindir
 
 if test "$windows" = 1
 then
-  mysqld="./sql/mysqld"
+  mysqld="./sql/$mysqld"
   mysqld_opt="--language=./sql/share/english"
   scriptdir="./scripts"
 fi
@@ -153,22 +162,22 @@
 # Check if hostname is valid
 if test "$windows" = 0 -a "$in_rpm" = 0 -a $force = 0
 then
-  resolved=`$bindir/resolveip $hostname 2>&1`
+  resolved=`$bindir/$resolveip $hostname 2>&1`
   if [ $? -ne 0 ]
   then
-    resolved=`$bindir/resolveip localhost 2>&1`
+    resolved=`$bindir/$resolveip localhost 2>&1`
     if [ $? -ne 0 ]
     then
       echo "Neither host '$hostname' nor 'localhost' could be looked up with"
-      echo "$bindir/resolveip"
+      echo "$bindir/$resolveip"
       echo "Please configure the 'hostname' command to return a correct hostname."
       echo "If you want to solve this at a later stage, restart this script with"
       echo "the --force option"
       exit 1
     fi
-    echo "WARNING: The host '$hostname' could not be looked up with resolveip."
+    echo "WARNING: The host '$hostname' could not be looked up with $resolveip."
     echo "This probably means that your libc libraries are not 100 % compatible"
-    echo "with this binary MySQL version. The MySQL daemon, mysqld, should work"
+    echo "with this binary MySQL version. The MySQL daemon, $mysqld, should work"
     echo "normally with the exception that host name resolving will not work."
     echo "This means that you should use IP addresses instead of hostnames"
     echo "when specifying MySQL privileges !"
@@ -213,7 +222,7 @@
 mysqld_install_cmd_line="$mysqld $defaults $mysqld_opt --bootstrap \
 --skip-grant-tables --basedir=$basedir --datadir=$ldata --skip-innodb \
 --skip-bdb --skip-ndbcluster $args --max_allowed_packet=8M --net_buffer_length=16K"
-if $scriptdir/mysql_create_system_tables $create_option $mdata $hostname $windows \
+if $scriptdir/$mysql_create_system_tables $create_option $mdata $hostname $windows \
    | eval "$mysqld_install_cmd_line" 
 then
   if test -n "$fill_help_tables"
@@ -235,7 +244,7 @@
   if test "$in_rpm" = 0 -a "$windows" = 0
   then
     echo ""
-    echo "To start mysqld at boot time you have to copy support-files/mysql.server"
+    echo "To start $mysqld at boot time you have to copy support-files/mysql.server"
     echo "to the right place for your system"
     echo
   fi
@@ -243,8 +252,8 @@
   then
   echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
   echo "To do so, start the server, then issue the following commands:"
-  echo "$bindir/mysqladmin -u root password 'new-password'"
-  echo "$bindir/mysqladmin -u root -h $hostname password 'new-password'"
+  echo "$bindir/$mysqladmin -u root password 'new-password'"
+  echo "$bindir/$mysqladmin -u root -h $hostname password 'new-password'"
   echo "See the manual for more instructions."
   #
   # Print message about upgrading unless we have created a new db table.
@@ -252,20 +261,20 @@
   then
     echo
     echo "NOTE:  If you are upgrading from a MySQL <= 3.22.10 you should run"
-    echo "the $bindir/mysql_fix_privilege_tables. Otherwise you will not be"
+    echo "the $bindir/$mysql_fix_privilege_tables. Otherwise you will not be"
     echo "able to use the new GRANT command!"
   fi
   echo
   if test "$in_rpm" = "0"
   then
     echo "You can start the MySQL daemon with:"
-    echo "cd @prefix@ ; $bindir/mysqld_safe &"
+    echo "cd @prefix@ ; $bindir/$mysqld_safe &"
     echo
     echo "You can test the MySQL daemon with the benchmarks in the 'sql-bench' directory:"
     echo "cd sql-bench ; perl run-all-tests"
     echo
   fi
-  echo "Please report any problems with the @scriptdir@/mysqlbug script!"
+  echo "Please report any problems with the @scriptdir@/$mysqlbug script!"
   echo
   echo "The latest information about MySQL is available on the web at"
   echo "http://www.mysql.com"
@@ -276,24 +285,24 @@
   echo "Installation of system tables failed!"
   echo
   echo "Examine the logs in $ldata for more information."
-  echo "You can also try to start the mysqld daemon with:"
+  echo "You can also try to start the $mysqld daemon with:"
   echo "$mysqld --skip-grant &"
   echo "You can use the command line tool"
-  echo "$bindir/mysql to connect to the mysql"
+  echo "$bindir/$mysql to connect to the mysql"
   echo "database and look at the grant tables:"
   echo
-  echo "shell> $bindir/mysql -u root mysql"
+  echo "shell> $bindir/$mysql -u root mysql"
   echo "mysql> show tables"
   echo
-  echo "Try 'mysqld --help' if you have problems with paths. Using --log"
+  echo "Try '$mysqld --help' if you have problems with paths. Using --log"
   echo "gives you a log in $ldata that may be helpful."
   echo
   echo "The latest information about MySQL is available on the web at"
   echo "http://www.mysql.com"
-  echo "Please consult the MySQL manual section: 'Problems running mysql_install_db',"
+  echo "Please consult the MySQL manual section: 'Problems running $mysql_install_db',"
   echo "and the manual section that describes problems on your OS."
   echo "Another information source is the MySQL email archive."
   echo "Please check all of the above before mailing us!"
-  echo "And if you do mail us, you MUST use the @scriptdir@/mysqlbug script!"
+  echo "And if you do mail us, you MUST use the @scriptdir@/$mysqlbug script!"
   exit 1
 fi
Thread
bk commit into 4.1 tree (patg:1.2361) BUG#11913Patrick Galbraith5 Aug