diff options
author | Staale Smedseng <staale.smedseng@sun.com> | 2008-11-20 08:51:48 +0100 |
---|---|---|
committer | Staale Smedseng <staale.smedseng@sun.com> | 2008-11-20 08:51:48 +0100 |
commit | e5ae4e2392077508248637981d3276bae8a26e72 (patch) | |
tree | 59c64214e33797199c32b6cd187781eef4dcd755 /mysql-test/r/func_compress.result | |
parent | 36c4b37b16f5f44c97aae330856b742fa708b85f (diff) | |
download | mariadb-git-e5ae4e2392077508248637981d3276bae8a26e72.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.
sql/set_var.cc:
The class sys_var_thd_ulong_session_readonly is introduced as
a specialization of sys_var_thd_ulong implementing a read-only
session variable. The class overrides check() and
check_default() to achieve the read-only property for the
session part of the variable.
sql/set_var.h:
The class sys_var_thd_ulong_session_readonly is introduced as
a specialization of sys_var_thd_ulong implementing a read-only
session variable. The class overrides check() and
check_default() to achieve the read-only property for the
session part of the variable.
sql/share/errmsg.txt:
New error ER_VARIABLE_IS_READONLY.
Diffstat (limited to 'mysql-test/r/func_compress.result')
-rw-r--r-- | mysql-test/r/func_compress.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/func_compress.result b/mysql-test/r/func_compress.result index 715f319198c..def03deb351 100644 --- a/mysql-test/r/func_compress.result +++ b/mysql-test/r/func_compress.result @@ -68,7 +68,7 @@ Warnings: Error 1259 ZLIB: Input data corrupted Error 1256 Uncompressed data size too large; the maximum size is 1048576 (probably, length of uncompressed data was corrupted) drop table t1; -set @@max_allowed_packet=1048576*100; +set @@global.max_allowed_packet=1048576*100; select compress(repeat('aaaaaaaaaa', IF(XXX, 10, 10000000))) is null; compress(repeat('aaaaaaaaaa', IF(XXX, 10, 10000000))) is null 0 |