diff options
| author | unknown <brian@avenger.(none)> | 2004-08-13 16:24:46 -0700 |
|---|---|---|
| committer | unknown <brian@avenger.(none)> | 2004-08-13 16:24:46 -0700 |
| commit | ff5ade15bd2536cd15ba3fa3bfb8f325d83283fa (patch) | |
| tree | e8fb2fc8b2df24a07e9a9b152a2b4601d125ec51 /sql/set_var.cc | |
| parent | 89987fa1044438f01c4a2efdf5563ec1c50a2102 (diff) | |
| download | mariadb-git-ff5ade15bd2536cd15ba3fa3bfb8f325d83283fa.tar.gz | |
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.
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 4 |
1 files 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}, |