summaryrefslogtreecommitdiff
path: root/sql/handler.cc
diff options
context:
space:
mode:
authorunknown <brian@brian-akers-computer.local>2004-06-05 10:43:22 -0700
committerunknown <brian@brian-akers-computer.local>2004-06-05 10:43:22 -0700
commit895efc07ac23ba8108fb2061b9f6ca0373613195 (patch)
tree4b15ba557e8f5854406099ae872ab75e795d8e68 /sql/handler.cc
parent0fc147494a50789506f19ffe91324244b1bf5829 (diff)
parent1ceef15c40a9780828aa61f7154e730f1ea25681 (diff)
downloadmariadb-git-895efc07ac23ba8108fb2061b9f6ca0373613195.tar.gz
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1 BitKeeper/etc/logging_ok: auto-union acconfig.h: Auto merged acinclude.m4: Auto merged configure.in: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged
Diffstat (limited to 'sql/handler.cc')
-rw-r--r--sql/handler.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/handler.cc b/sql/handler.cc
index 4a2948e63f8..717b2ee0ce8 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -35,6 +35,9 @@
#ifdef HAVE_EXAMPLE_DB
#include "examples/ha_example.h"
#endif
+#ifdef HAVE_ARCHIVE_DB
+#include "examples/ha_archive.h"
+#endif
#ifdef HAVE_INNOBASE_DB
#include "ha_innodb.h"
#else
@@ -88,6 +91,8 @@ struct show_table_type_st sys_table_types[]=
"Alias for NDBCLUSTER", DB_TYPE_NDBCLUSTER},
{"EXAMPLE",&have_example_db,
"Example storage engine", DB_TYPE_EXAMPLE_DB},
+ {"ARCHIVE",&have_archive_db,
+ "Archive storage engine", DB_TYPE_ARCHIVE_DB},
{NullS, NULL, NullS, DB_TYPE_UNKNOWN}
};
@@ -189,6 +194,10 @@ handler *get_new_handler(TABLE *table, enum db_type db_type)
case DB_TYPE_EXAMPLE_DB:
return new ha_example(table);
#endif
+#ifdef HAVE_ARCHIVE_DB
+ case DB_TYPE_ARCHIVE_DB:
+ return new ha_archive(table);
+#endif
#ifdef HAVE_NDBCLUSTER_DB
case DB_TYPE_NDBCLUSTER:
return new ha_ndbcluster(table);