MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:msvensson Date:October 8 2006 2:20pm
Subject:bk commit into 5.0 tree (msvensson:1.2287)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository

ChangeSet@stripped, 2006-10-08 16:20:16+02:00, msvensson@shellback.(none) +1 -0
  Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
  into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
  MERGE: 1.1616.2144.220

  client/mysqltest.c@stripped, 2006-10-08 16:20:12+02:00, msvensson@shellback.(none) +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-5.0-maint/RESYNC

--- 1.246/client/mysqltest.c	2006-10-08 16:20:23 +02:00
+++ 1.247/client/mysqltest.c	2006-10-08 16:20:23 +02:00
@@ -728,10 +728,12 @@
   if (fmt)
 #ifdef DBUG_ON
+#ifndef __WIN__
     char buff[256];
     vsnprintf(buff, sizeof(buff), fmt, args);
     DBUG_PRINT("error", ("%s", buff));
     fprintf(stderr, "mysqltest: ");
     if (cur_file && cur_file != file_stack)
       fprintf(stderr, "In included file \"%s\": ",
@@ -855,8 +857,10 @@
                       buff, len);
+#ifndef __WIN__
   len= vsnprintf(buff, sizeof(buff), fmt, args);
   dynstr_append_mem(&ds_warning_messages, buff, len);
   dynstr_append(&ds_warning_messages, "\n");
bk commit into 5.0 tree (msvensson:1.2287)msvensson11 Oct