diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-03-28 13:57:54 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-03-28 13:57:54 +0300 |
| commit | b9b40a0c29dfaa74afe85e835b0ee29fadd20433 (patch) | |
| tree | 8a92672c663f91b40cfeb52671a8c886164ac628 /mysql-test/r/shm.result | |
| parent | ce9074b656521d6621e23dfa8244ff360da2fdb3 (diff) | |
| parent | 4ed8cb4a76275a28231a842c9112834d384b7b4c (diff) | |
| download | mariadb-git-b9b40a0c29dfaa74afe85e835b0ee29fadd20433.tar.gz | |
merge mysql-5.1->mysql-5.5
Diffstat (limited to 'mysql-test/r/shm.result')
| -rw-r--r-- | mysql-test/r/shm.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/shm.result b/mysql-test/r/shm.result index 4f57049406d..53b2483d97e 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 1708 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; |