Commit 86ba1306 authored by unknown's avatar unknown
Browse files

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


client/mysqltest.c:
  Auto merged
parents fe46b0ff 1d549b95
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -955,7 +955,7 @@ void log_msg(const char *fmt, ...)

  memset(buff, 0, sizeof(buff));
  va_start(args, fmt);
  len= vsnprintf(buff, sizeof(buff)-1, fmt, args);
  len= my_vsnprintf(buff, sizeof(buff)-1, fmt, args);
  va_end(args);

  dynstr_append_mem(&ds_res, buff, len);