mirror of
https://github.com/MariaDB/server.git
synced 2025-11-02 02:53:04 +03:00
f2f1e4d852
im_daemon_life_cycle fails randomly.
1. Move IM-angel functionality into a separate file, create Angel class.
2. Be more verbose;
3. Fix typo in FLUSH INSTANCES implementation;
4. Polishing.
mysql-test/r/im_options.result:
Updated result file.
mysql-test/t/im_cmd_line.imtest:
Updated test.
server-tools/instance-manager/IMService.cpp:
Move HandleServiceOptions() into IMService::main().
server-tools/instance-manager/IMService.h:
Move HandleServiceOptions() into IMService::main().
server-tools/instance-manager/Makefile.am:
Added angel.cc and angel.h.
server-tools/instance-manager/WindowsService.cpp:
Initialize class-members in constructor.
server-tools/instance-manager/WindowsService.h:
Initialize class-members in constructor.
server-tools/instance-manager/commands.cc:
Return actual error code (ER_OUT_OF_RESOURCES or ER_THERE_IS_ACTIVE_INSTANCE)
from FLUSH INSTANCES.
server-tools/instance-manager/manager.cc:
1. Return actual error code from Manager::flush_instances().
2. Be more verbose.
server-tools/instance-manager/manager.h:
Return actual error code from Manager::flush_instances().
server-tools/instance-manager/mysqlmanager.cc:
Move IM-angel functionality into separate file (angel.cc).
server-tools/instance-manager/priv.cc:
Use return bool datatype instead int{ 0, 1 }.
server-tools/instance-manager/priv.h:
Use return bool datatype instead int{ 0, 1 }.
server-tools/instance-manager/angel.cc:
IM-angel functionality.
server-tools/instance-manager/angel.h:
IM-angel functionality.
35 lines
984 B
C++
35 lines
984 B
C++
/* Copyright (C) 2003-2006 MySQL 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
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#ifndef INCLUDES_MYSQL_ANGEL_H
|
|
#define INCLUDES_MYSQL_ANGEL_H
|
|
|
|
#ifndef __WIN__
|
|
|
|
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
|
|
#pragma interface
|
|
#endif
|
|
|
|
#include <my_global.h>
|
|
|
|
class Angel
|
|
{
|
|
public:
|
|
static int main();
|
|
};
|
|
|
|
#endif // INCLUDES_MYSQL_ANGEL_H
|
|
#endif // __WIN__
|