merge mysql-5.5->mysql-5.5-security

2 files changed, 55 insertions, 94 deletions

diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result
index ab6793235c7..236d07bccbc 100644
--- a/mysql-test/r/alter_table.result
+++ b/mysql-test/r/alter_table.result
@@ -1433,3 +1433,58 @@ rename table t2 to t1;
 execute stmt1;
 deallocate prepare stmt1;
 drop table t2;
+#
+# Bug#11815557 60269: MYSQL SHOULD REJECT ATTEMPTS TO CREATE SYSTEM
+#                     TABLES IN INCORRECT ENGINE
+#
+# Note: This test assumes that only MyISAM supports system tables.
+#       If other engines are made to support system tables,
+#       then this test needs to be updated
+#
+use mysql;
+ALTER TABLE db ENGINE=innodb;
+ERROR HY000: Storage engine 'InnoDB' does not support system tables. [mysql.db]
+ALTER TABLE user ENGINE=memory;
+ERROR HY000: Storage engine 'MEMORY' does not support system tables. [mysql.user]
+ALTER TABLE proc ENGINE=heap;
+ERROR HY000: Storage engine 'MEMORY' does not support system tables. [mysql.proc]
+ALTER TABLE func ENGINE=csv;
+ERROR HY000: Storage engine 'CSV' does not support system tables. [mysql.func]
+ALTER TABLE event ENGINE=merge;
+ERROR HY000: Storage engine 'MRG_MYISAM' does not support system tables. [mysql.event]
+ALTER TABLE servers ENGINE=innodb;
+ERROR HY000: Storage engine 'InnoDB' does not support system tables. [mysql.servers]
+ALTER TABLE procs_priv ENGINE=memory;
+ERROR HY000: Storage engine 'MEMORY' does not support system tables. [mysql.procs_priv]
+ALTER TABLE tables_priv ENGINE=heap;
+ERROR HY000: Storage engine 'MEMORY' does not support system tables. [mysql.tables_priv]
+ALTER TABLE columns_priv ENGINE=csv;
+ERROR HY000: Storage engine 'CSV' does not support system tables. [mysql.columns_priv]
+ALTER TABLE time_zone ENGINE=merge;
+ERROR HY000: Storage engine 'MRG_MYISAM' does not support system tables. [mysql.time_zone]
+ALTER TABLE help_topic ENGINE=innodb;
+ERROR HY000: Storage engine 'InnoDB' does not support system tables. [mysql.help_topic]
+CREATE TABLE db (dummy int) ENGINE=innodb;
+ERROR HY000: Storage engine 'InnoDB' does not support system tables. [mysql.db]
+CREATE TABLE user (dummy int) ENGINE=memory;
+ERROR HY000: Storage engine 'MEMORY' does not support system tables. [mysql.user]
+CREATE TABLE proc (dummy int) ENGINE=heap;
+ERROR HY000: Storage engine 'MEMORY' does not support system tables. [mysql.proc]
+CREATE TABLE func (dummy int) ENGINE=csv;
+ERROR HY000: Storage engine 'CSV' does not support system tables. [mysql.func]
+CREATE TABLE event (dummy int) ENGINE=merge;
+ERROR HY000: Storage engine 'MRG_MYISAM' does not support system tables. [mysql.event]
+CREATE TABLE servers (dummy int) ENGINE=innodb;
+ERROR HY000: Storage engine 'InnoDB' does not support system tables. [mysql.servers]
+CREATE TABLE procs_priv (dummy int) ENGINE=memory;
+ERROR HY000: Storage engine 'MEMORY' does not support system tables. [mysql.procs_priv]
+CREATE TABLE tables_priv (dummy int) ENGINE=heap;
+ERROR HY000: Storage engine 'MEMORY' does not support system tables. [mysql.tables_priv]
+CREATE TABLE columns_priv (dummy int) ENGINE=csv;
+ERROR HY000: Storage engine 'CSV' does not support system tables. [mysql.columns_priv]
+CREATE TABLE time_zone (dummy int) ENGINE=merge;
+ERROR HY000: Storage engine 'MRG_MYISAM' does not support system tables. [mysql.time_zone]
+CREATE TABLE help_topic (dummy int) ENGINE=innodb;
+ERROR HY000: Storage engine 'InnoDB' does not support system tables. [mysql.help_topic]
+use test;
+# End of Bug#11815557
diff --git a/mysql-test/r/help.result b/mysql-test/r/help.result
index 16719cc8193..8ec69d0c7be 100644
--- a/mysql-test/r/help.result
+++ b/mysql-test/r/help.result
@@ -148,100 +148,6 @@ help 'impossible_category_1';
 source_category_name	name	is_it_category
 impossible_category_1	impossible_function_1	N
 impossible_category_1	impossible_function_2	N
-alter table mysql.help_relation engine=innodb;
-alter table mysql.help_keyword engine=innodb;
-alter table mysql.help_topic engine=innodb;
-alter table mysql.help_category engine=innodb;
-help 'function_of_my_dream';
-name	is_it_category
-help '%possible_f%';
-name	is_it_category
-impossible_function_1	N
-impossible_function_2	N
-impossible_function_3	N
-impossible_function_4	N
-impossible_function_7	N
-help 'impossible_func%';
-name	is_it_category
-impossible_function_1	N
-impossible_function_2	N
-impossible_function_3	N
-impossible_function_4	N
-impossible_function_7	N
-help 'impossible_category%';
-name	is_it_category
-impossible_category_1	Y
-impossible_category_2	Y
-impossible_category_3	Y
-help 'impossible_%';
-name	is_it_category
-impossible_function_1	N
-impossible_function_2	N
-impossible_function_3	N
-impossible_function_4	N
-impossible_function_7	N
-impossible_category_1	Y
-impossible_category_2	Y
-impossible_category_3	Y
-help '%function_1';
-name	description	example
-impossible_function_1	description of 
- impossible_function1
-	example of 
- impossible_function1
-help '%function_2';
-name	description	example
-impossible_function_2	description of 
- impossible_function2
-	example of 
- impossible_function2
-help '%function_3';
-name	description	example
-impossible_function_3	description of 
- impossible_function3
-	example of 
- impossible_function3
-help '%function_4';
-name	description	example
-impossible_function_4	description of 
- impossible_function4
-	example of 
- impossible_function4
-help '%function_5';
-name	description	example
-impossible_function_1	description of 
- impossible_function1
-	example of 
- impossible_function1
-help '%function_6';
-name	is_it_category
-impossible_function_3	N
-impossible_function_4	N
-help '%function_7';
-name	description	example
-impossible_function_7	description of 
- impossible_function5
-	example of 
- impossible_function7
-help '%category_2';
-source_category_name	name	is_it_category
-impossible_category_2	impossible_function_3	N
-impossible_category_2	impossible_function_4	N
-impossible_category_2	impossible_category_3	Y
-help 'impossible_function_1';
-name	description	example
-impossible_function_1	description of 
- impossible_function1
-	example of 
- impossible_function1
-help 'impossible_category_1';
-source_category_name	name	is_it_category
-impossible_category_1	impossible_function_1	N
-impossible_category_1	impossible_function_2	N
-alter table mysql.help_relation engine=myisam;
-alter table mysql.help_keyword engine=myisam;
-alter table mysql.help_topic engine=myisam;
-alter table mysql.help_category engine=myisam;
 delete from mysql.help_topic where help_topic_id=@topic1_id;
 delete from mysql.help_topic where help_topic_id=@topic2_id;
 delete from mysql.help_topic where help_topic_id=@topic3_id;