From 644d5cfe82f0327f429f9e9818fc01db96b44a73 Mon Sep 17 00:00:00 2001
From: unknown <brian@zim.(none)>
Date: Fri, 25 Mar 2005 12:36:04 -0800
Subject: [PATCH] Fix upgrade/downgrade issue.

mysql-test/r/ps_1general.result:
  Fix test case.
sql/handler.h:
  Added federated to the list so that any beta users won't end up with a mismatch for table enum
---
 mysql-test/r/ps_1general.result | 1 +
 sql/handler.h                   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result
index ec4aa528a7f..565d19c0991 100644
--- a/mysql-test/r/ps_1general.result
+++ b/mysql-test/r/ps_1general.result
@@ -325,6 +325,7 @@ NDB	YES/NO	Alias for NDBCLUSTER
 EXAMPLE	YES/NO	Example storage engine
 ARCHIVE	YES/NO	Archive storage engine
 CSV	YES/NO	CSV storage engine
+BLACKHOLE	YES/NO	Storage engine designed to act as null storage
 drop table if exists t5;
 prepare stmt1 from ' drop table if exists t5 ' ;
 execute stmt1 ;
diff --git a/sql/handler.h b/sql/handler.h
index d78c625005b..50ce33b5067 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -150,8 +150,8 @@ enum db_type
   DB_TYPE_BERKELEY_DB, DB_TYPE_INNODB, 
   DB_TYPE_GEMINI, DB_TYPE_NDBCLUSTER,
   DB_TYPE_EXAMPLE_DB, DB_TYPE_ARCHIVE_DB, DB_TYPE_CSV_DB,
+  DB_TYPE_FEDERATED_DB,
   DB_TYPE_BLACKHOLE_DB,
-	       
   DB_TYPE_DEFAULT // Must be last
 };
 
-- 
2.30.9