diff --git a/client/mysqlshow.c b/client/mysqlshow.c
index 293edb36828bd..7cd2cef9c50fc 100644
--- a/client/mysqlshow.c
+++ b/client/mysqlshow.c
@@ -539,8 +539,7 @@ list_tables(MYSQL *mysql,const char *db,const char *table)
                 opt_table_type ? " full" : "", rows);
   }
   else
-    my_snprintf(query, sizeof(query), "show%s tables",
-                opt_table_type ? " full" : "");
+    strcpy(query, opt_table_type ? "show full tables" : "show tables");
   if (mysql_query(mysql, query) || !(result= mysql_store_result(mysql)))
   {
     fprintf(stderr,"%s: Cannot list tables in %s: %s\n",my_progname,db,
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 777aaa6e95b4a..7cd0c0cb62211 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -1595,7 +1595,7 @@ size_t print_file_stack(char *s, const char *end)
   for (;;)
   {
     err_file--;
-    s+= my_snprintf(s, end - s, "included from %s at line %d:\n",
+    s+= my_snprintf(s, end - s, "included from %s at line %u:\n",
                      err_file->file_name, err_file->lineno);
     if (err_file == file_stack)
       break;
@@ -1607,7 +1607,7 @@ size_t print_file_stack(char *s, const char *end)
 static void make_error_message(char *buf, size_t len, const char *fmt, va_list args)
 {
   char *s= buf, *end= buf + len;
-  s+= my_snprintf(s, end - s, "mysqltest: ");
+  s= strmake(s, "mysqltest: ", len-1);
   if (cur_file && cur_file != file_stack)
   {
     s+= my_snprintf(s, end - s, "In included file \"%s\": \n",
@@ -1616,12 +1616,12 @@ static void make_error_message(char *buf, size_t len, const char *fmt, va_list a
   }
   
   if (start_lineno > 0)
-    s+= my_snprintf(s, end -s, "At line %u: ", start_lineno);
+    s+= my_snprintf(s, end - s, "At line %u: ", start_lineno);
   if (!fmt)
     fmt= "unknown error";
 
   s+= my_vsnprintf(s, end - s, fmt, args);
-  s+= my_snprintf(s, end -s, "\n");
+  strmake(s, "\n", end - s - 1);
 }
 
 static void die(const char *fmt, ...)
diff --git a/sql/log_event_client.cc b/sql/log_event_client.cc
index d6a8dddfc8037..fb01169bc90cf 100644
--- a/sql/log_event_client.cc
+++ b/sql/log_event_client.cc
@@ -3284,19 +3284,19 @@ static void get_type_name(uint type, unsigned char** meta_ptr,
 {
   switch (type) {
   case MYSQL_TYPE_LONG:
-    my_snprintf(typestr, typestr_length, "%s", "INT");
+    strmake(typestr, "INT", typestr_length-1);
     break;
   case MYSQL_TYPE_TINY:
-    my_snprintf(typestr, typestr_length, "TINYINT");
+    strmake(typestr, "TINYINT", typestr_length-1);
     break;
   case MYSQL_TYPE_SHORT:
-    my_snprintf(typestr, typestr_length, "SMALLINT");
+    strmake(typestr, "SMALLINT", typestr_length-1);
     break;
   case MYSQL_TYPE_INT24:
-    my_snprintf(typestr, typestr_length, "MEDIUMINT");
+    strmake(typestr, "MEDIUMINT", typestr_length-1);
     break;
   case MYSQL_TYPE_LONGLONG:
-    my_snprintf(typestr, typestr_length, "BIGINT");
+    strmake(typestr, "BIGINT", typestr_length-1);
     break;
   case MYSQL_TYPE_NEWDECIMAL:
       my_snprintf(typestr, typestr_length, "DECIMAL(%d,%d)",
@@ -3304,11 +3304,11 @@ static void get_type_name(uint type, unsigned char** meta_ptr,
       (*meta_ptr)+= 2;
       break;
   case MYSQL_TYPE_FLOAT:
-    my_snprintf(typestr, typestr_length, "FLOAT");
+    strmake(typestr, "FLOAT", typestr_length-1);
     (*meta_ptr)++;
     break;
   case MYSQL_TYPE_DOUBLE:
-    my_snprintf(typestr, typestr_length, "DOUBLE");
+    strmake(typestr, "DOUBLE", typestr_length-1);
     (*meta_ptr)++;
     break;
   case MYSQL_TYPE_BIT:
@@ -3320,36 +3320,36 @@ static void get_type_name(uint type, unsigned char** meta_ptr,
     if (**meta_ptr != 0)
       my_snprintf(typestr, typestr_length, "TIMESTAMP(%d)", **meta_ptr);
     else
-      my_snprintf(typestr, typestr_length, "TIMESTAMP");
+      strmake(typestr, "TIMESTAMP", typestr_length-1);
     (*meta_ptr)++;
     break;
   case MYSQL_TYPE_DATETIME2:
     if (**meta_ptr != 0)
       my_snprintf(typestr, typestr_length, "DATETIME(%d)", **meta_ptr);
     else
-      my_snprintf(typestr, typestr_length, "DATETIME");
+      strmake(typestr, "DATETIME", typestr_length-1);
     (*meta_ptr)++;
     break;
   case MYSQL_TYPE_TIME2:
     if (**meta_ptr != 0)
       my_snprintf(typestr, typestr_length, "TIME(%d)", **meta_ptr);
     else
-      my_snprintf(typestr, typestr_length, "TIME");
+      strmake(typestr, "TIME", typestr_length-1);
     (*meta_ptr)++;
     break;
   case MYSQL_TYPE_NEWDATE:
   case MYSQL_TYPE_DATE:
-    my_snprintf(typestr, typestr_length, "DATE");
+    strmake(typestr, "DATE", typestr_length-1);
     break;
   case MYSQL_TYPE_YEAR:
-    my_snprintf(typestr, typestr_length, "YEAR");
+    strmake(typestr, "YEAR", typestr_length-1);
     break;
   case MYSQL_TYPE_ENUM:
-    my_snprintf(typestr, typestr_length, "ENUM");
+    strmake(typestr, "ENUM", typestr_length-1);
     (*meta_ptr)+= 2;
     break;
   case MYSQL_TYPE_SET:
-    my_snprintf(typestr, typestr_length, "SET");
+    strmake(typestr, "SET", typestr_length-1);
     (*meta_ptr)+= 2;
     break;
   case MYSQL_TYPE_BLOB:
@@ -3404,7 +3404,7 @@ static void get_type_name(uint type, unsigned char** meta_ptr,
         "MULTILINESTRING", "MULTIPOLYGON", "GEOMETRYCOLLECTION"
       };
       if (geometry_type < 8)
-        my_snprintf(typestr, typestr_length, names[geometry_type]);
+        strmake(typestr, names[geometry_type], typestr_length-1);
       else
         my_snprintf(typestr, typestr_length, "INVALID_GEOMETRY_TYPE(%u)",
                     geometry_type);
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc
index 835d910282d1d..69c1a7884e386 100644
--- a/sql/sql_admin.cc
+++ b/sql/sql_admin.cc
@@ -711,8 +711,8 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
             protocol->store(&table_name, system_charset_info);
             protocol->store(operator_name, system_charset_info);
             protocol->store(&error_clex_str, system_charset_info);
-            length= my_snprintf(buff, sizeof(buff),
-                                ER_THD(thd, ER_PARTITION_DOES_NOT_EXIST));
+            length= strmake(buff, ER_THD(thd, ER_PARTITION_DOES_NOT_EXIST),
+                            sizeof(buff)-1) - buff;
             protocol->store(buff, length, system_charset_info);
             if(protocol->write())
               goto err;
diff --git a/storage/connect/tabrest.cpp b/storage/connect/tabrest.cpp
index e75e200690560..def850b699ae0 100644
--- a/storage/connect/tabrest.cpp
+++ b/storage/connect/tabrest.cpp
@@ -66,7 +66,7 @@ int Xcurl(PGLOBAL g, PCSZ Http, PCSZ Uri, PCSZ filename)
 			my_snprintf(buf, sizeof(buf)-1, "%s/%s", Http, Uri);
 
 	} else
-		my_snprintf(buf, sizeof(buf)-1, "%s", Http);
+		strmake(buf, Http, sizeof(buf)-2);
 
 #if defined(_WIN32)
 	char cmd[1024];
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index c2f0406f3fc80..7890e4c55b51d 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -17475,7 +17475,7 @@ static my_bool query_str_variable(MYSQL *con,
   is_null= row[0] == NULL;
 
   if (!is_null)
-    my_snprintf(str, len, "%s", row[0]);
+    strmake(str, row[0], len-1);
 
   mysql_free_result(rs);