database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into mysql.com:/M41/comment-4.1
This commit is contained in:
joerg@mysql.com
2006-03-01 17:43:16 +01:00
parent 7f7f5969c0 38a7f5551a
commit 1b698f03e4
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/mysql-test-run.pl
View File

@ -184,6 +184,7 @@ our $opt_big_test= 0; # Send --big-test to mysqltest
our @opt_extra_mysqld_opt; our @opt_extra_mysqld_opt;
our $opt_comment;
our $opt_compress; our $opt_compress;
our $opt_current_test; our $opt_current_test;
our $opt_ddd; our $opt_ddd;
@ -536,6 +537,7 @@ sub command_line_setup () {
# Misc # Misc
'big-test' => \$opt_big_test, 'big-test' => \$opt_big_test,
'comment=s' => \$opt_comment,
'compress' => \$opt_compress, 'compress' => \$opt_compress,
'debug' => \$opt_debug, 'debug' => \$opt_debug,
'fast' => \$opt_fast, 'fast' => \$opt_fast,
@ -571,6 +573,14 @@ sub command_line_setup () {
usage(""); usage("");
} }
if ( $opt_comment )
{
print "\n";
print '#' x 78, "\n";
print "# $opt_comment\n";
print '#' x 78, "\n\n";
}
foreach my $arg ( @ARGV ) foreach my $arg ( @ARGV )
{ {
if ( $arg =~ /^--skip-/ ) if ( $arg =~ /^--skip-/ )
@ -2398,6 +2408,7 @@ Misc options
verbose Verbose output from this script verbose Verbose output from this script
script-debug Debug this script itself script-debug Debug this script itself
comment=STR Write STR to the output
compress Use the compressed protocol between client and server compress Use the compressed protocol between client and server
timer Show test case execution time timer Show test case execution time
start-and-exit Only initiate and start the "mysqld" servers, use the startup start-and-exit Only initiate and start the "mysqld" servers, use the startup

7
mysql-test/mysql-test-run.sh
View File

@ -476,6 +476,13 @@ while test $# -gt 0; do
--fast) --fast)
FAST_START=1 FAST_START=1
;; ;;
--comment=*)
TMP=`$ECHO "$1" | $SED -e "s;--comment=;;"`
echo
echo '############################################'
echo "# $TMP"
echo '############################################'
;;
-- ) shift; break ;; -- ) shift; break ;;
--* ) $ECHO "Unrecognized option: $1"; exit 1 ;; --* ) $ECHO "Unrecognized option: $1"; exit 1 ;;
* ) break ;; * ) break ;;