From 93eef69dd517557255c4947b3d99f9fb0967fb5e Mon Sep 17 00:00:00 2001
From: unknown <tsmith/tim@siva.hindu.god>
Date: Thu, 20 Jul 2006 13:41:00 -0600
Subject: Finish the merge of the patch for bug #15195 from 4.1 -> 5.0 - Adapt
 it to work with the handlerton class

sql/handler.cc:
  Only create new MERGE handler if merge engine is enabled
sql/mysql_priv.h:
  Use the myisammrg_hton.state field for the have_merge_db option
sql/mysqld.cc:
  Handle the OPT_MERGE (--skip-merge) option case
---
 sql/mysqld.cc | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'sql/mysqld.cc')

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index b082e7d5046..786a1ea4f4c 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -6887,6 +6887,11 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
     global_system_variables.tx_isolation= (type-1);
     break;
   }
+  case OPT_MERGE:
+    if (opt_merge)
+      have_merge_db= SHOW_OPTION_YES;
+    else
+      have_merge_db= SHOW_OPTION_DISABLED;
 #ifdef HAVE_BERKELEY_DB
   case OPT_BDB_NOSYNC:
     /* Deprecated option */
-- 
cgit v1.2.1