Commit ff5ade15 authored by unknown's avatar unknown
Browse files

Merge resolve. Changed name of ha_example to ha_example_engine. 


sql/set_var.cc:
  Changed have_example to have_example_engine (easier to understand when reading output). Also resolved merge problem.
parent 89987fa1

sql/set_var.cc

+2 −2
Original line number Diff line number Diff line
@@ -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},