summaryrefslogtreecommitdiff
path: root/sql/set_var.cc
diff options
context:
space:
mode:
authorunknown <ramil/ram@mysql.com/myoffice.izhnet.ru>2006-08-14 10:54:24 +0500
committerunknown <ramil/ram@mysql.com/myoffice.izhnet.ru>2006-08-14 10:54:24 +0500
commitbb3efba00c5cac5a8b26eee129a512ab24622adb (patch)
tree20bba44262e8458c433fbbb760aa8e69efad978e /sql/set_var.cc
parent49591aa30bba6592c924d893c41312552659369a (diff)
downloadmariadb-git-bb3efba00c5cac5a8b26eee129a512ab24622adb.tar.gz
Restore alphabetical order of the system variables.
sql/set_var.cc: Restore alphabetical order of the system variables. - moved the have_merge_engine variable.
Diffstat (limited to 'sql/set_var.cc')
-rw-r--r--sql/set_var.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 1d994f1c98f..4acedc7bcbd 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -738,8 +738,8 @@ struct show_var_st init_vars[]= {
{"have_geometry", (char*) &have_geometry, SHOW_HAVE},
{"have_innodb", (char*) &have_innodb, SHOW_HAVE},
{"have_isam", (char*) &have_isam, SHOW_HAVE},
- {"have_ndbcluster", (char*) &have_ndbcluster, SHOW_HAVE},
{"have_merge_engine", (char*) &have_merge_db, 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},
{"have_raid", (char*) &have_raid, SHOW_HAVE},