From 36bebcc13cd165416db7c2ab10e2859e070a9eb3 Mon Sep 17 00:00:00 2001
From: Magnus Svensson <msvensson@mysql.com>
Date: Sat, 9 Aug 2008 14:59:57 +0200
Subject: [PATCH] Fix VS8 build error

---
 client/mysqltest.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 868177eefdb..9b05a2c60ec 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -487,7 +487,7 @@ void free_all_replace(){
 class LogFile {
   FILE* m_file;
   char m_file_name[FN_REFLEN];
-  uint m_bytes_written;
+  size_t m_bytes_written;
 public:
   LogFile() : m_file(NULL), m_bytes_written(0) {
     bzero(m_file_name, sizeof(m_file_name));
@@ -498,7 +498,7 @@ public:
   }
 
   const char* file_name() const { return m_file_name; }
-  uint bytes_written() const { return m_bytes_written; }
+  size_t bytes_written() const { return m_bytes_written; }
 
   void open(const char* dir, const char* name, const char* ext)
   {
@@ -5972,7 +5972,7 @@ void fix_win_paths(const char *val, int len)
     DBUG_PRINT("info", ("pattern: %s", *pattern));
 
     /* Search for the path in string */
-    while ((p= strstr(val, *pattern)))
+    while ((p= strstr((char*)val, *pattern)))
     {
       DBUG_PRINT("info", ("Found %s in val p: %s", *pattern, p));