From e0308bbeae248f86c3c21ee7ed0e4ee523504818 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 18 Aug 2005 17:29:24 +0200 Subject: mysqld.dsp: Added archive and example storage engine to Windows build ha_example.cc, ha_archive.cc: Windows fix, use relative include path to "mysql_priv.h" ha_archive.h: Windows VC6 compile needed (char*) cast of byte var mysqltest.dsp, mysql_test_run_new.dsp: Added /FD flag, to avoid include file warnings VC++Files/mysql-test/mysql_test_run_new.dsp: Added /FD flag, to avoid include file warnings VC++Files/client/mysqltest.dsp: Added /FD flag, to avoid include file warnings sql/examples/ha_archive.h: Windows VC6 compile needed (char*) cast of byte var sql/examples/ha_archive.cc: Windows fix, use relative include path to "mysql_priv.h" sql/examples/ha_example.cc: Windows fix, use relative include path to "mysql_priv.h" VC++Files/sql/mysqld.dsp: Added archive and example storage engine to Windows build --- sql/examples/ha_archive.cc | 2 +- sql/examples/ha_archive.h | 2 +- sql/examples/ha_example.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'sql') diff --git a/sql/examples/ha_archive.cc b/sql/examples/ha_archive.cc index 10712c2e3be..b125f435cfa 100644 --- a/sql/examples/ha_archive.cc +++ b/sql/examples/ha_archive.cc @@ -18,7 +18,7 @@ #pragma implementation // gcc: Class implementation #endif -#include +#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 7ab463b6661..52300fda8a2 100644 --- a/sql/examples/ha_archive.h +++ b/sql/examples/ha_archive.h @@ -58,7 +58,7 @@ public: ha_archive(TABLE *table): handler(table) { /* 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); diff --git a/sql/examples/ha_example.cc b/sql/examples/ha_example.cc index 31e4e97c5c7..b3edce5ba4a 100644 --- a/sql/examples/ha_example.cc +++ b/sql/examples/ha_example.cc @@ -67,7 +67,7 @@ #pragma implementation // gcc: Class implementation #endif -#include +#include "../mysql_priv.h" #ifdef HAVE_EXAMPLE_DB #include "ha_example.h" -- cgit v1.2.1