Merge from mysql-5.1.70-release

support-files/mysql.spec.sh

@@ -753,6 +753,8 @@ if [ -d $mysql_datadir ] ; then
 	echo "MySQL RPM upgrade to version $NEW_VERSION"  > $STATUS_FILE
 	echo "'pre' step running at `date`"          >> $STATUS_FILE
 	echo                                         >> $STATUS_FILE
+        fcount=`ls -ltr $mysql_datadir/*.err 2>/dev/null | wc -l`
+        if [ $fcount -gt 0 ] ; then
              echo "ERR file(s):"                          >> $STATUS_FILE
              ls -ltr $mysql_datadir/*.err                 >> $STATUS_FILE
              echo                                         >> $STATUS_FILE
@@ -760,6 +762,7 @@ if [ -d $mysql_datadir ] ; then
              grep '^Version' `ls -tr $mysql_datadir/*.err | tail -1` | \
                 tail -1                              >> $STATUS_FILE
              echo                                         >> $STATUS_FILE
+        fi
 
 	if [ -n "$SERVER_TO_START" ] ; then
 		# There is only one PID file, race possibility ignored