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
e1351afc
Commit
e1351afc
authored
19 years ago
by
kent@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mysql-test-run.pl, mtr_misc.pl:
Bug#12615: Host name might not resolve, use short host name
parent
1664e31f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
mysql-test/lib/mtr_misc.pl
mysql-test/lib/mtr_misc.pl
+9
-0
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+1
-1
No files found.
mysql-test/lib/mtr_misc.pl
View file @
e1351afc
...
@@ -7,6 +7,7 @@
...
@@ -7,6 +7,7 @@
use
strict
;
use
strict
;
sub
mtr_full_hostname
();
sub
mtr_full_hostname
();
sub
mtr_short_hostname
();
sub
mtr_init_args
($);
sub
mtr_init_args
($);
sub
mtr_add_arg
($$);
sub
mtr_add_arg
($$);
sub
mtr_path_exists
(@);
sub
mtr_path_exists
(@);
...
@@ -21,6 +22,7 @@ sub mtr_exe_exists(@);
...
@@ -21,6 +22,7 @@ sub mtr_exe_exists(@);
# We want the fully qualified host name and hostname() may have returned
# We want the fully qualified host name and hostname() may have returned
# only the short name. So we use the resolver to find out.
# only the short name. So we use the resolver to find out.
# Note that this might fail on some platforms
sub
mtr_full_hostname
()
{
sub
mtr_full_hostname
()
{
...
@@ -35,6 +37,13 @@ sub mtr_full_hostname () {
...
@@ -35,6 +37,13 @@ sub mtr_full_hostname () {
return
$hostname
;
return
$hostname
;
}
}
sub
mtr_short_hostname
()
{
my
$hostname
=
hostname
();
$hostname
=~
s/\..+$//
;
return
$hostname
;
}
# FIXME move to own lib
# FIXME move to own lib
sub
mtr_init_args
($)
{
sub
mtr_init_args
($)
{
...
...
This diff is collapsed.
Click to expand it.
mysql-test/mysql-test-run.pl
View file @
e1351afc
...
@@ -414,7 +414,7 @@ sub initial_setup () {
...
@@ -414,7 +414,7 @@ sub initial_setup () {
$opt_source_dist
=
1
;
$opt_source_dist
=
1
;
}
}
$glob_hostname
=
mtr_
full
_hostname
();
$glob_hostname
=
mtr_
short
_hostname
();
# 'basedir' is always parent of "mysql-test" directory
# 'basedir' is always parent of "mysql-test" directory
$glob_mysql_test_dir
=
cwd
();
$glob_mysql_test_dir
=
cwd
();
...
...
This diff is collapsed.
Click to expand it.
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