summaryrefslogtreecommitdiff
path: root/sql/ha_archive.cc
diff options
context:
space:
mode:
authorunknown <brian@zim.(none)>2005-10-03 18:42:30 -0700
committerunknown <brian@zim.(none)>2005-10-03 18:42:30 -0700
commited35cecdccff8eb8be7e606c1611946937623f88 (patch)
treecc53d1dcf0c549c2e9daeccef300765b3a55465b /sql/ha_archive.cc
parentcdb571925795518303b64c7149698fc328cf5f65 (diff)
downloadmariadb-git-ed35cecdccff8eb8be7e606c1611946937623f88.tar.gz
Final patch for 5.0 for simplifying storage engine code. We now have just one set of ifdefs. I may also remove the code for creating new handlers.
May changes were to simplify storage engine setup and support for legacy call to show storage engines. mysql-test/r/ps_1general.result: Fixed test results for new listing order sql/examples/ha_tina.cc: Removed dead code sql/examples/ha_tina.h: Removed dead code sql/ha_archive.cc: Capitalized sotrage engine name and moved disabled code. sql/ha_berkeley.cc: Moved deisabled code sql/ha_federated.cc: Removed disabled code sql/ha_innodb.cc: Removed disabled message sql/ha_ndbcluster.cc: Removed disabled message sql/handler.cc: Added in legacy support for sotrage engine listing (ala Serg's request). Removed handlertons variables and we now have simplified ha_init code. sql/handler.h: No longer need handlertons array.
Diffstat (limited to 'sql/ha_archive.cc')
-rw-r--r--sql/ha_archive.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/ha_archive.cc b/sql/ha_archive.cc
index bc066b672d3..59c56e80cc3 100644
--- a/sql/ha_archive.cc
+++ b/sql/ha_archive.cc
@@ -137,7 +137,7 @@ static HASH archive_open_tables;
/* dummy handlerton - only to have something to return from archive_db_init */
handlerton archive_hton = {
- "archive",
+ "ARCHIVE",
SHOW_OPTION_YES,
"Archive storage engine",
DB_TYPE_ARCHIVE_DB,
@@ -201,7 +201,6 @@ bool archive_db_init()
}
error:
have_archive_db= SHOW_OPTION_DISABLED; // If we couldn't use handler
- archive_hton.state= SHOW_OPTION_DISABLED;
DBUG_RETURN(TRUE);
}