summaryrefslogtreecommitdiff
path: root/mysql-test/lib
diff options
context:
space:
mode:
authorsayantan dutta <sayantan.dutta@oracle.com>2013-04-16 16:26:45 +0530
committersayantan dutta <sayantan.dutta@oracle.com>2013-04-16 16:26:45 +0530
commit899b219e059cc198b0a10f7d76dd8bd208a090f2 (patch)
tree82d099a36b1660b0cc903b69ba240fbefb89ead8 /mysql-test/lib
parentabd76285dae8851f465809c6943f4f14096ba243 (diff)
downloadmariadb-git-899b219e059cc198b0a10f7d76dd8bd208a090f2.tar.gz
Bug #16632543 - INCORRECT VALUE OF BOGOMIPS IN MYSQLTEST
Diffstat (limited to 'mysql-test/lib')
-rw-r--r--mysql-test/lib/My/SysInfo.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/lib/My/SysInfo.pm b/mysql-test/lib/My/SysInfo.pm
index 28660f44bae..36c50ab91d1 100644
--- a/mysql-test/lib/My/SysInfo.pm
+++ b/mysql-test/lib/My/SysInfo.pm
@@ -1,5 +1,5 @@
# -*- cperl -*-
-# Copyright (c) 2008 MySQL AB, 2008 Sun Microsystems, Inc.
+# Copyright (c) 2013 MySQL AB, 2008 Sun Microsystems, Inc.
# Use is subject to license terms.
#
# This program is free software; you can redistribute it and/or modify
@@ -60,7 +60,7 @@ sub _cpuinfo {
}
# Make sure bogomips is set to some value
- $cpuinfo->{bogomips} |= DEFAULT_BOGO_MIPS;
+ $cpuinfo->{bogomips} ||= DEFAULT_BOGO_MIPS;
# Cpus reported once, but with 'cpu_count' set to the actual number
my $cpu_count= $cpuinfo->{cpu_count} || 1;