diff options
| author | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-07-14 16:26:58 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-07-14 16:26:58 +0500 |
| commit | 39f9adfa849a9763dd883fd4661eb9ddfb47d576 (patch) | |
| tree | 9741bdd736d6a09ae7e8bbcab977f7ebbc1efd73 /sql/handler.cc | |
| parent | 1787072458f518c68b940f17f54f2b5658f45469 (diff) | |
| download | mariadb-git-39f9adfa849a9763dd883fd4661eb9ddfb47d576.tar.gz | |
--{skip-}merge option added which allows the user to disable merge engine and
to avoid the potential security problem.
(see bug #15195: Security Breach with MERGE table)
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index e166f9885fc..c05fc8ba0e7 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -73,9 +73,9 @@ struct show_table_type_st sys_table_types[]= "Alias for MEMORY", DB_TYPE_HEAP}, {"MEMORY", &have_yes, "Hash based, stored in memory, useful for temporary tables", DB_TYPE_HEAP}, - {"MERGE", &have_yes, + {"MERGE", &have_merge_db, "Collection of identical MyISAM tables", DB_TYPE_MRG_MYISAM}, - {"MRG_MYISAM",&have_yes, + {"MRG_MYISAM",&have_merge_db, "Alias for MERGE", DB_TYPE_MRG_MYISAM}, {"ISAM", &have_isam, "Obsolete storage engine, now replaced by MyISAM", DB_TYPE_ISAM}, |