Commit 39f9adfa authored by unknown's avatar unknown
Browse files

--{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)
parent 17870724

mysql-test/r/warnings.result

+7 −0
Original line number Diff line number Diff line
@@ -171,6 +171,13 @@ alter table t1 engine=isam; 
Warnings:

Warning	1266	Using storage engine MyISAM for table 't1'

drop table t1;

create table t1 (id int) engine=merge;

Warnings:

Warning	1266	Using storage engine MyISAM for table 't1'

alter table t1 engine=merge;

Warnings:

Warning	1266	Using storage engine MyISAM for table 't1'

drop table t1;

create table t1 (id int) type=heap;

Warnings:

Warning	1287	'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead

mysql-test/t/warnings-master.opt

+1 −1
Original line number Diff line number Diff line 
--skip-isam
 
--skip-isam --skip-merge

mysql-test/t/warnings.test

+4 −0
Original line number Diff line number Diff line
@@ -118,6 +118,10 @@ create table t1 (id int) engine=isam; 
alter table t1 engine=isam;

drop table t1;



create table t1 (id int) engine=merge;

alter table t1 engine=merge;

drop table t1;



#

# Test for deprecated TYPE= syntax

#

sql/handler.cc

+2 −2
Original line number Diff line number Diff line
@@ -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},

sql/mysql_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -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;