Commit b305a27a authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

post-merge fixup

parent aa678312

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -461,3 +461,4 @@ vio/viotest-ssl 
Docs/mysql.xml

mysql-test/r/rpl000001.eval

Docs/safe-mysql.xml

mysys/test_vsnprintf

mysql-test/mysql-test-run.sh

+4 −0
Original line number Diff line number Diff line
@@ -161,6 +161,10 @@ MASTER_RUNNING=0 
MASTER_MYPORT=9306

SLAVE_RUNNING=0

SLAVE_MYPORT=9307

MYSQL_MANAGER_PORT=9305 # needs to be out of the way of slaves

MYSQL_MANAGER_PW_FILE=$MYSQL_TEST_DIR/var/tmp/manager.pwd

MYSQL_MANAGER_LOG=$MYSQL_TEST_DIR/var/log/manager.log

MYSQL_MANAGER_USER=root

NO_SLAVE=0

USER_TEST=

mysys/my_vsnprintf.c

+3 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <m_string.h>

#include <stdarg.h>

#include <m_ctype.h>

#include <assert.h>



int my_snprintf(char* to, size_t n, const char* fmt, ...)

{
@@ -53,7 +54,7 @@ int my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap) 
      plen = (uint) strlen(par);

      if (left_len <= plen)

	plen = left_len - 1;

      to=strmov(to,par);

      to=strnmov(to,par,plen);

      continue;

    }

    else if (*fmt == 'd' || *fmt == 'u')	/* Integer parameter */
@@ -73,6 +74,7 @@ int my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap) 
      break;

    *to++='%';				/* % used as % or unknown code */

  }

  DBUG_ASSERT(to <= end);

  *to='\0';				/* End of errmessage */

  return (uint) (to - start);

}