Commit 6e0222cb authored by unknown's avatar unknown
Browse files

Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
parents 9946ce09 8363ca4d

server-tools/instance-manager/command.h

+2 −2
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ 
   along with this program; if not, write to the Free Software

   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



#include <my_global.h>



#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)

#pragma interface

#endif



#include <my_global.h>



/* Class responsible for allocation of im commands. */



class Instance_map;

server-tools/instance-manager/listener.h

+3 −3
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ 
   along with this program; if not, write to the Free Software

   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



#include <my_global.h>

#include <my_pthread.h>



#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)

#pragma interface

#endif



#include <my_global.h>

#include <my_pthread.h>





pthread_handler_t listener(void *arg);

server-tools/instance-manager/mysql_connection.h

+3 −4
Original line number Diff line number Diff line
@@ -16,13 +16,12 @@ 
   along with this program; if not, write to the Free Software

   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)

#pragma interface

#endif



#include <my_global.h>

#include <my_pthread.h>



#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)

#pragma interface

#endif



pthread_handler_t mysql_connection(void *arg);

server-tools/instance-manager/options.h

+4 −4
Original line number Diff line number Diff line
@@ -16,16 +16,16 @@ 
   along with this program; if not, write to the Free Software

   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)

#pragma interface

#endif



/*

  Options - all possible options for the instance manager grouped in one

  struct.

*/

#include <my_global.h>



#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)

#pragma interface

#endif



struct Options

{

#ifdef __WIN__

server-tools/instance-manager/thread_registry.cc

+1 −1
Original line number Diff line number Diff line 
/* cOPYRIght (C) 2003 MySQL AB & MySQL Finland AB & TCX DataKonsult AB

/* Copyright (C) 2003 MySQL AB & MySQL Finland AB & TCX DataKonsult AB



   This program is free software; you can redistribute it and/or modify

   it under the terms of the GNU General Public License as published by