mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/home/jimw/my/mysql-5.1-19059

Browse source 
into  mysql.com:/home/jimw/my/mysql-5.1-clean


sql/mysqld.cc:
  Auto merged
This commit is contained in:
unknown 2006-04-17 10:06:17 -07:00
commit 58faa56994
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server-tools/instance-manager/instance_options.cc
View file

@ -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);

6
server-tools/instance-manager/parse_output.cc
View file

@ -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);

4
sql/mysqld.cc
View file

@ -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);
}