Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql

Docs/manual.texi:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged

2 files changed, 8 insertions, 1 deletions

diff --git a/mysys/mf_tempfile.c b/mysys/mf_tempfile.c
index 6204c4d0407..b2c0e89b9e4 100644
--- a/mysys/mf_tempfile.c
+++ b/mysys/mf_tempfile.c
@@ -40,7 +40,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix,
 		      myf MyFlags __attribute__((unused)))
 {
   File file= -1;
-  DBUG_ENTER("open_temp_file");
+  DBUG_ENTER("create_temp_file");
 #if defined(_MSC_VER)
   {
     char temp[FN_REFLEN],*end,*res,**old_env,*temp_env[1];
diff --git a/mysys/my_vsnprintf.c b/mysys/my_vsnprintf.c
index 030846ea63b..669b8be61b1 100644
--- a/mysys/my_vsnprintf.c
+++ b/mysys/my_vsnprintf.c
@@ -21,6 +21,13 @@
 #include <stdarg.h>
 #include <m_ctype.h>
 
+int my_snprintf(char* to, size_t n, const char* fmt, ...)
+{
+  va_list args;
+  va_start(args,fmt);
+  return my_vsnprintf(to, n, fmt, args);
+}
+
 int my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap)
 {
   char *start=to, *end=to+n-1;