Removed wrong merge from 5.0 - 5.1

f150f86d · unknown · c108939d · f150f86d
Commit f150f86d authored Dec 14, 2005 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

sql/ha_archive.cc sql/ha_archive.cc +0 -1

No files found.
--- a/sql/ha_archive.cc
+++ b/sql/ha_archive.cc
@@ -20,7 +20,6 @@

 #include "mysql_priv.h"

-#if defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)
 #include "ha_archive.h"
 #include <my_dir.h>