summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysql.result
diff options
context:
space:
mode:
authorAlexey Kopytov <Alexey.Kopytov@sun.com>2009-03-18 11:27:49 +0300
committerAlexey Kopytov <Alexey.Kopytov@sun.com>2009-03-18 11:27:49 +0300
commit2b2533955f94397396153b09952d1a54e6098a63 (patch)
tree6a13287a1d7f06de2d228e4f5268a61034a81630 /mysql-test/r/mysql.result
parent89fbca28135f6e0bc4998381c08a9028f671ca1d (diff)
parent73a7d99331d8fd0819fb9f7a10081e393590a94d (diff)
downloadmariadb-git-2b2533955f94397396153b09952d1a54e6098a63.tar.gz
Manual merge.
Diffstat (limited to 'mysql-test/r/mysql.result')
-rw-r--r--mysql-test/r/mysql.result11
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result
index 5054c3aa76f..dd2c9190c08 100644
--- a/mysql-test/r/mysql.result
+++ b/mysql-test/r/mysql.result
@@ -192,6 +192,17 @@ delimiter
1
1
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;
+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
WARNING: --server-arg option not supported in this configuration.
Warning (Code 1286): Unknown table engine 'nonexistent'