Polishing: C_STRING_WITH_SIZE() was renamed to C_STRING_WITH_LEN().

include/m_string.h

@@ -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

server-tools/instance-manager/commands.cc

@@ -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

@@ -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

@@ -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);
 

server-tools/instance-manager/priv.cc

@@ -43,7 +43,7 @@ bool linuxthreads;
   The following string must be less then 80 characters, as
   mysql_connection.cc relies on it
 */
-const LEX_STRING mysqlmanager_version= { C_STRING_WITH_SIZE("1.0-beta") };
+const LEX_STRING mysqlmanager_version= { C_STRING_WITH_LEN("1.0-beta") };
 
 const unsigned char protocol_version= PROTOCOL_VERSION;