database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-29 00:08:14 +03:00
Code Activity

--{skip-}merge option added which allows the user to disable merge engine and

Browse Source 
to avoid the potential security problem.
(see bug #15195: Security Breach with MERGE table)
This commit is contained in:
ramil/ram@mysql.com/myoffice.izhnet.ru
2006-07-14 16:26:58 +05:00
parent 0f070b0b32
commit b57efe738a
7 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/mysql_priv.h
View File

@@ -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;