Auto-merge from mysql-5.1.

configure.in

@@ -14,8 +14,7 @@ AC_CANONICAL_SYSTEM
 # TAR files, the path name is split into two parts, a 155 chacater
 # first part and a 100 character second part.
 AM_INIT_AUTOMAKE([1.9 tar-ustar])
-LT_INIT
-LT_PREREQ([1.5.6])
+AC_PROG_LIBTOOL
 
 AM_CONFIG_HEADER([include/config.h])
 

scripts/mysql_install_db.sh

@@ -410,8 +410,7 @@ else
   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/.  Please consult the MySQL manual section"
+  echo "Please consult the MySQL manual section"
   echo "'Problems running mysql_install_db', and the manual section that"
   echo "describes problems on your OS.  Another information source are the"
   echo "MySQL email archives available at http://lists.mysql.com/."
@@ -470,9 +469,6 @@ then
   echo
   echo "Please report any problems with the $scriptdir/mysqlbug script!"
   echo
-  echo "The latest information about MySQL is available at http://www.mysql.com/"
-  echo "Support MySQL by buying support/licenses from http://shop.mysql.com/"
-  echo
 fi
 
 exit 0