bk commit into 5.0 tree (jperkin:1.2591) BUG#29716

[Jonathan Perkin]

Below is the list of changes that have just been committed into a local
5.0 repository of jperkin.  When jperkin 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, 2008-01-09 19:02:57+00:00, jperkin@stripped +3 -0
  Further changes for bug#29716, add mysql_print_envinfo to dump
  information about the installation, to be used when submitting
  bug reports.

  scripts/Makefile.am@stripped, 2008-01-09 18:03:43+00:00, jperkin@stripped
+3 -0
    Add mysql_print_envinfo

  scripts/Makefile.am@stripped, 2008-01-09 15:00:44+00:00, jperkin@stripped
+1 -0
    Expand @AWK@ in scripts.

  scripts/mysql_install_db.sh@stripped, 2008-01-09 18:04:03+00:00,
jperkin@stripped +6 -2
    Refer to mysql_print_envinfo for submitting bug reports.

  scripts/mysql_print_envinfo.sh@stripped, 2008-01-09 18:10:44+00:00,
jperkin@stripped +79 -0
    New script to output useful information about the environment,
    primarily to aid bug reports.  Therefore most of this is duplicated
    from the mysqlbug script it aims to replace.

  scripts/mysql_print_envinfo.sh@stripped, 2008-01-09 18:10:43+00:00,
jperkin@stripped +0 -0

diff -Nrup a/scripts/Makefile.am b/scripts/Makefile.am
--- a/scripts/Makefile.am	2007-12-28 21:56:34 +00:00
+++ b/scripts/Makefile.am	2008-01-09 18:03:43 +00:00
@@ -25,6 +25,7 @@ bin_SCRIPTS =		@server_scripts@ \
 			mysql_config \
 			mysql_fix_privilege_tables \
 			mysql_fix_extensions \
+			mysql_print_envinfo \
 			mysql_setpermission \
 			mysql_secure_installation \
 			mysql_zap \
@@ -51,6 +52,7 @@ EXTRA_SCRIPTS =		make_binary_distributio
 			mysql_config.pl.in \
 			mysql_fix_privilege_tables.sh \
 			mysql_fix_extensions.sh \
+			mysql_print_envinfo.sh \
 			mysql_install_db.sh \
 			mysql_install_db.pl.in \
 			mysql_setpermission.sh \
@@ -90,6 +92,7 @@ CLEANFILES =		@server_scripts@ \
 			mysql_config \
 			mysql_fix_privilege_tables \
 			mysql_fix_extensions \
+			mysql_print_envinfo \
 			mysql_setpermission \
 			mysql_secure_installation \
 			mysql_zap \
@@ -149,6 +152,7 @@ SUFFIXES = .sh
 	  -e 's!@''pkgincludedir''@!$(pkgincludedir)!g' \
 	  -e 's!@''pkgdatadir''@!$(pkgdatadir)!g' \
 	  -e 's!@''sysconfdir''@!$(sysconfdir)!g' \
+	  -e 's!@''AWK''@!@AWK@!'\
 	  -e 's!@''CC''@!@CC@!'\
 	  -e 's!@''CXX''@!@CXX@!'\
 	  -e 's!@''GXX''@!@GXX@!'\
diff -Nrup a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
--- a/scripts/mysql_install_db.sh	2008-01-03 12:24:00 +00:00
+++ b/scripts/mysql_install_db.sh	2008-01-09 18:04:03 +00:00
@@ -399,7 +399,10 @@ then
       echo "cd mysql-test ; perl mysql-test-run.pl"
       echo
     fi
-    echo "Please report any problems at http://bugs.mysql.com"
+    echo "Please report any problems at http://bugs.mysql.com/"
+    echo "We would appreciate if you could paste the output of"
+    echo "$bindir/mysql_print_envinfo into the"
+    echo "bug report as it provides us with useful information."
     echo
     echo "The latest information about MySQL is available on the web at"
     echo "http://www.mysql.com"
@@ -429,6 +432,7 @@ else
   echo "Another information source is the MySQL email archive."
   echo
   echo "Please check all of the above before submitting a bug report"
-  echo "at http://bugs.mysql.com"
+  echo "at http://bugs.mysql.com/ including the output of"
+  echo "$bindir/mysql_print_envinfo"
   exit 1
 fi
diff -Nrup a/scripts/mysql_print_envinfo.sh b/scripts/mysql_print_envinfo.sh
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/scripts/mysql_print_envinfo.sh	2008-01-09 18:10:44 +00:00
@@ -0,0 +1,79 @@
+#!/bin/sh
+# Copyright (C) 2008 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+# Print out information about the installed MySQL environment and useful
+# bits from the system for bug reports.
+
+# System information
+cat <<EOF
+MySQL Release:  mysql-@VERSION@@MYSQL_SERVER_SUFFIX@ (@COMPILATION_COMMENT@)
+System Type:    @SYSTEM_TYPE@
+Machine Type:   @MACHINE_TYPE@
+EOF
+
+# Perl information
+if [ -x "@PERL@" ]; then
+    perl_info="`@PERL@ -v | @AWK@ '/^This is/ { print }'`"
+    if [ -n "${perl_info}" ]; then
+        cat <<EOF
+Perl:           @PERL@ (${perl_info})
+EOF
+    fi
+fi
+
+# GNU Make information
+for cmd in gnumake gmake make; do
+    make="`command -v ${cmd}`"
+    if [ -n "${make}" ]; then
+        make_info="`${make} -v 2>/dev/null | @AWK@ '/^GNU/ { print }'`"
+        if [ -n "${make_info}" ]; then
+            cat <<EOF
+Make:           ${make} (${make_info})
+EOF
+            break
+        fi
+    fi
+done
+
+# Compiler information
+cat <<EOF
+C Compiler:     @CC_VERSION@
+C++ Compiler:   @CXX_VERSION@
+
+EOF
+if [ "X@CC@" = "Xgcc" ]; then
+    cat <<EOF
+GCC Information:
+`@CC@ -v 2>&1`
+
+EOF
+fi
+# Library information
+libc_info="`ls -l /lib/libc.* /lib/libc-* /usr/lib/libc.* /usr/lib/libc-*
2>/dev/null`"
+if [ -n "${libc_info}" ]; then
+    cat <<EOF
+Libraries:
+${libc_info}
+
+EOF
+fi
+
+# Configure settings
+cat <<EOF
+Compilation info (call):  CC='@SAVE_CC@' CFLAGS='@SAVE_CFLAGS@' CXX='@SAVE_CXX@'
CXXFLAGS='@SAVE_CXXFLAGS@' LDFLAGS='@SAVE_LDFLAGS@' ASFLAGS='@SAVE_ASFLAGS@'
+Compilation info (used):  CC='@CC@' CFLAGS='@CFLAGS@' CXX='@CXX@' CXXFLAGS='@CXXFLAGS@'
LDFLAGS='@LDFLAGS@' ASFLAGS='@ASFLAGS@'
+Configured with:          @CONF_COMMAND@
+EOF