Clean up a test

2 files changed, 1 insertions, 14 deletions

diff --git a/mysql-test/suite/innodb/r/innodb_prefix_index_restart_server.result b/mysql-test/suite/innodb/r/innodb_prefix_index_restart_server.result
index 6fe101c58d7..ccb2e4f012e 100644
--- a/mysql-test/suite/innodb/r/innodb_prefix_index_restart_server.result
+++ b/mysql-test/suite/innodb/r/innodb_prefix_index_restart_server.result
@@ -87,6 +87,3 @@ worklog5743;
 col_1_text = REPEAT("a", 3500)	col_2_text  = REPEAT("o", 3500)
 1	1
 DROP TABLE worklog5743;
-SET GLOBAL innodb_large_prefix=1;
-Warnings:
-Warning	131	Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See https://mariadb.com/kb/en/library/xtradbinnodb-file-format/
diff --git a/mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test b/mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test
index 7fb4037e6bb..520ec43bb85 100644
--- a/mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test
+++ b/mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test
@@ -10,13 +10,8 @@
 #                                                                    #
 ######################################################################
 
-# Don't test this under valgrind, memory leaks will occur due restart
---source include/not_valgrind.inc
-# Test restart the server and "shutdown_server" looks for pid file
-# which is not there with embedded mode
+# Embedded server tests do not support restarting
 --source include/not_embedded.inc
-# Save innodb variables
-let $innodb_large_prefix_orig=`select @@innodb_large_prefix`;
 
 set global innodb_large_prefix=1;
 
@@ -97,8 +92,3 @@ SELECT col_1_text = REPEAT("a", 3500) , col_2_text  = REPEAT("o", 3500) FROM
 worklog5743;
 
 DROP TABLE worklog5743;
-
-
-#------------------------------------------------------------------------------
-
-eval SET GLOBAL innodb_large_prefix=$innodb_large_prefix_orig;