Merge mysql.com:/home/cps/mysql/devel/im-failure-fix (523a4217) · Commits · Software / OSDI20 Artifacts / mariadb

server-tools/instance-manager/commands.cc

+5 −2

Original line number	Diff line number	Diff line
		@@ -14,14 +14,17 @@
		along with this program; if not, write to the Free Software
		Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */

		#include "command.h"
		#include "commands.h"
		#include "instance.h"

		#include "instance_map.h"
		#include "messages.h"
		#include "mysqld_error.h"
		#include "mysql_manager_error.h"
		#include "protocol.h"
		#include "buffer.h"

		#include <m_string.h>
		#include <mysql.h>


		/* implementation for Show_instances: */

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,8 +16,8 @@
		along with this program; if not, write to the Free Software
		Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */

		#include "command.h"
		#include "instance.h"
		#include "my_global.h"

		/*
		Print all instances of this instance manager.

+0 −5

Original line number	Diff line number	Diff line
		@@ -15,11 +15,6 @@
		Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */

		#include "factory.h"
		#include "my_global.h"

		#include <stdio.h>
		#include <ctype.h>


		Show_instances *Command_factory::new_Show_instances()
		{

+2 −0

Original line number	Diff line number	Diff line
		@@ -20,10 +20,12 @@
		#endif

		#include "guardian.h"

		#include "instance_map.h"
		#include "instance.h"
		#include "mysql_manager_error.h"
		#include "log.h"

		#include <string.h>
		#include <sys/types.h>
		#include <signal.h>

+2 −1

Original line number	Diff line number	Diff line
		@@ -17,9 +17,10 @@
		Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */

		#include <my_global.h>
		#include "thread_registry.h"

		#include <my_sys.h>
		#include <my_list.h>
		#include "thread_registry.h"

		#ifdef __GNUC__
		#pragma interface