1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00

IM changes by GUI team: add a version_no column to the

SHOW INSTANCE STATUS output


mysql-test/r/im_life_cycle.result:
  update result
mysql-test/t/im_life_cycle.imtest:
  fix test to take into account the new column
server-tools/instance-manager/commands.cc:
  add a version_no column to the SHOW INSTANCE STATUS output
server-tools/instance-manager/instance_options.cc:
  cleanup
This commit is contained in:
unknown
2006-02-10 03:35:07 +03:00
parent 93985f253a
commit 7dcbb4803f
4 changed files with 68 additions and 23 deletions

View File

@@ -138,9 +138,14 @@ int Instance_options::fill_instance_version()
if (*result != '\0')
{
char *start;
/* chop the newline from the end of the version string */
result[strlen(result) - NEWLINE_LEN]= '\0';
mysqld_version= strdup_root(&alloc, result);
/* trim leading whitespaces */
start= result;
while (my_isspace(default_charset_info, *start))
++start;
mysqld_version= strdup_root(&alloc, start);
}
err:
return rc;
@@ -167,8 +172,6 @@ err:
int Instance_options::fill_log_options()
{
Buffer buff;
uint position= 0;
char **tmp_argv= argv;
enum { MAX_LOG_OPTION_LENGTH= 256 };
char datadir[MAX_LOG_OPTION_LENGTH];
char hostname[MAX_LOG_OPTION_LENGTH];