summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2021-06-16 16:18:15 +0200
committerSergei Golubchik <serg@mariadb.org>2021-06-17 19:30:24 +0200
commit12bcbfc9780e6c78993fd97818fc87516a4da6a1 (patch)
treec9616856144452a1d367ab627cd866ab4dd79456
parentaedf3143339b588bc54eaa1c4f2708b9ba0f8e62 (diff)
downloadmariadb-git-12bcbfc9780e6c78993fd97818fc87516a4da6a1.tar.gz
MDEV-16708: extract nonembedded part of the test into a separate file
-rw-r--r--mysql-test/main/ps_missed_cmds.result50
-rw-r--r--mysql-test/main/ps_missed_cmds.test60
-rw-r--r--mysql-test/main/ps_missed_cmds_bin_prot.result20
-rw-r--r--mysql-test/main/ps_missed_cmds_bin_prot.test29
-rw-r--r--mysql-test/main/ps_missed_cmds_bin_prot_not_embedded.result21
-rw-r--r--mysql-test/main/ps_missed_cmds_bin_prot_not_embedded.test40
-rw-r--r--mysql-test/main/ps_missed_cmds_not_embedded.result61
-rw-r--r--mysql-test/main/ps_missed_cmds_not_embedded.test85
-rw-r--r--mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test1
-rw-r--r--storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_parser_comment.test1
-rw-r--r--storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_parser_off.test1
-rw-r--r--storage/mroonga/mysql-test/mroonga/wrapper/t/create_table_parser_comment.test1
12 files changed, 211 insertions, 159 deletions
diff --git a/mysql-test/main/ps_missed_cmds.result b/mysql-test/main/ps_missed_cmds.result
index e016226bb17..1d996141adf 100644
--- a/mysql-test/main/ps_missed_cmds.result
+++ b/mysql-test/main/ps_missed_cmds.result
@@ -712,44 +712,6 @@ ERROR HY000: The foreign server name you are trying to reference does not exist.
DEALLOCATE PREPARE stmt_1;
DEALLOCATE PREPARE stmt_2;
DEALLOCATE PREPARE stmt_3;
-# Test case 20: Check that the CREATE EVENT/ALTER EVENT/DROP EVENT
-# statements can be executed as a prepared statement
-PREPARE stmt_1 FROM "CREATE EVENT e1 ON SCHEDULE AT CURRENT_TIMESTAMP - INTERVAL 1 DAY ON COMPLETION PRESERVE DO SET @a=1";
-PREPARE stmt_2 FROM "ALTER EVENT e1 COMMENT 'New comment'";
-PREPARE stmt_3 FROM "DROP EVENT e1";
-# Create the event e1 that specifies time in past. Such event is created
-# just for the sake of its existence and never will be triggered.
-# Disable warnings temprorary in order to hide the following warnings
-# generated in result of execution the 'CREATE EVENT' statement:
-# "1544 | Event execution time is in the past. Event has been disabled"
-# "1105 | Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it."
-EXECUTE stmt_1;
-# Execute the same prepared statement the second time to check that
-# no internal structures used for handling the 'CREATE EVENT' statement
-# were damaged. Execution of this statement the second time expectedly
-# results in emitting the error ER_EVENT_ALREADY_EXISTS since the event
-# with the same name has just been created.
-EXECUTE stmt_1;
-ERROR HY000: Event 'e1' already exists
-# Alter event e1
-EXECUTE stmt_2;
-# Execute the same prepared statement the second time to check that
-# no internal structures used for handling the 'ALTER EVENT' statement
-# were damaged.
-EXECUTE stmt_2;
-# Drop event e1
-EXECUTE stmt_3;
-# Execute the same prepared statement the second time to check that
-# no internal structures used for handling the 'DROP EVENT' statement
-# were damaged. Execution of this statement the second time expectedly
-# results in emitting the error ER_EVENT_DOESNT_EXIST since the event
-# with the same name has just been dropped.
-EXECUTE stmt_3;
-ERROR HY000: Unknown event 'e1'
-# Clean up
-DEALLOCATE PREPARE stmt_1;
-DEALLOCATE PREPARE stmt_2;
-DEALLOCATE PREPARE stmt_3;
# Test case 21: Check that the SIGNAL and RESIGNAL statements
# can be executed as a prepared statement
PREPARE stmt_1 FROM "SIGNAL SQLSTATE '45000' SET MYSQL_ERRNO=30001, MESSAGE_TEXT='Hello, world!'";
@@ -770,18 +732,6 @@ EXECUTE stmt_1;
ERROR 0K000: RESIGNAL when handler not active
# Clean up
DEALLOCATE PREPARE stmt_1;
-# Test case 22: Check that the 'SHOW RELAYLOG EVENTS' statement can be
-# executed as a prepared statement.
-PREPARE stmt_1 FROM 'SHOW RELAYLOG EVENTS';
-EXECUTE stmt_1;
-Log_name Pos Event_type Server_id End_log_pos Info
-# Execute the same prepared statement the second time to check that
-# no internal structures used for handling the 'SHOW RELAYLOG EVENTS'
-# statement were damaged.
-EXECUTE stmt_1;
-Log_name Pos Event_type Server_id End_log_pos Info
-# Clean up
-DEALLOCATE PREPARE stmt_1;
# Test case 23: Check the 'GET DIAGNOSTICS' statement
# can be executed as a prepared statement
PREPARE stmt_1 FROM 'GET DIAGNOSTICS CONDITION 1 @sqlstate = RETURNED_SQLSTATE, @errno = MYSQL_ERRNO, @text = MESSAGE_TEXT';
diff --git a/mysql-test/main/ps_missed_cmds.test b/mysql-test/main/ps_missed_cmds.test
index 3aa14d5cce1..1546b064d89 100644
--- a/mysql-test/main/ps_missed_cmds.test
+++ b/mysql-test/main/ps_missed_cmds.test
@@ -517,55 +517,6 @@ DEALLOCATE PREPARE stmt_1;
DEALLOCATE PREPARE stmt_2;
DEALLOCATE PREPARE stmt_3;
---echo # Test case 20: Check that the CREATE EVENT/ALTER EVENT/DROP EVENT
---echo # statements can be executed as a prepared statement
-
-PREPARE stmt_1 FROM "CREATE EVENT e1 ON SCHEDULE AT CURRENT_TIMESTAMP - INTERVAL 1 DAY ON COMPLETION PRESERVE DO SET @a=1";
-
-PREPARE stmt_2 FROM "ALTER EVENT e1 COMMENT 'New comment'";
-
-PREPARE stmt_3 FROM "DROP EVENT e1";
---echo # Create the event e1 that specifies time in past. Such event is created
---echo # just for the sake of its existence and never will be triggered.
---echo # Disable warnings temprorary in order to hide the following warnings
---echo # generated in result of execution the 'CREATE EVENT' statement:
---echo # "1544 | Event execution time is in the past. Event has been disabled"
---echo # "1105 | Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it."
-
---disable_warnings
-EXECUTE stmt_1;
-
---echo # Execute the same prepared statement the second time to check that
---echo # no internal structures used for handling the 'CREATE EVENT' statement
---echo # were damaged. Execution of this statement the second time expectedly
---echo # results in emitting the error ER_EVENT_ALREADY_EXISTS since the event
---echo # with the same name has just been created.
---error ER_EVENT_ALREADY_EXISTS
-EXECUTE stmt_1;
-
---enable_warnings
-
---echo # Alter event e1
-EXECUTE stmt_2;
---echo # Execute the same prepared statement the second time to check that
---echo # no internal structures used for handling the 'ALTER EVENT' statement
---echo # were damaged.
-EXECUTE stmt_2;
-
---echo # Drop event e1
-EXECUTE stmt_3;
---echo # Execute the same prepared statement the second time to check that
---echo # no internal structures used for handling the 'DROP EVENT' statement
---echo # were damaged. Execution of this statement the second time expectedly
---echo # results in emitting the error ER_EVENT_DOESNT_EXIST since the event
---echo # with the same name has just been dropped.
---error ER_EVENT_DOES_NOT_EXIST
-EXECUTE stmt_3;
---echo # Clean up
-DEALLOCATE PREPARE stmt_1;
-DEALLOCATE PREPARE stmt_2;
-DEALLOCATE PREPARE stmt_3;
-
--echo # Test case 21: Check that the SIGNAL and RESIGNAL statements
--echo # can be executed as a prepared statement
PREPARE stmt_1 FROM "SIGNAL SQLSTATE '45000' SET MYSQL_ERRNO=30001, MESSAGE_TEXT='Hello, world!'";
@@ -589,17 +540,6 @@ EXECUTE stmt_1;
--echo # Clean up
DEALLOCATE PREPARE stmt_1;
---echo # Test case 22: Check that the 'SHOW RELAYLOG EVENTS' statement can be
---echo # executed as a prepared statement.
-PREPARE stmt_1 FROM 'SHOW RELAYLOG EVENTS';
-EXECUTE stmt_1;
---echo # Execute the same prepared statement the second time to check that
---echo # no internal structures used for handling the 'SHOW RELAYLOG EVENTS'
---echo # statement were damaged.
-EXECUTE stmt_1;
---echo # Clean up
-DEALLOCATE PREPARE stmt_1;
-
--echo # Test case 23: Check the 'GET DIAGNOSTICS' statement
--echo # can be executed as a prepared statement
PREPARE stmt_1 FROM 'GET DIAGNOSTICS CONDITION 1 @sqlstate = RETURNED_SQLSTATE, @errno = MYSQL_ERRNO, @text = MESSAGE_TEXT';
diff --git a/mysql-test/main/ps_missed_cmds_bin_prot.result b/mysql-test/main/ps_missed_cmds_bin_prot.result
index 3b56d9a1a5b..d27159354f5 100644
--- a/mysql-test/main/ps_missed_cmds_bin_prot.result
+++ b/mysql-test/main/ps_missed_cmds_bin_prot.result
@@ -210,26 +210,6 @@ DROP TABLE t1;
CREATE SERVER s FOREIGN DATA WRAPPER mysql OPTIONS (USER 'u1', HOST '127.0.0.1');
ALTER SERVER s OPTIONS (USER 'u2');
DROP SERVER s;
-# Test case 18: Check that the statements CREATE EVENT/ALTER EVENT/
-# DROP EVENT can be executed as a prepared statement
-# Create the event e1 that specifies time in past. Such event is created
-# just for the sake of its existence and never will be triggered.
-# Disable warnings temprorary in order to hide the following warnings
-# generated in result of execution the 'CREATE EVENT' statement:
-# "1544 | Event execution time is in the past. Event has been disabled"
-# "1105 | Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it."
-CREATE EVENT e1 ON SCHEDULE AT CURRENT_TIMESTAMP - INTERVAL 1 DAY ON COMPLETION PRESERVE DO SET @a=1;
-ALTER EVENT e1 COMMENT 'New comment';
-DROP EVENT IF EXISTS e1;
-# Test case 19: Check that the statement 'SHOW RELAYLOG EVENTS' can be
-# executed as a prepared statement.
-SHOW RELAYLOG EVENTS;
-Log_name Pos Event_type Server_id End_log_pos Info
-# Test case 20: Check the the statement 'EXECUTE IMMEDIATE'
-# can be executed as a prepared statement
-EXECUTE IMMEDIATE 'SELECT 1';
-1
-1
# Test Test case 21: Check the statements 'BACKUP'/'BACKUP STAGE'
# can be executed as a prepared statement
CREATE TABLE t1 (a INT);
diff --git a/mysql-test/main/ps_missed_cmds_bin_prot.test b/mysql-test/main/ps_missed_cmds_bin_prot.test
index 10ce9ebd60a..f36385cc079 100644
--- a/mysql-test/main/ps_missed_cmds_bin_prot.test
+++ b/mysql-test/main/ps_missed_cmds_bin_prot.test
@@ -219,35 +219,6 @@ CREATE SERVER s FOREIGN DATA WRAPPER mysql OPTIONS (USER 'u1', HOST '127.0.0.1')
ALTER SERVER s OPTIONS (USER 'u2');
DROP SERVER s;
---echo # Test case 18: Check that the statements CREATE EVENT/ALTER EVENT/
---echo # DROP EVENT can be executed as a prepared statement
-
---echo # Create the event e1 that specifies time in past. Such event is created
---echo # just for the sake of its existence and never will be triggered.
---echo # Disable warnings temprorary in order to hide the following warnings
---echo # generated in result of execution the 'CREATE EVENT' statement:
---echo # "1544 | Event execution time is in the past. Event has been disabled"
---echo # "1105 | Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it."
-
---disable_warnings
-
-CREATE EVENT e1 ON SCHEDULE AT CURRENT_TIMESTAMP - INTERVAL 1 DAY ON COMPLETION PRESERVE DO SET @a=1;
-
-ALTER EVENT e1 COMMENT 'New comment';
-
-DROP EVENT IF EXISTS e1;
-
---enable_warnings
-
---echo # Test case 19: Check that the statement 'SHOW RELAYLOG EVENTS' can be
---echo # executed as a prepared statement.
-SHOW RELAYLOG EVENTS;
-
---echo # Test case 20: Check the the statement 'EXECUTE IMMEDIATE'
---echo # can be executed as a prepared statement
-
-EXECUTE IMMEDIATE 'SELECT 1';
-
--echo # Test Test case 21: Check the statements 'BACKUP'/'BACKUP STAGE'
--echo # can be executed as a prepared statement
CREATE TABLE t1 (a INT);
diff --git a/mysql-test/main/ps_missed_cmds_bin_prot_not_embedded.result b/mysql-test/main/ps_missed_cmds_bin_prot_not_embedded.result
new file mode 100644
index 00000000000..0e36165db33
--- /dev/null
+++ b/mysql-test/main/ps_missed_cmds_bin_prot_not_embedded.result
@@ -0,0 +1,21 @@
+#
+# MDEV-16708: Unsupported commands for prepared statements
+#
+SET @save_storage_engine= @@default_storage_engine;
+SET default_storage_engine= InnoDB;
+# Test case 18: Check that the statements CREATE EVENT/ALTER EVENT/
+# DROP EVENT can be executed as a prepared statement
+# Create the event e1 that specifies time in past. Such event is created
+# just for the sake of its existence and never will be triggered.
+# Disable warnings temprorary in order to hide the following warnings
+# generated in result of execution the 'CREATE EVENT' statement:
+# "1544 | Event execution time is in the past. Event has been disabled"
+# "1105 | Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it."
+CREATE EVENT e1 ON SCHEDULE AT CURRENT_TIMESTAMP - INTERVAL 1 DAY ON COMPLETION PRESERVE DO SET @a=1;
+ALTER EVENT e1 COMMENT 'New comment';
+DROP EVENT IF EXISTS e1;
+# Test case 19: Check that the statement 'SHOW RELAYLOG EVENTS' can be
+# executed as a prepared statement.
+SHOW RELAYLOG EVENTS;
+Log_name Pos Event_type Server_id End_log_pos Info
+SET default_storage_engine= @save_storage_engine;
diff --git a/mysql-test/main/ps_missed_cmds_bin_prot_not_embedded.test b/mysql-test/main/ps_missed_cmds_bin_prot_not_embedded.test
new file mode 100644
index 00000000000..6d87441a476
--- /dev/null
+++ b/mysql-test/main/ps_missed_cmds_bin_prot_not_embedded.test
@@ -0,0 +1,40 @@
+source include/not_embedded.inc;
+--echo #
+--echo # MDEV-16708: Unsupported commands for prepared statements
+--echo #
+
+if (`SELECT $PS_PROTOCOL = 0`)
+{
+ --skip Need ps-protocol
+}
+
+--source include/have_innodb.inc
+
+SET @save_storage_engine= @@default_storage_engine;
+SET default_storage_engine= InnoDB;
+
+--echo # Test case 18: Check that the statements CREATE EVENT/ALTER EVENT/
+--echo # DROP EVENT can be executed as a prepared statement
+
+--echo # Create the event e1 that specifies time in past. Such event is created
+--echo # just for the sake of its existence and never will be triggered.
+--echo # Disable warnings temprorary in order to hide the following warnings
+--echo # generated in result of execution the 'CREATE EVENT' statement:
+--echo # "1544 | Event execution time is in the past. Event has been disabled"
+--echo # "1105 | Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it."
+
+--disable_warnings
+
+CREATE EVENT e1 ON SCHEDULE AT CURRENT_TIMESTAMP - INTERVAL 1 DAY ON COMPLETION PRESERVE DO SET @a=1;
+
+ALTER EVENT e1 COMMENT 'New comment';
+
+DROP EVENT IF EXISTS e1;
+
+--enable_warnings
+
+--echo # Test case 19: Check that the statement 'SHOW RELAYLOG EVENTS' can be
+--echo # executed as a prepared statement.
+SHOW RELAYLOG EVENTS;
+
+SET default_storage_engine= @save_storage_engine;
diff --git a/mysql-test/main/ps_missed_cmds_not_embedded.result b/mysql-test/main/ps_missed_cmds_not_embedded.result
new file mode 100644
index 00000000000..959a78b5591
--- /dev/null
+++ b/mysql-test/main/ps_missed_cmds_not_embedded.result
@@ -0,0 +1,61 @@
+SET @save_storage_engine= @@default_storage_engine;
+SET default_storage_engine= InnoDB;
+#
+# MDEV-16708: Unsupported commands for prepared statements
+#
+# Disable ps-protocol explicitly in order to test support of
+# prepared statements for use case when statements passed
+# to the server via text client-server protocol (in contrast
+# with binary protocol used in the test file
+# ps_missed_cmds_bin_prot.test)
+# Test case 20: Check that the CREATE EVENT/ALTER EVENT/DROP EVENT
+# statements can be executed as a prepared statement
+PREPARE stmt_1 FROM "CREATE EVENT e1 ON SCHEDULE AT CURRENT_TIMESTAMP - INTERVAL 1 DAY ON COMPLETION PRESERVE DO SET @a=1";
+PREPARE stmt_2 FROM "ALTER EVENT e1 COMMENT 'New comment'";
+PREPARE stmt_3 FROM "DROP EVENT e1";
+# Create the event e1 that specifies time in past. Such event is created
+# just for the sake of its existence and never will be triggered.
+# Disable warnings temprorary in order to hide the following warnings
+# generated in result of execution the 'CREATE EVENT' statement:
+# "1544 | Event execution time is in the past. Event has been disabled"
+# "1105 | Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it."
+EXECUTE stmt_1;
+# Execute the same prepared statement the second time to check that
+# no internal structures used for handling the 'CREATE EVENT' statement
+# were damaged. Execution of this statement the second time expectedly
+# results in emitting the error ER_EVENT_ALREADY_EXISTS since the event
+# with the same name has just been created.
+EXECUTE stmt_1;
+ERROR HY000: Event 'e1' already exists
+# Alter event e1
+EXECUTE stmt_2;
+# Execute the same prepared statement the second time to check that
+# no internal structures used for handling the 'ALTER EVENT' statement
+# were damaged.
+EXECUTE stmt_2;
+# Drop event e1
+EXECUTE stmt_3;
+# Execute the same prepared statement the second time to check that
+# no internal structures used for handling the 'DROP EVENT' statement
+# were damaged. Execution of this statement the second time expectedly
+# results in emitting the error ER_EVENT_DOESNT_EXIST since the event
+# with the same name has just been dropped.
+EXECUTE stmt_3;
+ERROR HY000: Unknown event 'e1'
+# Clean up
+DEALLOCATE PREPARE stmt_1;
+DEALLOCATE PREPARE stmt_2;
+DEALLOCATE PREPARE stmt_3;
+# Test case 22: Check that the 'SHOW RELAYLOG EVENTS' statement can be
+# executed as a prepared statement.
+PREPARE stmt_1 FROM 'SHOW RELAYLOG EVENTS';
+EXECUTE stmt_1;
+Log_name Pos Event_type Server_id End_log_pos Info
+# Execute the same prepared statement the second time to check that
+# no internal structures used for handling the 'SHOW RELAYLOG EVENTS'
+# statement were damaged.
+EXECUTE stmt_1;
+Log_name Pos Event_type Server_id End_log_pos Info
+# Clean up
+DEALLOCATE PREPARE stmt_1;
+SET default_storage_engine= @save_storage_engine;
diff --git a/mysql-test/main/ps_missed_cmds_not_embedded.test b/mysql-test/main/ps_missed_cmds_not_embedded.test
new file mode 100644
index 00000000000..2e7eebedf91
--- /dev/null
+++ b/mysql-test/main/ps_missed_cmds_not_embedded.test
@@ -0,0 +1,85 @@
+--source include/not_embedded.inc
+--source include/have_innodb.inc
+
+if (`SELECT $PS_PROTOCOL != 0`)
+{
+ --skip Need regular protocol but ps-protocol was specified
+}
+
+SET @save_storage_engine= @@default_storage_engine;
+SET default_storage_engine= InnoDB;
+
+--echo #
+--echo # MDEV-16708: Unsupported commands for prepared statements
+--echo #
+
+--echo # Disable ps-protocol explicitly in order to test support of
+--echo # prepared statements for use case when statements passed
+--echo # to the server via text client-server protocol (in contrast
+--echo # with binary protocol used in the test file
+--echo # ps_missed_cmds_bin_prot.test)
+--disable_ps_protocol
+
+--echo # Test case 20: Check that the CREATE EVENT/ALTER EVENT/DROP EVENT
+--echo # statements can be executed as a prepared statement
+
+PREPARE stmt_1 FROM "CREATE EVENT e1 ON SCHEDULE AT CURRENT_TIMESTAMP - INTERVAL 1 DAY ON COMPLETION PRESERVE DO SET @a=1";
+
+PREPARE stmt_2 FROM "ALTER EVENT e1 COMMENT 'New comment'";
+
+PREPARE stmt_3 FROM "DROP EVENT e1";
+--echo # Create the event e1 that specifies time in past. Such event is created
+--echo # just for the sake of its existence and never will be triggered.
+--echo # Disable warnings temprorary in order to hide the following warnings
+--echo # generated in result of execution the 'CREATE EVENT' statement:
+--echo # "1544 | Event execution time is in the past. Event has been disabled"
+--echo # "1105 | Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it."
+
+--disable_warnings
+EXECUTE stmt_1;
+
+--echo # Execute the same prepared statement the second time to check that
+--echo # no internal structures used for handling the 'CREATE EVENT' statement
+--echo # were damaged. Execution of this statement the second time expectedly
+--echo # results in emitting the error ER_EVENT_ALREADY_EXISTS since the event
+--echo # with the same name has just been created.
+--error ER_EVENT_ALREADY_EXISTS
+EXECUTE stmt_1;
+
+--enable_warnings
+
+--echo # Alter event e1
+EXECUTE stmt_2;
+--echo # Execute the same prepared statement the second time to check that
+--echo # no internal structures used for handling the 'ALTER EVENT' statement
+--echo # were damaged.
+EXECUTE stmt_2;
+
+--echo # Drop event e1
+EXECUTE stmt_3;
+--echo # Execute the same prepared statement the second time to check that
+--echo # no internal structures used for handling the 'DROP EVENT' statement
+--echo # were damaged. Execution of this statement the second time expectedly
+--echo # results in emitting the error ER_EVENT_DOESNT_EXIST since the event
+--echo # with the same name has just been dropped.
+--error ER_EVENT_DOES_NOT_EXIST
+EXECUTE stmt_3;
+--echo # Clean up
+DEALLOCATE PREPARE stmt_1;
+DEALLOCATE PREPARE stmt_2;
+DEALLOCATE PREPARE stmt_3;
+
+--echo # Test case 22: Check that the 'SHOW RELAYLOG EVENTS' statement can be
+--echo # executed as a prepared statement.
+PREPARE stmt_1 FROM 'SHOW RELAYLOG EVENTS';
+EXECUTE stmt_1;
+--echo # Execute the same prepared statement the second time to check that
+--echo # no internal structures used for handling the 'SHOW RELAYLOG EVENTS'
+--echo # statement were damaged.
+EXECUTE stmt_1;
+--echo # Clean up
+DEALLOCATE PREPARE stmt_1;
+
+--enable_warnings
+--enable_ps_protocol
+SET default_storage_engine= @save_storage_engine;
diff --git a/mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test b/mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test
index 3d0cca24474..9e31190c008 100644
--- a/mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test
+++ b/mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test
@@ -15,6 +15,7 @@ if (`SELECT VERSION() NOT LIKE '%embedded%'`)
--skip Test requires: embedded server
}
let $engine_type= MyISAM;
+--enable_prepare_warnings
SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION';
--source suite/funcs_1/datadict/datadict_load.inc
diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_parser_comment.test b/storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_parser_comment.test
index 82d68ae5421..c4bc32d18ce 100644
--- a/storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_parser_comment.test
+++ b/storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_parser_comment.test
@@ -28,6 +28,7 @@ CREATE TABLE diaries (
COMMENT 'parser "TokenBigramSplitSymbolAlphaDigit"'
) DEFAULT CHARSET utf8;
+--enable_prepare_warnings
INSERT INTO diaries (body) VALUES ("will start Groonga!");
INSERT INTO diaries (body) VALUES ("starting Groonga...");
INSERT INTO diaries (body) VALUES ("started Groonga.");
diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_parser_off.test b/storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_parser_off.test
index f62a6a0fe6c..2191a28c483 100644
--- a/storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_parser_off.test
+++ b/storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_parser_off.test
@@ -27,6 +27,7 @@ CREATE TABLE variables (
FULLTEXT INDEX (name) COMMENT 'parser "off"'
) DEFAULT CHARSET=utf8;
+--enable_prepare_warnings
INSERT INTO variables (name) VALUES ("mroonga_database_path_prefix");
INSERT INTO variables (name) VALUES ("mroonga_default_tokenizer");
INSERT INTO variables (name) VALUES ("mroonga_default_wrapper_engine");
diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/t/create_table_parser_comment.test b/storage/mroonga/mysql-test/mroonga/wrapper/t/create_table_parser_comment.test
index 064685d20b9..81342a74f2e 100644
--- a/storage/mroonga/mysql-test/mroonga/wrapper/t/create_table_parser_comment.test
+++ b/storage/mroonga/mysql-test/mroonga/wrapper/t/create_table_parser_comment.test
@@ -28,6 +28,7 @@ create table diaries (
fulltext index body_index (body)
comment 'parser "TokenBigramSplitSymbolAlphaDigit"'
) comment = 'engine "innodb"' default charset utf8;
+--enable_prepare_warnings
insert into diaries (body) values ("will start Groonga!");
insert into diaries (body) values ("starting Groonga...");
insert into diaries (body) values ("started Groonga.");