Resolving merge.

3d2554bc · brian@zim.(none) · 89838b1e · 0c21adf3 · 3d2554bc
Commit 3d2554bc authored Mar 25, 2005 by brian@zim.(none)
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

mysql-test/r/ps_1general.result mysql-test/r/ps_1general.result +1 -0

No files found.
--- a/mysql-test/r/ps_1general.result
+++ b/mysql-test/r/ps_1general.result
@@ -342,6 +342,7 @@ EXAMPLE	YES/NO	Example storage engine
 ARCHIVE	YES/NO	Archive storage engine
 CSV	YES/NO	CSV storage engine
 FEDERATED	YES/NO	Federated MySQL 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 ;