From: Alexey Kopytov
Date: March 19 2009 10:02am
Subject: bzr commit into mysql-5.0-bugteam branch (Alexey.Kopytov:2765)
 Bug#41486
List-Archive: http://lists.mysql.com/commits/69727
X-Bug: 41486
Message-Id: <20090319100229.0E193AF7643@mbp.local>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7BIT

#At file:///Users/kaa/src/bzr/bugteam/bug41486/my50-bug41486/ based on revid:alexey.kopytov@stripped

 2765 Alexey Kopytov	2009-03-19
      Fixed test failures in 5.1/6.0 introduced by the patch
      for bug #41486. Session max_allowed_packet is read-only
      as of MySQL 5.1.31. In addition, the global variable
      now has no effect on the current session.
      modified:
        mysql-test/r/mysql.result
        mysql-test/t/mysql.test

=== modified file 'mysql-test/r/mysql.result'
--- a/mysql-test/r/mysql.result	2009-03-18 08:18:24 +0000
+++ b/mysql-test/r/mysql.result	2009-03-19 10:02:23 +0000
@@ -194,7 +194,6 @@ delimiter
 1
 set @old_max_allowed_packet = @@global.max_allowed_packet;
 set @@global.max_allowed_packet = 2 * 1024 * 1024 + 1024;
-set @@max_allowed_packet = @@global.max_allowed_packet;
 CREATE TABLE t1(data LONGBLOB);
 INSERT INTO t1 SELECT REPEAT('1', 2*1024*1024);
 SELECT LENGTH(data) FROM t1;
@@ -202,5 +201,4 @@ LENGTH(data)
 2097152
 DROP TABLE t1;
 set @@global.max_allowed_packet = @old_max_allowed_packet;
-set @@max_allowed_packet = @@global.max_allowed_packet;
 End of 5.0 tests

=== modified file 'mysql-test/t/mysql.test'
--- a/mysql-test/t/mysql.test	2009-03-18 08:18:24 +0000
+++ b/mysql-test/t/mysql.test	2009-03-19 10:02:23 +0000
@@ -336,12 +336,16 @@ remove_file $MYSQLTEST_VARDIR/tmp/bug310
 #             mysqldump/import   
 #  
   
-# Have to change the global variable as the mysql client will use 
-# a separate session 
+# Have to change the global variable as the session variable is 
+# read-only.
 set @old_max_allowed_packet = @@global.max_allowed_packet; 
 # 2 MB blob length + some space for the rest of INSERT query
 set @@global.max_allowed_packet = 2 * 1024 * 1024 + 1024; 
-set @@max_allowed_packet = @@global.max_allowed_packet;
+
+# Create a new connection since the global max_allowed_packet
+# has no effect for the current connection
+connect (con1, localhost, root,,);
+connection con1; 
 
 CREATE TABLE t1(data LONGBLOB);  
 INSERT INTO t1 SELECT REPEAT('1', 2*1024*1024);  
@@ -355,7 +359,9 @@ SELECT LENGTH(data) FROM t1;  
 remove_file $MYSQLTEST_VARDIR/tmp/bug41486.sql; 
 DROP TABLE t1;  
 
+connection default;
+disconnect con1;
+
 set @@global.max_allowed_packet = @old_max_allowed_packet; 
-set @@max_allowed_packet = @@global.max_allowed_packet;
  
 --echo End of 5.0 tests