summaryrefslogtreecommitdiff
path: root/mysql-test/r/union.result
diff options
context:
space:
mode:
authorStaale Smedseng <staale.smedseng@sun.com>2008-11-20 08:51:48 +0100
committerStaale Smedseng <staale.smedseng@sun.com>2008-11-20 08:51:48 +0100
commite60c8c8b68d417b8efff48686c84751f3a772c76 (patch)
tree59c64214e33797199c32b6cd187781eef4dcd755 /mysql-test/r/union.result
parentb8cd1725b1ff818fbf464789d75f518fe082dc6d (diff)
downloadmariadb-git-e60c8c8b68d417b8efff48686c84751f3a772c76.tar.gz
A fix for Bug#22891 "session level max_allowed_packet can be
set but is ignored". This patch makes @@session.max_allowed_packed and @@session.net_buffer_length read-only as suggested in the bug report. The user will have to use SET GLOBAL (and reconnect) to alter the session values of these variables. The error string ER_VARIABLE_IS_READONLY is introduced. Tests are modified accordingly.
Diffstat (limited to 'mysql-test/r/union.result')
-rw-r--r--mysql-test/r/union.result8
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result
index 3f99a053df4..2a10f34d081 100644
--- a/mysql-test/r/union.result
+++ b/mysql-test/r/union.result
@@ -1343,10 +1343,10 @@ t3 CREATE TABLE `t3` (
`left(a,100000000)` longtext
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop tables t1,t2,t3;
-SELECT @tmp_max:= @@max_allowed_packet;
-@tmp_max:= @@max_allowed_packet
+SELECT @tmp_max:= @@global.max_allowed_packet;
+@tmp_max:= @@global.max_allowed_packet
1048576
-SET max_allowed_packet=25000000;
+SET @@global.max_allowed_packet=25000000;
CREATE TABLE t1 (a mediumtext);
CREATE TABLE t2 (b varchar(20));
INSERT INTO t1 VALUES ('a');
@@ -1384,7 +1384,7 @@ t3 CREATE TABLE `t3` (
`a` varbinary(510) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLES t1,t2,t3;
-SET max_allowed_packet:= @tmp_max;
+SET @@global.max_allowed_packet:= @tmp_max;
create table t1 ( id int not null auto_increment, primary key (id), col1 int);
insert into t1 (col1) values (2),(3),(4),(5),(6);
select 99 union all select id from t1 order by 1;