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
7e573aa5
Commit
7e573aa5
authored
Apr 17, 2006
by
jimw@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/jimw/my/mysql-5.1-19059
into mysql.com:/home/jimw/my/mysql-5.1-clean
parents
93f965d1
80b85636
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
4 deletions
+8
-4
server-tools/instance-manager/instance_options.cc
server-tools/instance-manager/instance_options.cc
+1
-1
server-tools/instance-manager/parse_output.cc
server-tools/instance-manager/parse_output.cc
+3
-3
sql/mysqld.cc
sql/mysqld.cc
+4
-0
No files found.
server-tools/instance-manager/instance_options.cc
View file @
7e573aa5
...
...
@@ -132,7 +132,7 @@ int Instance_options::fill_instance_version()
bzero
(
result
,
MAX_VERSION_STRING_LENGTH
);
rc
=
parse_output_and_get_value
(
cmd
.
buffer
,
mysqld_path
,
rc
=
parse_output_and_get_value
(
cmd
.
buffer
,
"Ver"
,
result
,
MAX_VERSION_STRING_LENGTH
,
GET_LINE
);
...
...
server-tools/instance-manager/parse_output.cc
View file @
7e573aa5
...
...
@@ -96,14 +96,14 @@ int parse_output_and_get_value(const char *command, const char *word,
linebuf
[
sizeof
(
linebuf
)
-
1
]
=
'\0'
;
/* safety */
/*
Compare the start of our line with the word(s) we are looking for.
Find the word(s) we are looking for in the line
*/
if
(
!
strncmp
(
word
,
linep
,
wordlen
))
if
(
(
linep
=
strstr
(
linep
,
word
)
))
{
/*
If we have found our word(s), then move linep past the word(s)
*/
linep
+=
wordlen
;
linep
+=
wordlen
;
if
(
flag
&
GET_VALUE
)
{
trim_space
((
const
char
**
)
&
linep
,
&
found_word_len
);
...
...
sql/mysqld.cc
View file @
7e573aa5
...
...
@@ -6774,6 +6774,10 @@ SHOW_VAR status_vars[]= {
static
void
print_version
(
void
)
{
set_server_version
();
/*
Note: the instance manager keys off the string 'Ver' so it can find the
version from the output of 'mysqld --version', so don't change it!
*/
printf
(
"%s Ver %s for %s on %s (%s)
\n
"
,
my_progname
,
server_version
,
SYSTEM_TYPE
,
MACHINE_TYPE
,
MYSQL_COMPILATION_COMMENT
);
}
...
...
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