diff --git a/client/mysql.cc b/client/mysql.cc
index 22534324aca..5c0b5ce04fe 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -2858,7 +2858,7 @@ com_connect(String *buffer, char *line)
   bzero(buff, sizeof(buff));
   if (buffer)
   {
-    strmov(buff, line);
+    strxnmov(buff, sizeof(buff), line, NullS);
     tmp= get_arg(buff, 0);
     if (tmp && *tmp)
     {