summaryrefslogtreecommitdiff
path: root/mysql-test/main/huge_frm-6224.test
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2019-09-02 14:06:56 +0300
committerMonty <monty@mariadb.org>2019-09-03 13:17:32 +0300
commita071e0e029cd7c155cff1054d9f7f8a6aa898620 (patch)
treeb592c10cb8ca3036688ea19039208eadd485fe7c /mysql-test/main/huge_frm-6224.test
parentb0ff5a6a7393c057cd201aff63279e45d3e0cc49 (diff)
parent9cba6c5aa3b15fffc0ca10e92bcb55a126a20701 (diff)
downloadmariadb-git-a071e0e029cd7c155cff1054d9f7f8a6aa898620.tar.gz
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/huge_frm-6224.test')
-rw-r--r--mysql-test/main/huge_frm-6224.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/huge_frm-6224.test b/mysql-test/main/huge_frm-6224.test
index 322abd01738..e53c0a4c6e3 100644
--- a/mysql-test/main/huge_frm-6224.test
+++ b/mysql-test/main/huge_frm-6224.test
@@ -4,6 +4,7 @@
# verify that huge frms are rejected during creation, not on opening
#
--source include/have_partition.inc
+set @save_max_allowed_packet=@@max_allowed_packet;
set global max_allowed_packet=1024*1024*10;
connect con1,localhost,root;
@@ -23,5 +24,4 @@ eval $a partition foo);
connection default;
disconnect con1;
-set global max_allowed_packet=default;
-
+set global max_allowed_packet=@save_max_allowed_packet;