From 76d6ac448d18a9e97ce4be585d79607780e00a49 Mon Sep 17 00:00:00 2001 From: Oleksandr Byelkin Date: Tue, 11 Aug 2015 18:45:38 +0200 Subject: MDEV-6066: Merge new defaults from 5.6 and 5.7 (defaults changed, QC can be stopped with no-zero size) --- mysql-test/r/union.result | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mysql-test/r/union.result') diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result index ef1749eda52..d3498c27f13 100644 --- a/mysql-test/r/union.result +++ b/mysql-test/r/union.result @@ -1281,7 +1281,7 @@ t3 CREATE TABLE `t3` ( drop tables t1,t2,t3; SELECT @tmp_max:= @@global.max_allowed_packet; @tmp_max:= @@global.max_allowed_packet -1048576 +4194304 SET @@global.max_allowed_packet=25000000; Warnings: Warning 1292 Truncated incorrect max_allowed_packet value: '25000000' -- cgit v1.2.1