Commit 40a614ed authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/alik/MySQL/devel/5.1-tree 

into  mysql.com:/home/alik/MySQL/devel/5.1-rt
parents db98fc94 7640f512

include/m_string.h

+1 −1
Original line number Diff line number Diff line
@@ -256,6 +256,6 @@ typedef struct 
} LEX_STRING;



#define STRING_WITH_LEN(X) (X), ((uint) (sizeof(X) - 1))

#define C_STRING_WITH_SIZE(X) ((char *) (X)), ((uint) (sizeof(X) - 1))

#define C_STRING_WITH_LEN(X) ((char *) (X)), ((uint) (sizeof(X) - 1))



#endif

mysql-test/t/im_cmd_line.imtest

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
--echo



--echo --> Printing out line for 'testuser'...

--exec $IM_EXE --defaults-file="$IM_DEFAULTS_PATH" --passwd --username=testuser --password=abc | tail -1

--exec $IM_EXE --defaults-file="$IM_DEFAULTS_PATH" --print-password-line --username=testuser --password=abc | tail -1

--echo



--echo --> Listing users...
@@ -45,7 +45,7 @@ 
--echo



--echo --> Printing out line for 'testuser'...

--exec $IM_EXE --defaults-file="$IM_DEFAULTS_PATH" --passwd --username=testuser --password=xyz | tail -1

--exec $IM_EXE --defaults-file="$IM_DEFAULTS_PATH" --print-password-line --username=testuser --password=xyz | tail -1

--echo



--echo --> Listing users...

server-tools/instance-manager/commands.cc

+3 −3
Original line number Diff line number Diff line
@@ -695,7 +695,7 @@ bool Create_instance::parse_args(const char **text) 


    if (!option_value_str)

    {

      LEX_STRING empty_str= { C_STRING_WITH_SIZE("") };

      LEX_STRING empty_str= { C_STRING_WITH_LEN("") };



      if (!(option_value_str= Named_value::alloc_str(&empty_str)))

        return TRUE; /* out of memory during parsing. */
@@ -1511,7 +1511,7 @@ bool Set_option::parse_args(const char **text) 


    if (!option_value_str)

    {

      LEX_STRING empty_str= { C_STRING_WITH_SIZE("") };

      LEX_STRING empty_str= { C_STRING_WITH_LEN("") };



      if (!(option_value_str= Named_value::alloc_str(&empty_str)))

        return TRUE; /* out of memory during parsing. */
@@ -1650,7 +1650,7 @@ bool Unset_option::parse_args(const char **text) 
      return TRUE; /* out of memory during parsing. */



    {

      LEX_STRING empty_str= { C_STRING_WITH_SIZE("") };

      LEX_STRING empty_str= { C_STRING_WITH_LEN("") };



      if (!(option_value_str= Named_value::alloc_str(&empty_str)))

      {

server-tools/instance-manager/instance.cc

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 




const LEX_STRING

Instance::DFLT_INSTANCE_NAME= { C_STRING_WITH_SIZE("mysqld") };

Instance::DFLT_INSTANCE_NAME= { C_STRING_WITH_LEN("mysqld") };



static const char * const INSTANCE_NAME_PREFIX= Instance::DFLT_INSTANCE_NAME.str;

static const int INSTANCE_NAME_PREFIX_LEN= Instance::DFLT_INSTANCE_NAME.length;

server-tools/instance-manager/instance_options.cc

+3 −3
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ int Instance_options::get_default_option(char *result, size_t result_len, 
{

  int rc= 1;

  LEX_STRING verbose_option=

    { C_STRING_WITH_SIZE(" --no-defaults --verbose --help") };

    { C_STRING_WITH_LEN(" --no-defaults --verbose --help") };



  /* reserve space for the path + option + final '\0' */

  Buffer cmd(mysqld_path.length + verbose_option.length + 1);
@@ -155,7 +155,7 @@ int Instance_options::fill_instance_version() 
{

  char result[MAX_VERSION_LENGTH];

  LEX_STRING version_option=

    { C_STRING_WITH_SIZE(" --no-defaults --version") };

    { C_STRING_WITH_LEN(" --no-defaults --version") };

  int rc= 1;

  Buffer cmd(mysqld_path.length + version_option.length + 1);
@@ -210,7 +210,7 @@ int Instance_options::fill_mysqld_real_path() 
{

  char result[FN_REFLEN];

  LEX_STRING help_option=

    { C_STRING_WITH_SIZE(" --no-defaults --help") };

    { C_STRING_WITH_LEN(" --no-defaults --help") };

  int rc= 1;

  Buffer cmd(mysqld_path.length + help_option.length);