Commit d7ddf0e0 authored by unknown's avatar unknown
Browse files

a bunch of IM fixes from the GUI team 


mysql-test/r/im_life_cycle.result:
  correct result
mysql-test/t/im_life_cycle.imtest:
  check that wrong command is processed correctly
server-tools/instance-manager/Makefile.am:
  always look for passwords in /etc/ on unixes
server-tools/instance-manager/commands.cc:
  fix warning
server-tools/instance-manager/instance.cc:
  fix monitoring capabilities, when no port was specified
  for an instance
server-tools/instance-manager/instance_map.cc:
  allow relative paths in --defaults-file option
server-tools/instance-manager/mysqlmanager.cc:
  fix windows warning
server-tools/instance-manager/options.cc:
  add vars to allow relative paths in --defaults-file option
server-tools/instance-manager/options.h:
  add an option
server-tools/instance-manager/parse.cc:
  check for get_text_id return value
server-tools/instance-manager/portability.h:
  add _snprintf define, move platfrom-independent
  ifdefs to priv.h
server-tools/instance-manager/priv.cc:
  increase net timeout. it should be equal to mysqld's
server-tools/instance-manager/priv.h:
  move platform-independent ifdefs here
parent 4e69c153

mysql-test/r/im_life_cycle.result

+2 −0
Original line number Diff line number Diff line
@@ -62,3 +62,5 @@ SHOW INSTANCES; 
instance_name	status

mysqld1	online

mysqld2	offline

SHOW INSTANCE STATUS;

ERROR 42000: You have an error in your command syntax. Check the manual that corresponds to your MySQL Instance Manager version for the right syntax to use

mysql-test/t/im_life_cycle.imtest

+9 −0
Original line number Diff line number Diff line
@@ -140,3 +140,12 @@ SHOW INSTANCES; 
--exec $MYSQL_TEST_DIR/t/kill_n_check.sh $IM_MYSQLD2_PATH_PID killed



SHOW INSTANCES;



###########################################################################

#

# 1.1.8. Check that Instance Manager returns an error on

# incomplete SHOW INSTANCE STATUS command.

#

###########################################################################

--error 1149

SHOW INSTANCE STATUS;

server-tools/instance-manager/Makefile.am

+2 −4
Original line number Diff line number Diff line
@@ -30,10 +30,8 @@ liboptions_a_CXXFLAGS= $(CXXFLAGS) \ 
	-DDEFAULT_PID_FILE_NAME="$(localstatedir)/mysqlmanager.pid" \

	-DDEFAULT_LOG_FILE_NAME="$(localstatedir)/mysqlmanager.log" \

	-DDEFAULT_SOCKET_FILE_NAME="/tmp/mysqlmanager.sock" \

	-DDEFAULT_PASSWORD_FILE_NAME="$(sysconfdir)/mysqlmanager.passwd" \

	-DDEFAULT_PASSWORD_FILE_NAME="/etc/mysqlmanager.passwd" \

	-DDEFAULT_MYSQLD_PATH="$(libexecdir)/mysqld$(EXEEXT)" \

	-DDEFAULT_MONITORING_INTERVAL="20" \

	-DDEFAULT_PORT="2273" \

	-DDEFAULT_CONFIG_FILE="/etc/my.cnf" \

	-DPROTOCOL_VERSION=@PROTOCOL_VERSION@

server-tools/instance-manager/commands.cc

+1 −1
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ int Show_instance_log::execute(struct st_net *net, ulong connection_id) 
      read_buff.reserve(0, buff_size);



      /* read in one chunk */

      read_len= my_seek(fd, file_stat.st_size - size, MY_SEEK_SET, MYF(0));

      read_len= (int)my_seek(fd, file_stat.st_size - size, MY_SEEK_SET, MYF(0));



      if ((read_len= my_read(fd, (byte*) read_buff.buffer,

                             buff_size, MYF(0))) < 0)

server-tools/instance-manager/instance.cc

+4 −0
Original line number Diff line number Diff line
@@ -418,6 +418,10 @@ bool Instance::is_running() 
  if (options.mysqld_socket)

    socket= strchr(options.mysqld_socket, '=') + 1;



  /* no port was specified => instance falled back to default value */

  if (!options.mysqld_port && !options.mysqld_socket)

    port= SERVER_DEFAULT_PORT;



  pthread_mutex_lock(&LOCK_instance);



  mysql_init(&mysql);