summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-03-28 13:32:25 +0300
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-03-28 13:32:25 +0300
commitcd71e11cc825f55efceba44b055af47db88b5116 (patch)
tree33a0cf7628f89dfd0e134a7091478299db5134d1 /mysql-test
parenta3ab0d92defbafb462c7c5c50bab324521558971 (diff)
downloadmariadb-git-cd71e11cc825f55efceba44b055af47db88b5116.tar.gz
Fixed a test failure becase of a new warning caused by the fix for
Bug #11766769
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/shm.result2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/shm.result b/mysql-test/r/shm.result
index c504fe222ef..0e086e000c7 100644
--- a/mysql-test/r/shm.result
+++ b/mysql-test/r/shm.result
@@ -2155,6 +2155,8 @@ mysqld is alive
SET @max_allowed_packet= @@global.max_allowed_packet;
SET @net_buffer_length= @@global.net_buffer_length;
SET GLOBAL max_allowed_packet= 1024;
+Warnings:
+Warning 1105 The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
SET GLOBAL net_buffer_length= 1024;
ERROR 1153 (08S01) at line 1: Got a packet bigger than 'max_allowed_packet' bytes
SET GLOBAL max_allowed_packet= @max_allowed_packet;