mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 22:34:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Automerge.

Browse source
This commit is contained in:
Alexey Kopytov 2009-03-19 13:04:20 +03:00
commit 4b7477b976
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/r/mysql.result
View file

@ -194,7 +194,6 @@ delimiter
1 1
set @old_max_allowed_packet = @@global.max_allowed_packet; set @old_max_allowed_packet = @@global.max_allowed_packet;
set @@global.max_allowed_packet = 2 * 1024 * 1024 + 1024; set @@global.max_allowed_packet = 2 * 1024 * 1024 + 1024;
set @@max_allowed_packet = @@global.max_allowed_packet;
CREATE TABLE t1(data LONGBLOB); CREATE TABLE t1(data LONGBLOB);
INSERT INTO t1 SELECT REPEAT('1', 2*1024*1024); INSERT INTO t1 SELECT REPEAT('1', 2*1024*1024);
SELECT LENGTH(data) FROM t1; SELECT LENGTH(data) FROM t1;
@ -202,7 +201,6 @@ LENGTH(data)
2097152 2097152
DROP TABLE t1; DROP TABLE t1;
set @@global.max_allowed_packet = @old_max_allowed_packet; set @@global.max_allowed_packet = @old_max_allowed_packet;
set @@max_allowed_packet = @@global.max_allowed_packet;
End of 5.0 tests End of 5.0 tests
WARNING: --server-arg option not supported in this configuration. WARNING: --server-arg option not supported in this configuration.
Warning (Code 1286): Unknown table engine 'nonexistent' Warning (Code 1286): Unknown table engine 'nonexistent'

14
mysql-test/t/mysql.test
View file

@ -337,12 +337,16 @@ remove_file $MYSQLTEST_VARDIR/tmp/bug31060.sql;
# mysqldump/import # mysqldump/import
# #
# Have to change the global variable as the mysql client will use # Have to change the global variable as the session variable is
# a separate session # read-only.
set @old_max_allowed_packet = @@global.max_allowed_packet; set @old_max_allowed_packet = @@global.max_allowed_packet;
# 2 MB blob length + some space for the rest of INSERT query # 2 MB blob length + some space for the rest of INSERT query
set @@global.max_allowed_packet = 2 * 1024 * 1024 + 1024; 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); CREATE TABLE t1(data LONGBLOB);
INSERT INTO t1 SELECT REPEAT('1', 2*1024*1024); INSERT INTO t1 SELECT REPEAT('1', 2*1024*1024);
@ -356,8 +360,10 @@ SELECT LENGTH(data) FROM t1;
remove_file $MYSQLTEST_VARDIR/tmp/bug41486.sql; remove_file $MYSQLTEST_VARDIR/tmp/bug41486.sql;
DROP TABLE t1; DROP TABLE t1;
connection default;
disconnect con1;
set @@global.max_allowed_packet = @old_max_allowed_packet; set @@global.max_allowed_packet = @old_max_allowed_packet;
set @@max_allowed_packet = @@global.max_allowed_packet;
--echo End of 5.0 tests --echo End of 5.0 tests