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 mysql.com:/M50/comment-5.0 into mysql.com:/M51/comment-5.1

Browse Source 
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
This commit is contained in:
unknown
2006-03-01 13:43:42 +01:00
parent ee9930bfa4 4ede8823b7
commit 621db819d9
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,6 +198,7 @@ our $opt_big_test= 0; # Send --big-test to mysqltest
our @opt_extra_mysqld_opt;
our $opt_comment;
our $opt_compress;
our $opt_ssl;
our $opt_skip_ssl;
@ -669,6 +670,14 @@ sub command_line_setup () {
print '#' x 78, "\n\n";
}
if ( $opt_comment )
{
print "\n";
print '#' x 78, "\n";
print "# $opt_comment\n";
print '#' x 78, "\n\n";
}
foreach my $arg ( @ARGV )
{
if ( $arg =~ /^--skip-/ )
@ -3256,6 +3265,7 @@ Options for coverage, profiling etc
Misc options
comment=STR Write STR to the output
verbose Verbose output from this script
script-debug Debug this script itself
timer Show test case execution time

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

@ -601,7 +601,14 @@ while test $# -gt 0; do
FAST_START=1
;;
--use-old-data)
USE_OLD_DATA=1;
USE_OLD_DATA=1
;;
--comment=*)
TMP=`$ECHO "$1" | $SED -e "s;--comment=;;"`
echo
echo '############################################'
echo "# $TMP"
echo '############################################'
;;
-- ) shift; break ;;
--* ) $ECHO "Unrecognized option: $1"; exit 1 ;;