diff options
| author | unknown <kent@mysql.com> | 2005-08-18 17:29:24 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-08-18 17:29:24 +0200 |
| commit | 4536a103d06eaead11e948cf211a440bf59eaa33 (patch) | |
| tree | 90ceba72319421601246fcc696681b31768e4dd7 /sql/examples | |
| parent | d1bdd18eb469dd0c731e2a3478e30da01d764afd (diff) | |
| download | mariadb-git-4536a103d06eaead11e948cf211a440bf59eaa33.tar.gz | |
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
Diffstat (limited to 'sql/examples')
| -rw-r--r-- | sql/examples/ha_archive.cc | 2 | ||||
| -rw-r--r-- | sql/examples/ha_archive.h | 2 | ||||
| -rw-r--r-- | sql/examples/ha_example.cc | 2 |
3 files changed, 3 insertions, 3 deletions
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 <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 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 <mysql_priv.h> +#include "../mysql_priv.h" #ifdef HAVE_EXAMPLE_DB #include "ha_example.h" |