diff options
| author | unknown <kent@mysql.com> | 2005-08-23 18:06:24 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-08-23 18:06:24 +0200 |
| commit | d93563f288161103fc41ad00f816576a2b310393 (patch) | |
| tree | 46452e598fd6c0fd4dbc3a3b02e8459deb474070 /sql/examples | |
| parent | a797112c8ae81cb721a58d2d54067e1b54884a3f (diff) | |
| parent | 13c347e7e76f15fb0dc6770355cf44d3af4f3c54 (diff) | |
| download | mariadb-git-d93563f288161103fc41ad00f816576a2b310393.tar.gz | |
Merge
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" |