diff --git a/Docs/manual.texi b/Docs/manual.texi
index 6c096b9831c..1de38a43aa6 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -954,14 +954,9 @@ How MySQL Compares to @code{mSQL}
 
 How MySQL Compares to PostgreSQL
 
-* MySQL-PostgreSQL goals::      
-* MySQL-PostgreSQL features::   
-* MySQL-PostgreSQL benchmarks::  
-
-MySQL and PostgreSQL development goals
-
-* MySQL-PostgreSQL features::   
-* MySQL-PostgreSQL benchmarks::  
+* MySQL-PostgreSQL goals::      MySQL and PostgreSQL development strategies
+* MySQL-PostgreSQL features::   Featurevise Comparison of MySQL and PostgreSQL
+* MySQL-PostgreSQL benchmarks::  Benchmarking MySQL and PostgreSQL
 
 MySQL Internals
 
@@ -995,6 +990,7 @@ Changes in release 4.0.x (Development; Alpha)
 
 Changes in release 3.23.x  (Stable)
 
+* News-3.23.39a::               
 * News-3.23.39::                Changes in release 3.23.39
 * News-3.23.38::                Changes in release 3.23.38
 * News-3.23.37::                Changes in release 3.23.37
@@ -46314,6 +46310,7 @@ users use this code as the rest of the code and because of this we are
 not yet 100% confident in this code.
 
 @menu
+* News-3.23.39a::               
 * News-3.23.39::                Changes in release 3.23.39
 * News-3.23.38::                Changes in release 3.23.38
 * News-3.23.37::                Changes in release 3.23.37
@@ -46357,7 +46354,14 @@ not yet 100% confident in this code.
 * News-3.23.0::                 Changes in release 3.23.0
 @end menu
 
-@node News-3.23.39, News-3.23.38, News-3.23.x, News-3.23.x
+@node News-3.23.39a, News-3.23.39, News-3.23.x, News-3.23.x
+@appendixsubsec Changes in release 3.23.39a
+@itemize @bullet
+@item
+Fixed a small bug in the mysql-test benchmark suite
+@end itemize
+
+@node News-3.23.39, News-3.23.38, News-3.23.39a, News-3.23.x
 @appendixsubsec Changes in release 3.23.39
 @itemize @bullet
 @item
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 6634d8696e6..4d987e591e0 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -144,8 +144,9 @@ while test $# -gt 0; do
       SLEEP_TIME=`$ECHO "$1" | $SED -e "s;--sleep=;;"`
       ;;
     --mysqld=*)
-       TMP=`$ECHO "$1" | $SED -e "s;--mysqld-=;"`
-       EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT $TMP"
+       TMP=`$ECHO "$1" | $SED -e "s;--mysqld=;;"`
+       EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT $TMP"
+       EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT $TMP"
        ;;
     --gcov )
       if [ x$BINARY_DIST = x1 ] ; then
@@ -163,12 +164,14 @@ while test $# -gt 0; do
       fi
       DO_GDB=1
       USE_RUNNING_SERVER=""
+      EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --skip-stack"
       ;;
     --ddd )
       if [ x$BINARY_DIST = x1 ] ; then
 	$ECHO "Note: you will get more meaningful output on a source distribution compiled with debugging option when running tests with -gdb option"
       fi
       DO_DDD=1
+      EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --skip-stack"
       USE_RUNNING_SERVER=""
       ;;
     --skip-*)
@@ -436,12 +439,10 @@ start_master()
     	    --server-id=1 \
             --basedir=$MY_BASEDIR \
 	    --port=$MASTER_MYPORT \
-	    --exit-info=256 \
             --datadir=$MASTER_MYDDIR \
 	    --pid-file=$MASTER_MYPID \
 	    --socket=$MASTER_MYSOCK \
             --log=$MASTER_MYLOG --default-character-set=latin1 \
-	    --core \
 	    --tmpdir=$MYSQL_TMP_DIR \
 	    --language=english \
             --innodb_data_file_path=ibdata1:50M \
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index ffef39964da..b155b313e8b 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1194,8 +1194,8 @@ bad corruption, the above values may be invalid\n\n",
 	  thd->thread_id);
   }
   fprintf(stderr, "\
-Please use the information above to create a repeatable test case for the\n\
-crash, and send it to bugs@lists.mysql.com\n");
+The manual page at http://www.mysql.com/doc/C/r/Crashing.html contains\n\
+information that should help you find out what is causing the crash\n");
   fflush(stderr);
 #endif /* HAVE_STACKTRACE */