Remove unneeded strlen() calls.

client/mysqltest.cc

@@ -1732,7 +1732,7 @@ void log_msg(const char *fmt, ...)
   va_end(args);
 
   dynstr_append_mem(&ds_res, buff, len);
-  dynstr_append(&ds_res, "\n");
+  dynstr_append_mem(&ds_res, STRING_WITH_LEN("\n"));
 
   DBUG_VOID_RETURN;
 }
@@ -1868,7 +1868,7 @@ static int run_tool(const char *tool_path, DYNAMIC_STRING *ds_res, ...)
     die("Out of memory");
 
   dynstr_append_os_quoted(&ds_cmdline, tool_path, NullS);
-  dynstr_append(&ds_cmdline, " ");
+  dynstr_append_mem(&ds_cmdline, STRING_WITH_LEN(" "));
 
   va_start(args, ds_res);
 
@@ -1879,13 +1879,13 @@ static int run_tool(const char *tool_path, DYNAMIC_STRING *ds_res, ...)
       dynstr_append_os_quoted(&ds_cmdline, arg, NullS);
     else
       dynstr_append(&ds_cmdline, arg);
-    dynstr_append(&ds_cmdline, " ");
+    dynstr_append_mem(&ds_cmdline, STRING_WITH_LEN(" "));
   }
 
   va_end(args);
 
 #ifdef _WIN32
-  dynstr_append(&ds_cmdline, "\"");
+  dynstr_append_mem(&ds_cmdline, STRING_WITH_LEN("\""));
 #endif
 
   DBUG_PRINT("info", ("Running: %s", ds_cmdline.str));
@@ -2020,8 +2020,8 @@ void show_diff(DYNAMIC_STRING* ds,
       Fallback to dump both files to result file and inform
       about installing "diff"
     */
-	dynstr_append(&ds_tmp, "\n");
-    dynstr_append(&ds_tmp,
+    char message[]=
+"\n"
 "\n"
 "The two files differ but it was not possible to execute 'diff' in\n"
 "order to show only the difference. Instead the whole content of the\n"
@@ -2031,17 +2031,18 @@ void show_diff(DYNAMIC_STRING* ds,
 #ifdef _WIN32
 "or http://gnuwin32.sourceforge.net/packages/diffutils.htm\n"
 #endif
-"\n");
+"\n";
+    dynstr_append_mem(&ds_tmp, message, sizeof(message));
 
-    dynstr_append(&ds_tmp, " --- ");
+    dynstr_append_mem(&ds_tmp, STRING_WITH_LEN(" --- "));
     dynstr_append(&ds_tmp, filename1);
-    dynstr_append(&ds_tmp, " >>>\n");
+    dynstr_append_mem(&ds_tmp, STRING_WITH_LEN(" >>>\n"));
     cat_file(&ds_tmp, filename1);
-    dynstr_append(&ds_tmp, "<<<\n --- ");
+    dynstr_append_mem(&ds_tmp, STRING_WITH_LEN("<<<\n --- "));
     dynstr_append(&ds_tmp, filename1);
-    dynstr_append(&ds_tmp, " >>>\n");
+    dynstr_append_mem(&ds_tmp, STRING_WITH_LEN(" >>>\n"));
     cat_file(&ds_tmp, filename2);
-    dynstr_append(&ds_tmp, "<<<<\n");
+    dynstr_append_mem(&ds_tmp, STRING_WITH_LEN("<<<<\n"));
   }
 
   if (ds)
@@ -2821,9 +2822,9 @@ do_result_format_version(struct st_command *command)
 
   set_result_format_version(version);
 
-  dynstr_append(&ds_res, "result_format: ");
+  dynstr_append_mem(&ds_res, STRING_WITH_LEN("result_format: "));
   dynstr_append_mem(&ds_res, ds_version.str, ds_version.length);
-  dynstr_append(&ds_res, "\n");
+  dynstr_append_mem(&ds_res, STRING_WITH_LEN("\n"));
   dynstr_free(&ds_version);
 }
 
@@ -3374,7 +3375,7 @@ void do_exec(struct st_command *command)
   if (disable_result_log)
   {
     /* Collect stderr output as well, for the case app. crashes or returns error.*/
-    dynstr_append(&ds_cmd, " 2>&1");
+    dynstr_append_mem(&ds_cmd, STRING_WITH_LEN(" 2>&1"));
   }
 
   DBUG_PRINT("info", ("Executing '%s' as '%s'",
@@ -3576,9 +3577,9 @@ void do_system(struct st_command *command)
     else
     {
       /* If ! abort_on_error, log message and continue */
-      dynstr_append(&ds_res, "system command '");
+      dynstr_append_mem(&ds_res, STRING_WITH_LEN("system command '"));
       replace_dynstr_append(&ds_res, command->first_argument);
-      dynstr_append(&ds_res, "' failed\n");
+      dynstr_append_mem(&ds_res, STRING_WITH_LEN("' failed\n"));
     }
   }
 
@@ -4045,7 +4046,7 @@ static int get_list_files(DYNAMIC_STRING *ds, const DYNAMIC_STRING *ds_dirname,
         wild_compare(file->name, ds_wild->str, 0))
       continue;
     replace_dynstr_append(ds, file->name);
-    dynstr_append(ds, "\n");
+    dynstr_append_mem(ds, STRING_WITH_LEN("\n"));
   }
   set_wild_chars(0);
   my_dirend(dir_info);
@@ -7732,9 +7733,10 @@ void append_metadata(DYNAMIC_STRING *ds,
                      uint num_fields)
 {
   MYSQL_FIELD *field_end;
-  dynstr_append(ds,"Catalog\tDatabase\tTable\tTable_alias\tColumn\t"
-                "Column_alias\tType\tLength\tMax length\tIs_null\t"
-                "Flags\tDecimals\tCharsetnr\n");
+  dynstr_append_mem(ds, STRING_WITH_LEN(
+                    "Catalog\tDatabase\tTable\tTable_alias\tColumn\t"
+                    "Column_alias\tType\tLength\tMax length\tIs_null\t"
+                    "Flags\tDecimals\tCharsetnr\n"));
 
   for (field_end= field+num_fields ;
        field < field_end ;
@@ -7797,31 +7799,31 @@ void append_info(DYNAMIC_STRING *ds, ulonglong affected_rows,
   dynstr_append(ds, buf);
   if (info)
   {
-    dynstr_append(ds, "info: ");
+    dynstr_append_mem(ds, STRING_WITH_LEN("info: "));
     dynstr_append(ds, info);
-    dynstr_append_mem(ds, "\n", 1);
+    dynstr_append_mem(ds, STRING_WITH_LEN("\n"));
   }
 }
 
 
 #ifndef EMBEDDED_LIBRARY
-static const char *trking_info_desc[SESSION_TRACK_END + 1]=
-{
-  "Tracker : SESSION_TRACK_SYSTEM_VARIABLES\n",
-  "Tracker : SESSION_TRACK_SCHEMA\n",
-  "Tracker : SESSION_TRACK_STATE_CHANGE\n",
-  "Tracker : SESSION_TRACK_GTIDS\n",
-  "Tracker : SESSION_TRACK_TRANSACTION_CHARACTERISTICS\n",
-  "Tracker : SESSION_TRACK_TRANSACTION_TYPE\n"
+static const LEX_CSTRING trking_info_desc[SESSION_TRACK_END + 1]=
+{
+  {STRING_WITH_LEN("Tracker : SESSION_TRACK_SYSTEM_VARIABLES\n")},
+  {STRING_WITH_LEN("Tracker : SESSION_TRACK_SCHEMA\n")},
+  {STRING_WITH_LEN("Tracker : SESSION_TRACK_STATE_CHANGE\n")},
+  {STRING_WITH_LEN("Tracker : SESSION_TRACK_GTIDS\n")},
+  {STRING_WITH_LEN("Tracker : SESSION_TRACK_TRANSACTION_CHARACTERISTICS\n")},
+  {STRING_WITH_LEN("Tracker : SESSION_TRACK_TRANSACTION_TYPE\n")}
 #ifdef USER_VAR_TRACKING
   ,
-  "Tracker : SESSION_TRACK_MYSQL_RESERVED1\n",
-  "Tracker : SESSION_TRACK_MYSQL_RESERVED2\n",
-  "Tracker : SESSION_TRACK_MYSQL_RESERVED3\n",
-  "Tracker : SESSION_TRACK_MYSQL_RESERVED4\n",
-  "Tracker : SESSION_TRACK_MYSQL_RESERVED5\n",
-  "Tracker : SESSION_TRACK_MYSQL_RESERVED6\n",
-  "Tracker : SESSION_TRACK_USER_VARIABLES\n"
+  {STRING_WITH_LEN("Tracker : SESSION_TRACK_MYSQL_RESERVED1\n")},
+  {STRING_WITH_LEN("Tracker : SESSION_TRACK_MYSQL_RESERVED2\n")},
+  {STRING_WITH_LEN("Tracker : SESSION_TRACK_MYSQL_RESERVED3\n")},
+  {STRING_WITH_LEN("Tracker : SESSION_TRACK_MYSQL_RESERVED4\n")},
+  {STRING_WITH_LEN("Tracker : SESSION_TRACK_MYSQL_RESERVED5\n")},
+  {STRING_WITH_LEN("Tracker : SESSION_TRACK_MYSQL_RESERVED6\n")},
+  {STRING_WITH_LEN("Tracker : SESSION_TRACK_USER_VARIABLES\n")}
 #endif // USER_VAR_TRACKING
 };
 #endif // EMBEDDED_LIBRARY
@@ -7845,18 +7847,19 @@ static void append_session_track_info(DYNAMIC_STRING *ds, MYSQL *mysql)
                                        (enum_session_state_type) type,
                                        &data, &data_length))
     {
-      dynstr_append(ds, "-- ");
+      dynstr_append_mem(ds, STRING_WITH_LEN("-- "));
       if (type <= SESSION_TRACK_END)
       {
-        dynstr_append(ds, trking_info_desc[type]);
+        dynstr_append_mem(ds, trking_info_desc[type].str,
+                          trking_info_desc[type].length);
       }
       else
       {
         DBUG_ASSERT(0);
-        dynstr_append(ds, "Tracker???\n");
+        dynstr_append_mem(ds, STRING_WITH_LEN("Tracker???\n"));
       }
 
-      dynstr_append(ds, "-- ");
+      dynstr_append_mem(ds, STRING_WITH_LEN("-- "));
       dynstr_append_mem(ds, data, data_length);
     }
     else
@@ -7865,16 +7868,16 @@ static void append_session_track_info(DYNAMIC_STRING *ds, MYSQL *mysql)
                                         (enum_session_state_type) type,
                                         &data, &data_length))
     {
-      dynstr_append(ds, "\n-- ");
+      dynstr_append_mem(ds, STRING_WITH_LEN("\n-- "));
       if (data == NULL)
       {
         DBUG_ASSERT(data_length == 0);
-        dynstr_append_mem(ds, "<NULL>", sizeof("<NULL>") - 1);
+        dynstr_append_mem(ds, STRING_WITH_LEN("<NULL>"));
       }
       else
         dynstr_append_mem(ds, data, data_length);
     }
-    dynstr_append(ds, "\n\n");
+    dynstr_append_mem(ds, STRING_WITH_LEN("\n\n"));
   }
 #endif /* EMBEDDED_LIBRARY */
 }
@@ -8274,7 +8277,8 @@ void handle_error(struct st_command *command,
       else if (command->expected_errors.err[0].type == ERR_SQLSTATE ||
                (command->expected_errors.err[0].type == ERR_ERRNO &&
                 command->expected_errors.err[0].code.errnum != 0))
-        dynstr_append(ds,"Got one of the listed errors\n");
+        dynstr_append_mem(ds, STRING_WITH_LEN("Got one of the listed "
+                                              "errors\n"));
     }
     /* OK */
     revert_properties();
@@ -10372,7 +10376,7 @@ int main(int argc, char **argv)
         if (p && *p == '#' && *(p+1) == '#')
         {
           dynstr_append_mem(&ds_res, command->query, command->query_len);
-          dynstr_append(&ds_res, "\n");
+          dynstr_append_mem(&ds_res, STRING_WITH_LEN("\n"));
         }
 	break;
       }
@@ -10385,7 +10389,7 @@ int main(int argc, char **argv)
         if (disable_query_log)
           break;
 
-        dynstr_append(&ds_res, "\n");
+        dynstr_append_mem(&ds_res, STRING_WITH_LEN("\n"));
         break;
       case Q_PING:
         handle_command_error(command, mysql_ping(cur_con->mysql), -1);
@@ -12048,7 +12052,7 @@ void dynstr_append_sorted(DYNAMIC_STRING* ds, DYNAMIC_STRING *ds_input,
   {
     const char **line= dynamic_element(&lines, i, const char**);
     dynstr_append(ds, *line);
-    dynstr_append(ds, "\n");
+    dynstr_append_mem(ds, STRING_WITH_LEN("\n"));
   }
 
   delete_dynamic(&lines);