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/handler.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/handler.cc')
| -rw-r--r-- | sql/handler.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 9c03a9ef88f..448cfc6e1fa 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -302,7 +302,9 @@ handler *get_new_handler(TABLE *table, MEM_ROOT *alloc, enum db_type db_type) #endif case DB_TYPE_MRG_MYISAM: case DB_TYPE_MRG_ISAM: - return new (alloc) ha_myisammrg(table); + if (have_merge_db == SHOW_OPTION_YES) + return new (alloc) ha_myisammrg(table); + return NULL; #ifdef HAVE_BERKELEY_DB case DB_TYPE_BERKELEY_DB: if (have_berkeley_db == SHOW_OPTION_YES) |