diff options
author | unknown <brian@avenger.(none)> | 2004-08-13 16:27:17 -0700 |
---|---|---|
committer | unknown <brian@avenger.(none)> | 2004-08-13 16:27:17 -0700 |
commit | 2d8f4a61bf49613f326407af75ce6dd8badfe21c (patch) | |
tree | 9620e1e05dda7035c2036a5b0c7f7c89faacb947 /sql/handler.cc | |
parent | a5a4ed90f59c24e213af46c96e27a7104bdff89a (diff) | |
parent | ff5ade15bd2536cd15ba3fa3bfb8f325d83283fa (diff) | |
download | mariadb-git-2d8f4a61bf49613f326407af75ce6dd8badfe21c.tar.gz |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into avenger.(none):/export/brian/tina-4.1
acinclude.m4:
Auto merged
BitKeeper/deleted/.del-acconfig.h~8d2e3113fc8056da:
Auto merged
configure.in:
Auto merged
sql/Makefile.am:
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.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index bfe6736fb05..30d568aff4b 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -38,6 +38,9 @@ #ifdef HAVE_ARCHIVE_DB #include "examples/ha_archive.h" #endif +#ifdef HAVE_CSV_DB +#include "examples/ha_tina.h" +#endif #ifdef HAVE_INNOBASE_DB #include "ha_innodb.h" #endif @@ -91,6 +94,8 @@ struct show_table_type_st sys_table_types[]= "Example storage engine", DB_TYPE_EXAMPLE_DB}, {"ARCHIVE",&have_archive_db, "Archive storage engine", DB_TYPE_ARCHIVE_DB}, + {"CSV",&have_csv_db, + "CSV storage engine", DB_TYPE_CSV_DB}, {NullS, NULL, NullS, DB_TYPE_UNKNOWN} }; @@ -196,6 +201,10 @@ handler *get_new_handler(TABLE *table, enum db_type db_type) case DB_TYPE_ARCHIVE_DB: return new ha_archive(table); #endif +#ifdef HAVE_CSV_DB + case DB_TYPE_CSV_DB: + return new ha_tina(table); +#endif #ifdef HAVE_NDBCLUSTER_DB case DB_TYPE_NDBCLUSTER: return new ha_ndbcluster(table); |