summaryrefslogtreecommitdiff
path: root/sql-bench
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-03-21 13:02:53 +0100
committerSergei Golubchik <serg@mariadb.org>2016-03-21 13:02:53 +0100
commit3b0c7ac1f9d64afc933ce0354037c709366b7dff (patch)
tree39cefed54f79f93f82e9c33a4e094270103bf137 /sql-bench
parente7cf898d6dc3dcac41f58db4761df3a6d1dffc03 (diff)
parent22ebf3cb456e0d8db295e7cc93f08e3d3ecfea47 (diff)
downloadmariadb-git-3b0c7ac1f9d64afc933ce0354037c709366b7dff.tar.gz
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql-bench')
-rw-r--r--sql-bench/bench-init.pl.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql-bench/bench-init.pl.sh b/sql-bench/bench-init.pl.sh
index a46bb2d7a49..7bc7c23be66 100644
--- a/sql-bench/bench-init.pl.sh
+++ b/sql-bench/bench-init.pl.sh
@@ -265,7 +265,7 @@ sub fetch_all_rows
if (!($sth= $dbh->prepare($query)))
{
print "\n" if ($opt_debug);
- die "Error occured with prepare($query)\n -> $DBI::errstr\n";
+ die "Error occurred with prepare($query)\n -> $DBI::errstr\n";
return undef;
}
if (!$sth->execute)
@@ -282,7 +282,7 @@ sub fetch_all_rows
print "0\n" if ($opt_debug);
return 0;
}
- die "Error occured with execute($query)\n -> $DBI::errstr\n";
+ die "Error occurred with execute($query)\n -> $DBI::errstr\n";
$sth->finish;
return undef;
}