diff options
| author | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-03-19 13:07:30 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-03-19 13:07:30 +0300 |
| commit | 5e7238e76ea85683bcf809edc52b1bc73ed0093c (patch) | |
| tree | 057ab318f95abd464e26aad2497c3c5557d85dab | |
| parent | a910db2b91e8b79745a74d49ac0991abf6f5f07c (diff) | |
| parent | a82402dd6fd603168d5c23c3d0d424b64fdfee9d (diff) | |
| download | mariadb-git-5e7238e76ea85683bcf809edc52b1bc73ed0093c.tar.gz | |
Automerge.
| -rw-r--r-- | mysql-test/r/mysql.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/mysql.test | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index a6087e0134b..cef5e08ec6b 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -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 diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index 69612a07ae0..54b204d3821 100644 --- a/mysql-test/t/mysql.test +++ b/mysql-test/t/mysql.test @@ -346,12 +346,16 @@ remove_file $MYSQLTEST_VARDIR/tmp/bug31060.sql; # 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); @@ -365,7 +369,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 |