Merge resolve. Changed name of ha_example to ha_example_engine.

1bb0c2ac · brian@avenger.(none) · 1fe8b35b · 1bb0c2ac
Commit 1bb0c2ac authored Aug 13, 2004 by brian@avenger.(none)
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/set_var.cc sql/set_var.cc +2 -2

No files found.
--- 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},