mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
8b4fcf6e3b
- WL#3158: IM: Instance configuration extensions; - WL#3159: IM: --bootstrap and --start-default-instance modes The following new statements have been added: - CREATE INSTANCE; - DROP INSTANCE; The behaviour of the following statements have been changed: - SET; - UNSET; - FLUSH INSTANCES; - SHOW INSTANCES; - SHOW INSTANCE OPTIONS; BitKeeper/deleted/.del-im_options_set.imtest~b53d9d60e5684833: Delete: mysql-test/t/im_options_set.imtest BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921: Delete: mysql-test/r/im_options_set.result BitKeeper/deleted/.del-im_options_unset.imtest~768eb186b51d0048: Delete: mysql-test/t/im_options_unset.imtest BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f: Delete: mysql-test/r/im_options_unset.result client/get_password.c: Change prototype to avoid casting when using C-strings (char *). include/m_string.h: Moved LEX_STRING to global header from sql/ to be accessible from all components (IM for one). include/my_sys.h: Added constants for modify_defaults_file(). include/mysql_com.h: Removed duplicated declarations. my_sys.h should be used instead. libmysql/get_password.c: Change prototype to avoid casting when using C-strings (char *). mysql-test/mysql-test-run.pl: Added environment variables to be used from tests. mysql-test/r/im_daemon_life_cycle.result: Column name has been changed in SHOW INSTANCES. mysql-test/r/im_life_cycle.result: 1. Column name has been changed in SHOW INSTANCES. 2. Removed redundant SHOW INSTANCE STATUS statements. mysql-test/r/im_utils.result: Updated the result file. mysql-test/t/im_daemon_life_cycle-im.opt: Set minimal monitoring interval for Instance Manager to speed up testing. mysql-test/t/im_daemon_life_cycle.imtest: Get Instance Manager and managed mysqld-instances enough time to start. mysql-test/t/im_life_cycle.imtest: 1. Polishing; 2. Fixed a test error in 1.1.2. mysql-test/t/im_utils.imtest: Get Instance Manager and managed mysqld-instances enough time to start. mysys/default.c: Pass the name of the section to the handler function as well. mysys/default_modify.c: Added REMOVE_SECTION functionality. server-tools/instance-manager/IMService.cpp: Polishing: be more verbose. server-tools/instance-manager/IMService.h: Polishing: added copyright. server-tools/instance-manager/Makefile.am: Added new files. server-tools/instance-manager/WindowsService.cpp: Polishing: according to The Coding Style, TRUE/FALSE must be used instead of true/false. server-tools/instance-manager/WindowsService.h: Polishing: added copyright. server-tools/instance-manager/command.h: Polishing: provide a comment for the main operation of "Command" class. server-tools/instance-manager/commands.cc: 1. Added support for CREATE INSTANCE, DROP INSTANCE statements; 2. Added "deprecated" column in output of SHOW INSTANCE OPTIONS; 3. Modified the behaviour of SET/UNSET, FLUSH INSTANCES statements; server-tools/instance-manager/commands.h: 1. Added support for CREATE INSTANCE, DROP INSTANCE statements; 2. Added "deprecated" column in output of SHOW INSTANCE OPTIONS; 3. Modified the behaviour of SET/UNSET, FLUSH INSTANCES statements; server-tools/instance-manager/guardian.cc: Added operations to retrieve state of managed instances. server-tools/instance-manager/guardian.h: Added operations to retrieve state of managed instances. server-tools/instance-manager/instance.cc: 1. Provided an operation to check validity of instance name. 2. Added an attribute to distiguish mysqld-instances, whose configuration should be kept backward-compatible. server-tools/instance-manager/instance.h: 1. Provided an operation to check validity of instance name. 2. Added an attribute to distiguish mysqld-instances, whose configuration should be kept backward-compatible. server-tools/instance-manager/instance_map.cc: 1. Used the operation to check validity of instance name; 2. Added operations to manage instances. server-tools/instance-manager/instance_map.h: Added operations to manage instances. server-tools/instance-manager/instance_options.cc: Changed Instance_options so that it will be possible to manage options on the fly. server-tools/instance-manager/instance_options.h: Changed Instance_options so that it will be possible to manage options on the fly. server-tools/instance-manager/listener.cc: 1. Remove reference to the instance of Options; 2. Use new Options naming scheme. server-tools/instance-manager/listener.h: Remove reference to the instance of Options; server-tools/instance-manager/log.cc: Polishing: use TRUE/FALSE instead of true/false. server-tools/instance-manager/manager.cc: Added a common for IM operation to work with configuration file. server-tools/instance-manager/manager.h: Added a common for IM operation to work with configuration file. server-tools/instance-manager/messages.cc: Added messages for new errors. server-tools/instance-manager/mysql_connection.cc: 1. Move a constant to common place. 2. Polishing. server-tools/instance-manager/mysql_manager_error.h: Added new errors. server-tools/instance-manager/mysqlmanager.cc: 1. Use error code from Options::load(); 2. Eliminate type-casting warning on Windows. server-tools/instance-manager/options.cc: Added support for user-management command-line options. server-tools/instance-manager/options.h: Added support for user-management command-line options. server-tools/instance-manager/parse.cc: 1. Added support of new statements: - CREATE INSTANCE; - DROP INSTANCE. 2. Modified SET/UNSET. server-tools/instance-manager/parse.h: 1. Added support of new statements: - CREATE INSTANCE; - DROP INSTANCE. 2. Modified SET/UNSET. server-tools/instance-manager/parse_output.cc: Sorted out header files. server-tools/instance-manager/parse_output.h: Sorted out header files. server-tools/instance-manager/portability.h: 1. Added constants for Windows. 2. Moved system-dependent defines from instance_options.cc. server-tools/instance-manager/priv.cc: Updated version. server-tools/instance-manager/priv.h: Added some global constants. server-tools/instance-manager/protocol.cc: Replaced NAME_WITH_LENGTH by LEX_STRING. server-tools/instance-manager/protocol.h: Replaced NAME_WITH_LENGTH by LEX_STRING. server-tools/instance-manager/thread_registry.cc: Polishing: use TRUE/FALSE instead of true/false. server-tools/instance-manager/user_map.cc: Added support for managing password database. server-tools/instance-manager/user_map.h: Added support for managing password database. sql/sp.cc: Replaced LEX_STRING_WITH_INIT by LEX_STRING + struct initialization. sql/sp_head.cc: Replaced LEX_STRING_WITH_INIT by LEX_STRING + struct initialization. sql/spatial.cc: Removed LEX_STRING_WITH_INIT. sql/spatial.h: Removed LEX_STRING_WITH_INIT. sql/sql_string.h: Moved STRING_WITH_LEN() macro out from sql (to m_string.h). sql/sql_trigger.cc: Moved STRING_WITH_LEN() macro out from sql (to m_string.h). sql/structs.h: Removed LEX_STRING_WITH_INIT. support-files/mysql.server.sh: Instruct Instance Manager to work in mysqld-safe compatible mode for backward compatibility. mysql-test/r/im_cmd_line.result: Added result file. mysql-test/r/im_instance_conf.result: Added result file. mysql-test/r/im_options.result: Added result file. mysql-test/t/im_cmd_line.imtest: IM command-line options test. mysql-test/t/im_instance_conf-im.opt: Set minimal monitoring interval for Instance Manager to speed up testing. mysql-test/t/im_instance_conf.imtest: Added a new test case for checking instance-management. mysql-test/t/im_life_cycle-im.opt: Set minimal monitoring interval for Instance Manager to speed up testing. mysql-test/t/im_options.imtest: Join im_options_set and im_options_unset and add new tests. mysql-test/t/im_utils-im.opt: Set minimal monitoring interval for Instance Manager to speed up testing. server-tools/instance-manager/exit_codes.h: New file for defining exit codes for user-management mode. server-tools/instance-manager/user_management_commands.cc: User-management commands implementation. server-tools/instance-manager/user_management_commands.h: User-management command declarations.
220 lines
5.3 KiB
C
220 lines
5.3 KiB
C
/* Copyright (C) 2000-2004 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.
|
|
|
|
There are special exceptions to the terms and conditions of the GPL as it
|
|
is applied to this software. View the full text of the exception in file
|
|
EXCEPTIONS-CLIENT in the directory of this software distribution.
|
|
|
|
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 */
|
|
|
|
/*
|
|
** Ask for a password from tty
|
|
** This is an own file to avoid conflicts with curses
|
|
*/
|
|
#include <my_global.h>
|
|
#include <my_sys.h>
|
|
#include "mysql.h"
|
|
#include <m_string.h>
|
|
#include <m_ctype.h>
|
|
|
|
#if defined(HAVE_BROKEN_GETPASS) && !defined(HAVE_GETPASSPHRASE)
|
|
#undef HAVE_GETPASS
|
|
#endif
|
|
|
|
#ifdef HAVE_GETPASS
|
|
#ifdef HAVE_PWD_H
|
|
#include <pwd.h>
|
|
#endif /* HAVE_PWD_H */
|
|
#else /* ! HAVE_GETPASS */
|
|
#if !defined(__WIN__) && !defined(__NETWARE__)
|
|
#include <sys/ioctl.h>
|
|
#ifdef HAVE_TERMIOS_H /* For tty-password */
|
|
#include <termios.h>
|
|
#define TERMIO struct termios
|
|
#else
|
|
#ifdef HAVE_TERMIO_H /* For tty-password */
|
|
#include <termio.h>
|
|
#define TERMIO struct termio
|
|
#else
|
|
#include <sgtty.h>
|
|
#define TERMIO struct sgttyb
|
|
#endif
|
|
#endif
|
|
#ifdef alpha_linux_port
|
|
#include <asm/ioctls.h> /* QQ; Fix this in configure */
|
|
#include <asm/termiobits.h>
|
|
#endif
|
|
#else
|
|
#ifndef __NETWARE__
|
|
#include <conio.h>
|
|
#endif /* __NETWARE__ */
|
|
#endif /* __WIN__ */
|
|
#endif /* HAVE_GETPASS */
|
|
|
|
#ifdef HAVE_GETPASSPHRASE /* For Solaris */
|
|
#define getpass(A) getpassphrase(A)
|
|
#endif
|
|
|
|
#if defined( __WIN__) || defined(__NETWARE__)
|
|
/* were just going to fake it here and get input from the keyboard */
|
|
|
|
#ifdef __NETWARE__
|
|
#undef _getch
|
|
#undef _cputs
|
|
#define _getch getcharacter
|
|
#define _cputs(A) putstring(A)
|
|
#endif
|
|
|
|
char *get_tty_password(const char *opt_message)
|
|
{
|
|
char to[80];
|
|
char *pos=to,*end=to+sizeof(to)-1;
|
|
int i=0;
|
|
DBUG_ENTER("get_tty_password");
|
|
_cputs(opt_message ? opt_message : "Enter password: ");
|
|
for (;;)
|
|
{
|
|
char tmp;
|
|
tmp=_getch();
|
|
if (tmp == '\b' || (int) tmp == 127)
|
|
{
|
|
if (pos != to)
|
|
{
|
|
_cputs("\b \b");
|
|
pos--;
|
|
continue;
|
|
}
|
|
}
|
|
if (tmp == '\n' || tmp == '\r' || tmp == 3)
|
|
break;
|
|
if (iscntrl(tmp) || pos == end)
|
|
continue;
|
|
_cputs("*");
|
|
*(pos++) = tmp;
|
|
}
|
|
while (pos != to && isspace(pos[-1]) == ' ')
|
|
pos--; /* Allow dummy space at end */
|
|
*pos=0;
|
|
_cputs("\n");
|
|
DBUG_RETURN(my_strdup(to,MYF(MY_FAE)));
|
|
}
|
|
|
|
#else
|
|
|
|
#ifndef HAVE_GETPASS
|
|
/*
|
|
Can't use fgets, because readline will get confused
|
|
length is max number of chars in to, not counting \0
|
|
to will not include the eol characters.
|
|
*/
|
|
|
|
static void get_password(char *to,uint length,int fd,bool echo)
|
|
{
|
|
char *pos=to,*end=to+length;
|
|
|
|
for (;;)
|
|
{
|
|
char tmp;
|
|
if (my_read(fd,&tmp,1,MYF(0)) != 1)
|
|
break;
|
|
if (tmp == '\b' || (int) tmp == 127)
|
|
{
|
|
if (pos != to)
|
|
{
|
|
if (echo)
|
|
{
|
|
fputs("\b \b",stdout);
|
|
fflush(stdout);
|
|
}
|
|
pos--;
|
|
continue;
|
|
}
|
|
}
|
|
if (tmp == '\n' || tmp == '\r' || tmp == 3)
|
|
break;
|
|
if (iscntrl(tmp) || pos == end)
|
|
continue;
|
|
if (echo)
|
|
{
|
|
fputc('*',stdout);
|
|
fflush(stdout);
|
|
}
|
|
*(pos++) = tmp;
|
|
}
|
|
while (pos != to && isspace(pos[-1]) == ' ')
|
|
pos--; /* Allow dummy space at end */
|
|
*pos=0;
|
|
return;
|
|
}
|
|
#endif /* ! HAVE_GETPASS */
|
|
|
|
|
|
char *get_tty_password(const char *opt_message)
|
|
{
|
|
#ifdef HAVE_GETPASS
|
|
char *passbuff;
|
|
#else /* ! HAVE_GETPASS */
|
|
TERMIO org,tmp;
|
|
#endif /* HAVE_GETPASS */
|
|
char buff[80];
|
|
|
|
DBUG_ENTER("get_tty_password");
|
|
|
|
#ifdef HAVE_GETPASS
|
|
passbuff = getpass(opt_message ? opt_message : "Enter password: ");
|
|
|
|
/* copy the password to buff and clear original (static) buffer */
|
|
strnmov(buff, passbuff, sizeof(buff) - 1);
|
|
#ifdef _PASSWORD_LEN
|
|
memset(passbuff, 0, _PASSWORD_LEN);
|
|
#endif
|
|
#else
|
|
if (isatty(fileno(stdout)))
|
|
{
|
|
fputs(opt_message ? opt_message : "Enter password: ",stdout);
|
|
fflush(stdout);
|
|
}
|
|
#if defined(HAVE_TERMIOS_H)
|
|
tcgetattr(fileno(stdin), &org);
|
|
tmp = org;
|
|
tmp.c_lflag &= ~(ECHO | ISIG | ICANON);
|
|
tmp.c_cc[VMIN] = 1;
|
|
tmp.c_cc[VTIME] = 0;
|
|
tcsetattr(fileno(stdin), TCSADRAIN, &tmp);
|
|
get_password(buff, sizeof(buff)-1, fileno(stdin), isatty(fileno(stdout)));
|
|
tcsetattr(fileno(stdin), TCSADRAIN, &org);
|
|
#elif defined(HAVE_TERMIO_H)
|
|
ioctl(fileno(stdin), (int) TCGETA, &org);
|
|
tmp=org;
|
|
tmp.c_lflag &= ~(ECHO | ISIG | ICANON);
|
|
tmp.c_cc[VMIN] = 1;
|
|
tmp.c_cc[VTIME]= 0;
|
|
ioctl(fileno(stdin),(int) TCSETA, &tmp);
|
|
get_password(buff,sizeof(buff)-1,fileno(stdin),isatty(fileno(stdout)));
|
|
ioctl(fileno(stdin),(int) TCSETA, &org);
|
|
#else
|
|
gtty(fileno(stdin), &org);
|
|
tmp=org;
|
|
tmp.sg_flags &= ~ECHO;
|
|
tmp.sg_flags |= RAW;
|
|
stty(fileno(stdin), &tmp);
|
|
get_password(buff,sizeof(buff)-1,fileno(stdin),isatty(fileno(stdout)));
|
|
stty(fileno(stdin), &org);
|
|
#endif
|
|
if (isatty(fileno(stdout)))
|
|
fputc('\n',stdout);
|
|
#endif /* HAVE_GETPASS */
|
|
|
|
DBUG_RETURN(my_strdup(buff,MYF(MY_FAE)));
|
|
}
|
|
#endif /*__WIN__*/
|