summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <brian@zim.(none)>2005-09-28 19:04:51 -0700
committerunknown <brian@zim.(none)>2005-09-28 19:04:51 -0700
commit5c24a8feef931f4769a1b9e5625004ba7a54b22c (patch)
treebb92cbf8665195bd13d26505fef281da28afbab7 /sql
parent0fda286a415777e755d4bc076d4d35f27c071219 (diff)
downloadmariadb-git-5c24a8feef931f4769a1b9e5625004ba7a54b22c.tar.gz
Moving archive from example to sql.
sql/ha_archive.h: Rename: sql/examples/ha_archive.h -> sql/ha_archive.h libmysqld/Makefile.am: Moved archive files references sql/Makefile.am: Moved archive from example to sql sql/ha_archive.cc: Moved location of prov file. sql/handler.cc: Moved location from examples to sql
Diffstat (limited to 'sql')
-rw-r--r--sql/Makefile.am4
-rw-r--r--sql/ha_archive.cc (renamed from sql/examples/ha_archive.cc)2
-rw-r--r--sql/ha_archive.h (renamed from sql/examples/ha_archive.h)0
-rw-r--r--sql/handler.cc2
4 files changed, 4 insertions, 4 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am
index 60c485d79f9..cd1de0ce3c9 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -62,7 +62,7 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
sp_head.h sp_pcontext.h sp_rcontext.h sp.h sp_cache.h \
parse_file.h sql_view.h sql_trigger.h \
sql_array.h sql_cursor.h \
- examples/ha_example.h examples/ha_archive.h \
+ examples/ha_example.h ha_archive.h \
examples/ha_tina.h ha_blackhole.h \
ha_federated.h
mysqld_SOURCES = sql_lex.cc sql_handler.cc \
@@ -98,7 +98,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc \
tztime.cc my_time.c my_decimal.cc\
sp_head.cc sp_pcontext.cc sp_rcontext.cc sp.cc \
sp_cache.cc parse_file.cc sql_trigger.cc \
- examples/ha_example.cc examples/ha_archive.cc \
+ examples/ha_example.cc ha_archive.cc \
examples/ha_tina.cc ha_blackhole.cc \
ha_federated.cc
diff --git a/sql/examples/ha_archive.cc b/sql/ha_archive.cc
index 7a0c957e5c3..7e5c89cfe39 100644
--- a/sql/examples/ha_archive.cc
+++ b/sql/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/ha_archive.h
index e2d8aa49add..e2d8aa49add 100644
--- a/sql/examples/ha_archive.h
+++ b/sql/ha_archive.h
diff --git a/sql/handler.cc b/sql/handler.cc
index b7b599a0a90..39d9b706ed2 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -38,7 +38,7 @@ extern handlerton blackhole_hton;
extern handlerton example_hton;
#endif
#ifdef HAVE_ARCHIVE_DB
-#include "examples/ha_archive.h"
+#include "ha_archive.h"
extern handlerton archive_hton;
#endif
#ifdef HAVE_CSV_DB