mirror of
https://github.com/MariaDB/server.git
synced 2025-11-10 23:02:54 +03:00
- 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.
356 lines
10 KiB
C++
356 lines
10 KiB
C++
/* Copyright (C) 2000 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; 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 */
|
|
|
|
/* This file is originally from the mysql distribution. Coded by monty */
|
|
|
|
#ifdef USE_PRAGMA_INTERFACE
|
|
#pragma interface /* gcc class implementation */
|
|
#endif
|
|
|
|
#ifndef NOT_FIXED_DEC
|
|
#define NOT_FIXED_DEC 31
|
|
#endif
|
|
|
|
class String;
|
|
int sortcmp(const String *a,const String *b, CHARSET_INFO *cs);
|
|
String *copy_if_not_alloced(String *a,String *b,uint32 arg_length);
|
|
uint32 copy_and_convert(char *to, uint32 to_length, CHARSET_INFO *to_cs,
|
|
const char *from, uint32 from_length,
|
|
CHARSET_INFO *from_cs, uint *errors);
|
|
|
|
class String
|
|
{
|
|
char *Ptr;
|
|
uint32 str_length,Alloced_length;
|
|
bool alloced;
|
|
CHARSET_INFO *str_charset;
|
|
public:
|
|
String()
|
|
{
|
|
Ptr=0; str_length=Alloced_length=0; alloced=0;
|
|
str_charset= &my_charset_bin;
|
|
}
|
|
String(uint32 length_arg)
|
|
{
|
|
alloced=0; Alloced_length=0; (void) real_alloc(length_arg);
|
|
str_charset= &my_charset_bin;
|
|
}
|
|
String(const char *str, CHARSET_INFO *cs)
|
|
{
|
|
Ptr=(char*) str; str_length=(uint) strlen(str); Alloced_length=0; alloced=0;
|
|
str_charset=cs;
|
|
}
|
|
String(const char *str,uint32 len, CHARSET_INFO *cs)
|
|
{
|
|
Ptr=(char*) str; str_length=len; Alloced_length=0; alloced=0;
|
|
str_charset=cs;
|
|
}
|
|
String(char *str,uint32 len, CHARSET_INFO *cs)
|
|
{
|
|
Ptr=(char*) str; Alloced_length=str_length=len; alloced=0;
|
|
str_charset=cs;
|
|
}
|
|
String(const String &str)
|
|
{
|
|
Ptr=str.Ptr ; str_length=str.str_length ;
|
|
Alloced_length=str.Alloced_length; alloced=0;
|
|
str_charset=str.str_charset;
|
|
}
|
|
static void *operator new(size_t size, MEM_ROOT *mem_root)
|
|
{ return (void*) alloc_root(mem_root, (uint) size); }
|
|
static void operator delete(void *ptr_arg,size_t size)
|
|
{ TRASH(ptr_arg, size); }
|
|
static void operator delete(void *ptr_arg, MEM_ROOT *mem_root)
|
|
{ /* never called */ }
|
|
~String() { free(); }
|
|
|
|
inline void set_charset(CHARSET_INFO *charset) { str_charset= charset; }
|
|
inline CHARSET_INFO *charset() const { return str_charset; }
|
|
inline uint32 length() const { return str_length;}
|
|
inline uint32 alloced_length() const { return Alloced_length;}
|
|
inline char& operator [] (uint32 i) const { return Ptr[i]; }
|
|
inline void length(uint32 len) { str_length=len ; }
|
|
inline bool is_empty() { return (str_length == 0); }
|
|
inline void mark_as_const() { Alloced_length= 0;}
|
|
inline const char *ptr() const { return Ptr; }
|
|
inline char *c_ptr()
|
|
{
|
|
if (!Ptr || Ptr[str_length]) /* Should be safe */
|
|
(void) realloc(str_length);
|
|
return Ptr;
|
|
}
|
|
inline char *c_ptr_quick()
|
|
{
|
|
if (Ptr && str_length < Alloced_length)
|
|
Ptr[str_length]=0;
|
|
return Ptr;
|
|
}
|
|
inline char *c_ptr_safe()
|
|
{
|
|
if (Ptr && str_length < Alloced_length)
|
|
Ptr[str_length]=0;
|
|
else
|
|
(void) realloc(str_length);
|
|
return Ptr;
|
|
}
|
|
|
|
void set(String &str,uint32 offset,uint32 arg_length)
|
|
{
|
|
DBUG_ASSERT(&str != this);
|
|
free();
|
|
Ptr=(char*) str.ptr()+offset; str_length=arg_length; alloced=0;
|
|
if (str.Alloced_length)
|
|
Alloced_length=str.Alloced_length-offset;
|
|
else
|
|
Alloced_length=0;
|
|
str_charset=str.str_charset;
|
|
}
|
|
inline void set(char *str,uint32 arg_length, CHARSET_INFO *cs)
|
|
{
|
|
free();
|
|
Ptr=(char*) str; str_length=Alloced_length=arg_length ; alloced=0;
|
|
str_charset=cs;
|
|
}
|
|
inline void set(const char *str,uint32 arg_length, CHARSET_INFO *cs)
|
|
{
|
|
free();
|
|
Ptr=(char*) str; str_length=arg_length; Alloced_length=0 ; alloced=0;
|
|
str_charset=cs;
|
|
}
|
|
bool set_ascii(const char *str, uint32 arg_length);
|
|
inline void set_quick(char *str,uint32 arg_length, CHARSET_INFO *cs)
|
|
{
|
|
if (!alloced)
|
|
{
|
|
Ptr=(char*) str; str_length=Alloced_length=arg_length;
|
|
}
|
|
str_charset=cs;
|
|
}
|
|
bool set(longlong num, CHARSET_INFO *cs);
|
|
bool set(ulonglong num, CHARSET_INFO *cs);
|
|
bool set(double num,uint decimals, CHARSET_INFO *cs);
|
|
|
|
/*
|
|
PMG 2004.11.12
|
|
This is a method that works the same as perl's "chop". It simply
|
|
drops the last character of a string. This is useful in the case
|
|
of the federated storage handler where I'm building a unknown
|
|
number, list of values and fields to be used in a sql insert
|
|
statement to be run on the remote server, and have a comma after each.
|
|
When the list is complete, I "chop" off the trailing comma
|
|
|
|
ex.
|
|
String stringobj;
|
|
stringobj.append("VALUES ('foo', 'fi', 'fo',");
|
|
stringobj.chop();
|
|
stringobj.append(")");
|
|
|
|
In this case, the value of string was:
|
|
|
|
VALUES ('foo', 'fi', 'fo',
|
|
VALUES ('foo', 'fi', 'fo'
|
|
VALUES ('foo', 'fi', 'fo')
|
|
|
|
*/
|
|
inline void chop()
|
|
{
|
|
Ptr[str_length--]= '\0';
|
|
}
|
|
|
|
inline void free()
|
|
{
|
|
if (alloced)
|
|
{
|
|
alloced=0;
|
|
Alloced_length=0;
|
|
my_free(Ptr,MYF(0));
|
|
Ptr=0;
|
|
str_length=0; /* Safety */
|
|
}
|
|
}
|
|
inline bool alloc(uint32 arg_length)
|
|
{
|
|
if (arg_length < Alloced_length)
|
|
return 0;
|
|
return real_alloc(arg_length);
|
|
}
|
|
bool real_alloc(uint32 arg_length); // Empties old string
|
|
bool realloc(uint32 arg_length);
|
|
inline void shrink(uint32 arg_length) // Shrink buffer
|
|
{
|
|
if (arg_length < Alloced_length)
|
|
{
|
|
char *new_ptr;
|
|
if (!(new_ptr=(char*) my_realloc(Ptr,arg_length,MYF(0))))
|
|
{
|
|
Alloced_length = 0;
|
|
real_alloc(arg_length);
|
|
}
|
|
else
|
|
{
|
|
Ptr=new_ptr;
|
|
Alloced_length=arg_length;
|
|
}
|
|
}
|
|
}
|
|
bool is_alloced() { return alloced; }
|
|
inline String& operator = (const String &s)
|
|
{
|
|
if (&s != this)
|
|
{
|
|
/*
|
|
It is forbidden to do assignments like
|
|
some_string = substring_of_that_string
|
|
*/
|
|
DBUG_ASSERT(!s.uses_buffer_owned_by(this));
|
|
free();
|
|
Ptr=s.Ptr ; str_length=s.str_length ; Alloced_length=s.Alloced_length;
|
|
alloced=0;
|
|
}
|
|
return *this;
|
|
}
|
|
|
|
bool copy(); // Alloc string if not alloced
|
|
bool copy(const String &s); // Allocate new string
|
|
bool copy(const char *s,uint32 arg_length, CHARSET_INFO *cs); // Allocate new string
|
|
static bool needs_conversion(uint32 arg_length,
|
|
CHARSET_INFO *cs_from, CHARSET_INFO *cs_to,
|
|
uint32 *offset);
|
|
bool copy_aligned(const char *s, uint32 arg_length, uint32 offset,
|
|
CHARSET_INFO *cs);
|
|
bool set_or_copy_aligned(const char *s, uint32 arg_length, CHARSET_INFO *cs);
|
|
bool copy(const char*s,uint32 arg_length, CHARSET_INFO *csfrom,
|
|
CHARSET_INFO *csto, uint *errors);
|
|
bool append(const String &s);
|
|
bool append(const char *s);
|
|
bool append(const char *s,uint32 arg_length);
|
|
bool append(const char *s,uint32 arg_length, CHARSET_INFO *cs);
|
|
bool append(IO_CACHE* file, uint32 arg_length);
|
|
bool append_with_prefill(const char *s, uint32 arg_length,
|
|
uint32 full_length, char fill_char);
|
|
int strstr(const String &search,uint32 offset=0); // Returns offset to substring or -1
|
|
int strrstr(const String &search,uint32 offset=0); // Returns offset to substring or -1
|
|
bool replace(uint32 offset,uint32 arg_length,const char *to,uint32 length);
|
|
bool replace(uint32 offset,uint32 arg_length,const String &to);
|
|
inline bool append(char chr)
|
|
{
|
|
if (str_length < Alloced_length)
|
|
{
|
|
Ptr[str_length++]=chr;
|
|
}
|
|
else
|
|
{
|
|
if (realloc(str_length+1))
|
|
return 1;
|
|
Ptr[str_length++]=chr;
|
|
}
|
|
return 0;
|
|
}
|
|
bool fill(uint32 max_length,char fill);
|
|
void strip_sp();
|
|
friend int sortcmp(const String *a,const String *b, CHARSET_INFO *cs);
|
|
friend int stringcmp(const String *a,const String *b);
|
|
friend String *copy_if_not_alloced(String *a,String *b,uint32 arg_length);
|
|
uint32 numchars();
|
|
int charpos(int i,uint32 offset=0);
|
|
|
|
int reserve(uint32 space_needed)
|
|
{
|
|
return realloc(str_length + space_needed);
|
|
}
|
|
int reserve(uint32 space_needed, uint32 grow_by);
|
|
|
|
/*
|
|
The following append operations do NOT check alloced memory
|
|
q_*** methods writes values of parameters itself
|
|
qs_*** methods writes string representation of value
|
|
*/
|
|
void q_append(const char c)
|
|
{
|
|
Ptr[str_length++] = c;
|
|
}
|
|
void q_append(const uint32 n)
|
|
{
|
|
int4store(Ptr + str_length, n);
|
|
str_length += 4;
|
|
}
|
|
void q_append(double d)
|
|
{
|
|
float8store(Ptr + str_length, d);
|
|
str_length += 8;
|
|
}
|
|
void q_append(double *d)
|
|
{
|
|
float8store(Ptr + str_length, *d);
|
|
str_length += 8;
|
|
}
|
|
void q_append(const char *data, uint32 data_len)
|
|
{
|
|
memcpy(Ptr + str_length, data, data_len);
|
|
str_length += data_len;
|
|
}
|
|
|
|
void write_at_position(int position, uint32 value)
|
|
{
|
|
int4store(Ptr + position,value);
|
|
}
|
|
|
|
void qs_append(const char *str, uint32 len);
|
|
void qs_append(double d);
|
|
void qs_append(double *d);
|
|
inline void qs_append(const char c)
|
|
{
|
|
Ptr[str_length]= c;
|
|
str_length++;
|
|
}
|
|
void qs_append(int i);
|
|
void qs_append(uint i);
|
|
|
|
/* Inline (general) functions used by the protocol functions */
|
|
|
|
inline char *prep_append(uint32 arg_length, uint32 step_alloc)
|
|
{
|
|
uint32 new_length= arg_length + str_length;
|
|
if (new_length > Alloced_length)
|
|
{
|
|
if (realloc(new_length + step_alloc))
|
|
return 0;
|
|
}
|
|
uint32 old_length= str_length;
|
|
str_length+= arg_length;
|
|
return Ptr+ old_length; /* Area to use */
|
|
}
|
|
|
|
inline bool append(const char *s, uint32 arg_length, uint32 step_alloc)
|
|
{
|
|
uint32 new_length= arg_length + str_length;
|
|
if (new_length > Alloced_length && realloc(new_length + step_alloc))
|
|
return TRUE;
|
|
memcpy(Ptr+str_length, s, arg_length);
|
|
str_length+= arg_length;
|
|
return FALSE;
|
|
}
|
|
void print(String *print);
|
|
|
|
/* Swap two string objects. Efficient way to exchange data without memcpy. */
|
|
void swap(String &s);
|
|
|
|
inline bool uses_buffer_owned_by(const String *s) const
|
|
{
|
|
return (s->alloced && Ptr >= s->Ptr && Ptr < s->Ptr + s->str_length);
|
|
}
|
|
};
|