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/set_var.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/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index c9cada7158a..a665a6dc3aa 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -738,6 +738,7 @@ struct show_var_st init_vars[]= { {"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_openssl", (char*) &have_openssl, SHOW_HAVE}, {"have_query_cache", (char*) &have_query_cache, SHOW_HAVE}, {"have_raid", (char*) &have_raid, SHOW_HAVE}, |