From 1bb0c2ac93c98b0d170c2af7325bd3ca14f1b4c3 Mon Sep 17 00:00:00 2001
From: "brian@avenger.(none)" <>
Date: Fri, 13 Aug 2004 16:24:46 -0700
Subject: [PATCH] Merge resolve. Changed name of ha_example to
 ha_example_engine.

---
 sql/set_var.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/set_var.cc b/sql/set_var.cc
index 93123b12c38..513c62cdd53 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -653,10 +653,10 @@ struct show_var_st init_vars[]= {
   {"have_compress",	      (char*) &have_compress,		    SHOW_HAVE},
   {"have_crypt",	      (char*) &have_crypt,		    SHOW_HAVE},
   {"have_csv",	              (char*) &have_csv_db,	            SHOW_HAVE},
-  {"have_example",	      (char*) &have_example_db,	            SHOW_HAVE},
+  {"have_example_engine",      (char*) &have_example_db,	            SHOW_HAVE},
+  {"have_geometry",           (char*) &have_geometry,               SHOW_HAVE},
   {"have_innodb",	      (char*) &have_innodb,		    SHOW_HAVE},
   {"have_isam",		      (char*) &have_isam,		    SHOW_HAVE},
-  {"have_geometry",           (char*) &have_geometry,               SHOW_HAVE},
   {"have_ndbcluster",         (char*) &have_ndbcluster,             SHOW_HAVE},
   {"have_openssl",	      (char*) &have_openssl,		    SHOW_HAVE},
   {"have_query_cache",        (char*) &have_query_cache,            SHOW_HAVE},