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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
fb52fe5c
Commit
fb52fe5c
authored
Jan 13, 2006
by
tomas@poseidon.ndb.mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix compile error on hp-ux setenv->putenv
print slave port as well
parent
21008ab2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
9 deletions
+14
-9
client/mysqltest.c
client/mysqltest.c
+8
-4
mysql-test/mysql-test-run.sh
mysql-test/mysql-test-run.sh
+6
-5
No files found.
client/mysqltest.c
View file @
fb52fe5c
...
@@ -273,6 +273,7 @@ typedef struct
...
@@ -273,6 +273,7 @@ typedef struct
int
alloced_len
;
int
alloced_len
;
int
int_dirty
;
/* do not update string if int is updated until first read */
int
int_dirty
;
/* do not update string if int is updated until first read */
int
alloced
;
int
alloced
;
char
*
env_s
;
}
VAR
;
}
VAR
;
#if defined(__NETWARE__) || defined(__WIN__)
#if defined(__NETWARE__) || defined(__WIN__)
...
@@ -885,16 +886,18 @@ int var_set(const char *var_name, const char *var_name_end,
...
@@ -885,16 +886,18 @@ int var_set(const char *var_name, const char *var_name_end,
if
(
env_var
)
if
(
env_var
)
{
{
char
buf
[
1024
];
char
buf
[
1024
],
*
old_env_s
=
v
->
env_s
;
memcpy
(
buf
,
v
->
name
,
v
->
name_len
);
buf
[
v
->
name_len
]
=
0
;
if
(
v
->
int_dirty
)
if
(
v
->
int_dirty
)
{
{
sprintf
(
v
->
str_val
,
"%d"
,
v
->
int_val
);
sprintf
(
v
->
str_val
,
"%d"
,
v
->
int_val
);
v
->
int_dirty
=
0
;
v
->
int_dirty
=
0
;
v
->
str_val_len
=
strlen
(
v
->
str_val
);
v
->
str_val_len
=
strlen
(
v
->
str_val
);
}
}
setenv
(
buf
,
v
->
str_val
,
1
);
strxmov
(
buf
,
v
->
name
,
"="
,
v
->
str_val
,
NullS
);
if
(
!
(
v
->
env_s
=
my_strdup
(
buf
,
MYF
(
MY_WME
))))
die
(
"Out of memory"
);
putenv
(
v
->
env_s
);
my_free
((
gptr
)
old_env_s
,
MYF
(
MY_ALLOW_ZERO_PTR
));
}
}
DBUG_RETURN
(
result
);
DBUG_RETURN
(
result
);
}
}
...
@@ -4335,6 +4338,7 @@ static VAR *var_init(VAR *v, const char *name, int name_len, const char *val,
...
@@ -4335,6 +4338,7 @@ static VAR *var_init(VAR *v, const char *name, int name_len, const char *val,
tmp_var
->
alloced_len
=
val_alloc_len
;
tmp_var
->
alloced_len
=
val_alloc_len
;
tmp_var
->
int_val
=
(
val
)
?
atoi
(
val
)
:
0
;
tmp_var
->
int_val
=
(
val
)
?
atoi
(
val
)
:
0
;
tmp_var
->
int_dirty
=
0
;
tmp_var
->
int_dirty
=
0
;
tmp_var
->
env_s
=
0
;
return
tmp_var
;
return
tmp_var
;
}
}
...
...
mysql-test/mysql-test-run.sh
View file @
fb52fe5c
...
@@ -250,6 +250,7 @@ if [ -n "$MTR_BUILD_THREAD" ] ; then
...
@@ -250,6 +250,7 @@ if [ -n "$MTR_BUILD_THREAD" ] ; then
echo
"Using MYSQL_MANAGER_PORT =
$MYSQL_MANAGER_PORT
"
echo
"Using MYSQL_MANAGER_PORT =
$MYSQL_MANAGER_PORT
"
echo
"Using SLAVE_MYPORT =
$SLAVE_MYPORT
"
echo
"Using SLAVE_MYPORT =
$SLAVE_MYPORT
"
echo
"Using NDBCLUSTER_PORT =
$NDBCLUSTER_PORT
"
echo
"Using NDBCLUSTER_PORT =
$NDBCLUSTER_PORT
"
echo
"Using NDBCLUSTER_PORT_SLAVE =
$NDBCLUSTER_PORT_SLAVE
"
fi
fi
NO_SLAVE
=
0
NO_SLAVE
=
0
...
...
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