5.3 merge

client/mysql.cc

@@ -1227,7 +1227,7 @@ int main(int argc,char *argv[])
 
   put_info("Welcome to the MariaDB monitor.  Commands end with ; or \\g.",
 	   INFO_INFO);
-  sprintf((char*) glob_buffer.ptr(),
+  my_snprintf((char*) glob_buffer.ptr(), glob_buffer.alloced_length(),
 	  "Your %s connection id is %lu\nServer version: %s\n",
           mysql_get_server_name(&mysql),
 	  mysql_thread_id(&mysql), server_version_string(&mysql));