Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.0

into hegel.txg:/home/miguel/bk/mysql-4.0

BitKeeper/etc/logging_ok

@@ -65,6 +65,7 @@ marko@hundin.mysql.fi
 miguel@hegel.(none)
 miguel@hegel.br
 miguel@hegel.local
+miguel@hegel.txg
 miguel@light.
 miguel@light.local
 miguel@sartre.local

extra/perror.c

@@ -233,7 +233,7 @@ int main(int argc,char *argv[])
       else
       {
 	if (verbose)
-	  printf("MySql error:  %3d = %s\n",code,msg);
+	  printf("MySQL error:  %3d = %s\n",code,msg);
 	else
 	  puts(msg);
       }