bzr commit into mysql-5.1 branch (msvensson:2647)

[Magnus Svensson]

#At file:///home/msvensson/mysql/5.1-rpl/

 2647 Magnus Svensson	2008-08-09
      Fix warnings in mysqltest
modified:
  client/mysqltest.cc

=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2008-08-08 18:10:43 +0000
+++ b/client/mysqltest.cc	2008-08-09 08:52:50 +0000
@@ -546,8 +546,8 @@ public:
     DBUG_ASSERT(ds->str);
 
     if (fwrite(ds->str, 1, ds->length, m_file) != ds->length)
-      die("Failed to write %d bytes to '%s', errno: %d",
-          ds->length, m_file_name, errno);
+      die("Failed to write %lu bytes to '%s', errno: %d",
+          (unsigned long)ds->length, m_file_name, errno);
     m_bytes_written+= ds->length;
     DBUG_VOID_RETURN;
   }
@@ -585,7 +585,8 @@ public:
         DBUG_VOID_RETURN;
       }
 
-      DBUG_PRINT("info", ("Read %d bytes from file, buf: %s", bytes, buf));
+      DBUG_PRINT("info", ("Read %lu bytes from file, buf: %s",
+                          (unsigned long)bytes, buf));
 
       char* show_from= buf + bytes;
       while(show_from > buf && lines > 0 )
@@ -2291,7 +2292,7 @@ void eval_expr(VAR *v, const char *p, co
     const char* end= *p_end + 1;
     if (end < expected_end)
       die("Found junk '%.*s' after $variable in expression",
-          expected_end - end - 1, end);
+          (int)(expected_end - end - 1), end);
 
     DBUG_VOID_RETURN;
   }