diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-07-20 13:41:00 -0600 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-07-20 13:41:00 -0600 |
| commit | 93eef69dd517557255c4947b3d99f9fb0967fb5e (patch) | |
| tree | 4960a8f40087c9b8c0b84b85e23a1f6497112581 /sql/mysqld.cc | |
| parent | d7baef2a65848c0466630a5a8e54d6bc69320f25 (diff) | |
| download | mariadb-git-93eef69dd517557255c4947b3d99f9fb0967fb5e.tar.gz | |
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
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 5 |
1 files changed, 5 insertions, 0 deletions
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 */ |