1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix VS8 build error

Browse Source
This commit is contained in:
Magnus Svensson 2008-08-09 14:59:57 +02:00
parent fba319490a
commit 36bebcc13c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/mysqltest.cc
View File

@ -487,7 +487,7 @@ void free_all_replace(){
class LogFile { class LogFile {
FILE* m_file; FILE* m_file;
char m_file_name[FN_REFLEN]; char m_file_name[FN_REFLEN];
uint m_bytes_written; size_t m_bytes_written;
public: public:
LogFile() : m_file(NULL), m_bytes_written(0) { LogFile() : m_file(NULL), m_bytes_written(0) {
bzero(m_file_name, sizeof(m_file_name)); bzero(m_file_name, sizeof(m_file_name));
@ -498,7 +498,7 @@ public:
} }
const char* file_name() const { return m_file_name; } 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) 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)); DBUG_PRINT("info", ("pattern: %s", *pattern));
/* Search for the path in string */ /* 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)); DBUG_PRINT("info", ("Found %s in val p: %s", *pattern, p));