Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
e40ce2e0
Commit
e40ce2e0
authored
Jan 23, 2007
by
joerg@trift2
Browse files
Options
Browse Files
Download
Plain Diff
Merge trift2.:/MySQL/M51/mysql-5.1
into trift2.:/MySQL/M51/push-5.1
parents
b2bfd353
224ce908
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
35 additions
and
4 deletions
+35
-4
BUILD/check-cpu
BUILD/check-cpu
+27
-3
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+1
-1
scripts/mysqlaccess.sh
scripts/mysqlaccess.sh
+4
-0
scripts/mysqld_multi.sh
scripts/mysqld_multi.sh
+3
-0
No files found.
BUILD/check-cpu
View file @
e40ce2e0
...
...
@@ -5,9 +5,13 @@
#
check_cpu
()
{
if
test
-r
/proc/cpuinfo
;
then
CPUINFO
=
/proc/cpuinfo
if
test
-n
"
$TEST_CPUINFO
"
;
then
CPUINFO
=
$TEST_CPUINFO
fi
if
test
-r
"
$CPUINFO
"
-a
"
$CPUINFO
"
!=
" "
;
then
# on Linux (and others?) we can get detailed CPU information out of /proc
cpuinfo
=
"cat
/proc/cpuinfo
"
cpuinfo
=
"cat
$CPUINFO
"
# detect CPU family
cpu_family
=
`
$cpuinfo
|
grep
'family'
|
cut
-d
':'
-f
2 |
cut
-d
' '
-f
2 |
head
-1
`
...
...
@@ -33,6 +37,7 @@ check_cpu () {
done
else
# Fallback when there is no /proc/cpuinfo
CPUINFO
=
" "
case
"
`
uname
-s
`
"
in
FreeBSD|OpenBSD
)
cpu_family
=
`
uname
-m
`
;
...
...
@@ -84,6 +89,18 @@ check_cpu () {
*
Pentium
*
M
*
pro
*
)
cpu_arg
=
"pentium-m"
;
;;
*
Celeron
\(
R
\)
*
\
M
*
)
cpu_arg
=
"pentium-m"
;
;;
*
Celeron
*
Coppermine
*
)
cpu_arg
=
"pentium3"
;;
*
Celeron
\(
R
\)
*
)
cpu_arg
=
"pentium4"
;;
*
Celeron
*
)
cpu_arg
=
"pentium2"
;
;;
*
Athlon
*
64
*
)
cpu_arg
=
"athlon64"
;
;;
...
...
@@ -120,7 +137,14 @@ check_cpu () {
esac
if
test
-z
"
$cpu_arg
"
;
then
if
test
-z
"
$cpu_arg
"
;
then
if
test
"
$CPUINFO
"
!=
" "
;
then
# fallback to uname if necessary
TEST_CPUINFO
=
" "
check_cpu_cflags
=
""
check_cpu
return
fi
echo
"BUILD/check-cpu: Oops, could not find out what kind of cpu this machine is using."
>
&2
check_cpu_cflags
=
""
return
...
...
mysql-test/mysql-test-run.pl
View file @
e40ce2e0
...
...
@@ -1037,7 +1037,7 @@ sub command_line_setup () {
# On some operating systems, there is a limit to the length of a
# UNIX domain socket's path far below PATH_MAX, so try to avoid long
# socket path names.
$sockdir
=
tempdir
(
CLEANUP
=>
1
)
if
(
length
(
$sockdir
)
>
80
);
$sockdir
=
tempdir
(
CLEANUP
=>
0
)
if
(
length
(
$sockdir
)
>
80
);
# Put this into a hash, will be a C struct
...
...
scripts/mysqlaccess.sh
View file @
e40ce2e0
...
...
@@ -465,6 +465,9 @@ MySQLaccess::Report::Print_Header();
elsif
(
-f
"@sysconfdir@/
$script_conf
"
)
{
require
"@sysconfdir@/
$script_conf
"
;
}
elsif
(
-f
"/etc/
$script_conf
"
)
{
require
"/etc/
$script_conf
"
;
}
# ****************************
# Read in all parameters
...
...
@@ -930,6 +933,7 @@ sub MergeConfigFile {
sub MergeConfigFiles
{
my
(
$name
,
$pass
,
$uid
,
$gid
,
$quota
,
$comment
,
$gcos
,
$dir
,
$shell
)
=
getpwuid
$<
;
MergeConfigFile
(
"@sysconfdir@/my.cnf"
)
;
MergeConfigFile
(
"/etc/my.cnf"
)
;
MergeConfigFile
(
"
$dir
/.my.cnf"
)
;
}
...
...
scripts/mysqld_multi.sh
View file @
e40ce2e0
...
...
@@ -467,6 +467,9 @@ sub find_groups
if (-f "@sysconfdir@/my.cnf" && -r "@sysconfdir@/my.cnf")
{
open(MY_CNF, "<@sysconfdir@/my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);
} elsif (-f "/etc/my.cnf" && -r "/etc/my.cnf")
{
open(MY_CNF, "</etc/my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);
}
for ($i = 0; ($line = shift @tmp); $i++)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment