Commit 5785edf6 authored by Leigh Stoller's avatar Leigh Stoller

Add -q -s option to egreps for mysql version to avoid extraneous output.

parent a437d933
......@@ -29,7 +29,7 @@ my $DBNAME = "@TBDBNAME@";
my $master_schema = "$testbed_srcdir/sql/database-create.sql";
my $schemadiff = "$testbed_srcdir/utils/schemadiff";
my $isvers5 = system("mysql -V | egrep 'Distrib 5.'") == 0;
my $isvers5 = system("mysql -V | egrep -q -s 'Distrib 5.'") == 0;
my $extraopts = ($isvers5 ? "--skip-quote-names" : "");
#
......
......@@ -30,7 +30,7 @@ my $DBNAME = "@TBDBNAME@";
my $master_sitevars = "$testbed_srcdir/sql/sitevars-create.sql";
my $sitevarsdiff = "$testbed_srcdir/utils/sitevarsdiff";
my $isvers5 = system("mysql -V | egrep 'Distrib 5.'") == 0;
my $isvers5 = system("mysql -V | egrep -q -s 'Distrib 5.'") == 0;
my $extraopts = ($isvers5 ? "--skip-opt" : "");
#
......
......@@ -23,7 +23,7 @@ if (@ARGV && $ARGV[0] eq "-i") {
#
my $DBNAME = '@TBDBNAME@';
my $isvers5 = system("mysql -V | egrep 'Distrib 5.'") == 0;
my $isvers5 = system("mysql -V | egrep -q -s 'Distrib 5.'") == 0;
my $extraopts = ($isvers5 ? "--skip-opt" : "");
my $mysqldump = "mysqldump $extraopts";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment