Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, mysys/mf_keycache.c, mysql-test/t/*myisam*

since previous merge. MARIA_PAGECACHE_READS in maria-preload.test are down a little bit (5%), which must be a good
side-effect of some sql/ change.

1 files changed, 62 insertions, 0 deletions

diff --git a/mysql-test/suite/maria/t/maria-big.test b/mysql-test/suite/maria/t/maria-big.test
new file mode 100644
index 00000000000..aac26ec2e60
--- /dev/null
+++ b/mysql-test/suite/maria/t/maria-big.test
@@ -0,0 +1,62 @@
+# Test of scenarios potentially too big for --valgrind or --mem
+--source include/have_maria.inc
+--source include/big_test.inc
+
+enable_info;
+set storage_engine=maria;
+set global maria_log_file_size=4294967295;
+disable_warnings;
+drop table if exists t1, t2;
+enable_warnings;
+
+#
+# Test generating data with insert select
+# This test case failed once a long time ago
+#
+
+create table t1(a char(3));
+insert into t1 values("abc");
+insert into t1 select "def" from t1;
+insert into t1 select "ghi" from t1;
+insert into t1 select "jkl" from t1;
+insert into t1 select "mno" from t1;
+insert into t1 select "pqr" from t1;
+insert into t1 select "stu" from t1;
+insert into t1 select "vwx" from t1;
+insert into t1 select "yza" from t1;
+insert into t1 select "ceg" from t1;
+insert into t1 select "ikm" from t1;
+insert into t1 select "oqs" from t1;
+select count(*) from t1;
+insert into t1 select "uwy" from t1;
+create table t2 select * from t1;
+select count(*) from t1;
+select count(*) from t2;
+drop table t1, t2;
+
+#
+# Test creating a really big blob (up to 16M)
+#
+
+set @@max_allowed_packet=400000000;
+create table t1 (a int, b longtext);
+insert into t1 values (1,"123456789012345678901234567890"),(2,"09876543210987654321");
+
+let $loop=23;
+while ($loop)
+{
+  update t1 set b=CONCAT(b,b);
+  dec $loop;
+}
+select a,length(b) from t1;
+check table t1;
+let $loop=22;
+while ($loop)
+{
+  update t1 set b=mid(b,1,length(b)/2);
+  dec $loop;
+}
+select a,length(b) from t1;
+check table t1;
+
+drop table t1;