diff options
| author | unknown <tsmith@maint2.mysql.com> | 2006-09-01 03:44:03 +0200 |
|---|---|---|
| committer | unknown <tsmith@maint2.mysql.com> | 2006-09-01 03:44:03 +0200 |
| commit | fc5ee96866474662d32ae8bb5f388cccf17b1806 (patch) | |
| tree | ec15d05401311d504740ff6b571513a12e678717 /sql/set_var.cc | |
| parent | b0cdb895e4154d3d131268d8181193bad82086c2 (diff) | |
| parent | a756f762e868c73ac9e90ebadfd51f1c3d905499 (diff) | |
| download | mariadb-git-fc5ee96866474662d32ae8bb5f388cccf17b1806.tar.gz | |
Merge maint2.mysql.com:/data/localhome/tsmith/bk/41
into maint2.mysql.com:/data/localhome/tsmith/bk/50
mysql-test/r/heap_btree.result:
Auto merged
sql/set_var.cc:
Auto merged
mysql-test/t/heap_btree.test:
Manual merge.
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index b61f6d58347..c667e2f2bcc 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -870,8 +870,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}, |