mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 06:44:16 +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.
214 lines
6.4 KiB
C++
214 lines
6.4 KiB
C++
/* 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
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
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 */
|
|
|
|
#include "protocol.h"
|
|
|
|
#include "messages.h"
|
|
|
|
#include <mysql_com.h>
|
|
#include <m_string.h>
|
|
|
|
|
|
static char eof_buff[1]= { (char) 254 }; /* Marker for end of fields */
|
|
static const char ERROR_PACKET_CODE= (char) 255;
|
|
|
|
|
|
int net_send_ok(struct st_net *net, unsigned long connection_id,
|
|
const char *message)
|
|
{
|
|
/*
|
|
The format of a packet
|
|
1 packet type code
|
|
1-9 affected rows count
|
|
1-9 connection id
|
|
2 thread return status
|
|
2 warning count
|
|
1-9 + message length message to send (isn't stored if no message)
|
|
*/
|
|
Buffer buff;
|
|
char *pos= buff.buffer;
|
|
|
|
/* check that we have space to hold mandatory fields */
|
|
buff.reserve(0, 23);
|
|
|
|
enum { OK_PACKET_CODE= 0 };
|
|
*pos++= OK_PACKET_CODE;
|
|
pos= net_store_length(pos, (ulonglong) 0);
|
|
pos= net_store_length(pos, (ulonglong) connection_id);
|
|
int2store(pos, *net->return_status);
|
|
pos+= 2;
|
|
/* We don't support warnings, so store 0 for total warning count */
|
|
int2store(pos, 0);
|
|
pos+= 2;
|
|
|
|
uint position= pos - buff.buffer; /* we might need it for message */
|
|
|
|
if (message != NULL)
|
|
{
|
|
buff.reserve(position, 9 + strlen(message));
|
|
store_to_protocol_packet(&buff, message, &position);
|
|
}
|
|
|
|
return my_net_write(net, buff.buffer, position) || net_flush(net);
|
|
}
|
|
|
|
|
|
int net_send_error(struct st_net *net, uint sql_errno)
|
|
{
|
|
const char *err= message(sql_errno);
|
|
char buff[1 + // packet type code
|
|
2 + // sql error number
|
|
1 + SQLSTATE_LENGTH + // sql state
|
|
MYSQL_ERRMSG_SIZE]; // message
|
|
char *pos= buff;
|
|
|
|
*pos++= ERROR_PACKET_CODE;
|
|
int2store(pos, sql_errno);
|
|
pos+= 2;
|
|
/* The first # is to make the protocol backward compatible */
|
|
*pos++= '#';
|
|
memcpy(pos, errno_to_sqlstate(sql_errno), SQLSTATE_LENGTH);
|
|
pos+= SQLSTATE_LENGTH;
|
|
pos= strmake(pos, err, MYSQL_ERRMSG_SIZE - 1) + 1;
|
|
return my_net_write(net, buff, pos - buff) || net_flush(net);
|
|
}
|
|
|
|
|
|
int net_send_error_323(struct st_net *net, uint sql_errno)
|
|
{
|
|
const char *err= message(sql_errno);
|
|
char buff[1 + // packet type code
|
|
2 + // sql error number
|
|
MYSQL_ERRMSG_SIZE]; // message
|
|
char *pos= buff;
|
|
|
|
*pos++= ERROR_PACKET_CODE;
|
|
int2store(pos, sql_errno);
|
|
pos+= 2;
|
|
pos= strmake(pos, err, MYSQL_ERRMSG_SIZE - 1) + 1;
|
|
return my_net_write(net, buff, pos - buff) || net_flush(net);
|
|
}
|
|
|
|
char *net_store_length(char *pkg, uint length)
|
|
{
|
|
uchar *packet=(uchar*) pkg;
|
|
if (length < 251)
|
|
{
|
|
*packet=(uchar) length;
|
|
return (char*) packet+1;
|
|
}
|
|
*packet++=252;
|
|
int2store(packet,(uint) length);
|
|
return (char*) packet+2;
|
|
}
|
|
|
|
|
|
int store_to_protocol_packet(Buffer *buf, const char *string, uint *position,
|
|
uint string_len)
|
|
{
|
|
uint currpos;
|
|
|
|
/* reserve max amount of bytes needed to store length */
|
|
if (buf->reserve(*position, 9))
|
|
goto err;
|
|
currpos= (net_store_length(buf->buffer + *position,
|
|
(ulonglong) string_len) - buf->buffer);
|
|
if (buf->append(currpos, string, string_len))
|
|
goto err;
|
|
*position= *position + string_len + (currpos - *position);
|
|
|
|
return 0;
|
|
err:
|
|
return 1;
|
|
}
|
|
|
|
|
|
int store_to_protocol_packet(Buffer *buf, const char *string, uint *position)
|
|
{
|
|
uint string_len;
|
|
|
|
string_len= strlen(string);
|
|
return store_to_protocol_packet(buf, string, position, string_len);
|
|
}
|
|
|
|
|
|
int send_eof(struct st_net *net)
|
|
{
|
|
uchar buff[1 + /* eof packet code */
|
|
2 + /* warning count */
|
|
2]; /* server status */
|
|
|
|
buff[0]=254;
|
|
int2store(buff+1, 0);
|
|
int2store(buff+3, 0);
|
|
return my_net_write(net, (char*) buff, sizeof buff);
|
|
}
|
|
|
|
int send_fields(struct st_net *net, LIST *fields)
|
|
{
|
|
LIST *tmp= fields;
|
|
Buffer send_buff;
|
|
char small_buff[4];
|
|
uint position= 0;
|
|
LEX_STRING *field;
|
|
|
|
/* send the number of fileds */
|
|
net_store_length(small_buff, (uint) list_length(fields));
|
|
if (my_net_write(net, small_buff, (uint) 1))
|
|
goto err;
|
|
|
|
while (tmp)
|
|
{
|
|
position= 0;
|
|
field= (LEX_STRING *) tmp->data;
|
|
|
|
store_to_protocol_packet(&send_buff,
|
|
(char*) "", &position); /* catalog name */
|
|
store_to_protocol_packet(&send_buff,
|
|
(char*) "", &position); /* db name */
|
|
store_to_protocol_packet(&send_buff,
|
|
(char*) "", &position); /* table name */
|
|
store_to_protocol_packet(&send_buff,
|
|
(char*) "", &position); /* table name alias */
|
|
store_to_protocol_packet(&send_buff,
|
|
field->str, &position); /* column name */
|
|
store_to_protocol_packet(&send_buff,
|
|
field->str, &position); /* column name alias */
|
|
send_buff.reserve(position, 12);
|
|
if (send_buff.is_error())
|
|
goto err;
|
|
send_buff.buffer[position++]= 12;
|
|
int2store(send_buff.buffer + position, 1); /* charsetnr */
|
|
int4store(send_buff.buffer + position + 2,
|
|
field->length); /* field length */
|
|
send_buff.buffer[position+6]= (char) FIELD_TYPE_STRING; /* type */
|
|
int2store(send_buff.buffer + position + 7, 0); /* flags */
|
|
send_buff.buffer[position + 9]= (char) 0; /* decimals */
|
|
send_buff.buffer[position + 10]= 0;
|
|
send_buff.buffer[position + 11]= 0;
|
|
position+= 12;
|
|
if (my_net_write(net, send_buff.buffer, (uint) position+1))
|
|
goto err;
|
|
tmp= list_rest(tmp);
|
|
}
|
|
|
|
if (my_net_write(net, eof_buff, 1))
|
|
goto err;
|
|
return 0;
|
|
|
|
err:
|
|
return 1;
|
|
}
|