ha_archive.cc:

  Use local seach path for "mysql_priv.h"
mysqld.dsp:
  Added the ARCHIVE storage engine to max
ha_archive.h:
  VC6, but not VC7, needs a cast of byte[] to char* to make
  the compile select the right conversion function in String


sql/examples/ha_archive.h:
  VC6, but not VC7, needs a cast of byte[] to char* to make
  the compile select the right conversion function in String
VC++Files/sql/mysqld.dsp:
  Added the ARCHIVE storage engine to max
sql/examples/ha_archive.cc:
  Use local seach path for "mysql_priv.h"

2 files changed, 2 insertions, 2 deletions

diff --git a/sql/examples/ha_archive.cc b/sql/examples/ha_archive.cc
index 231031c9834..f28ba79a00e 100644
--- a/sql/examples/ha_archive.cc
+++ b/sql/examples/ha_archive.cc
@@ -18,7 +18,7 @@
 #pragma implementation        // gcc: Class implementation
 #endif
 
-#include <mysql_priv.h>
+#include "../mysql_priv.h"
 
 #ifdef HAVE_ARCHIVE_DB
 #include "ha_archive.h"
diff --git a/sql/examples/ha_archive.h b/sql/examples/ha_archive.h
index c68462be1ab..2f310d8c69b 100644
--- a/sql/examples/ha_archive.h
+++ b/sql/examples/ha_archive.h
@@ -61,7 +61,7 @@ public:
   ha_archive(TABLE *table): handler(table), delayed_insert(0), bulk_insert(0)
   {
     /* Set our original buffer from pre-allocated memory */
-    buffer.set(byte_buffer, IO_SIZE, system_charset_info);
+    buffer.set((char *)byte_buffer, IO_SIZE, system_charset_info);
 
     /* The size of the offset value we will use for position() */
     ref_length = sizeof(z_off_t);