database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +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

4
sql/handler.cc
View File

@ -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},