Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql

client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged

client/mysqltest.c

@@ -992,10 +992,11 @@ void usage()
   -P, --port=...           Port number to use for connection.\n\
   -S, --socket=...         Socket file to use for connection.\n\
   -r, --record             Record output of test_file into result file.\n\
-  -R, --result-file=...    Read/Store result from/in this file\n\
+  -R, --result-file=...    Read/Store result from/in this file.\n\
   -v, --verbose            Write more.\n\
   -q, --quiet, --silent    Suppress all normal output.\n\
-  -V, --version            Output version information and exit.\n\n");
+  -V, --version            Output version information and exit.\n\
+  --no-defaults            Don't read default options from any options file.\n\n");
 }
 
 int parse_args(int argc, char **argv)
@@ -1004,6 +1005,7 @@ int parse_args(int argc, char **argv)
   my_bool tty_password=0;
 
   load_defaults("my",load_default_groups,&argc,&argv);
+
   while((c = getopt_long(argc, argv, "h:p::u:P:D:S:R:?rvVq",
 			 long_options, &option_index)) != EOF)
     {

mysql-test/mysql-test-run.sh

@@ -191,7 +191,7 @@ error () {
 }
 
 error_is () {
-    $ECHO `$CAT $TIMEFILE` | $SED -e 's/.* At line .*\: \(.*\)Command .*$/   \>\> Error: \1<\</'
+    $ECHO `$CAT $TIMEFILE` | $SED -e 's/.* At line \(.*\)\: \(.*\)Command .*$/   \>\> Error at line \1: \2<\</'
 }
 
 prefix_to_8() {
@@ -497,7 +497,7 @@ run_testcase ()
 
 	timestr="$USERT $SYST $REALT"
 	pname=`$ECHO "$tname                 "|$CUT -c 1-16`
-	$SETCOLOR_NORMAL && $ECHO -n "$pname          $timestr"
+	$ECHO -n "$pname          $timestr"
 
 
 
@@ -520,7 +520,6 @@ run_testcase ()
 	 exit 1
 	fi
 	 
-#	$ECHO "Restarting mysqld"
 	mysql_restart
 	$ECHO "Resuming Tests"
 	$ECHO