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/mysql_priv.h | |
| 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/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index d231942bb7a..b9faa062850 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1021,7 +1021,7 @@ extern SHOW_COMP_OPTION have_query_cache, have_berkeley_db, have_innodb; extern SHOW_COMP_OPTION have_geometry, have_rtree_keys; extern SHOW_COMP_OPTION have_crypt; extern SHOW_COMP_OPTION have_compress; -extern SHOW_COMP_OPTION have_blackhole_db; +extern SHOW_COMP_OPTION have_blackhole_db, have_merge_db; #ifndef __WIN__ extern pthread_t signal_thread; |