bzr commit into MySQL/Maria:mysql-maria branch (guilhem:2718) Bug#42012

[Guilhem Bichot]

#At bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-maria/ based on revid:monty@stripped

 2718 Guilhem Bichot	2009-01-15
      Fix for BUG#42012 "Maria: test maria-recovery2 fails with --embedded" and for simple failures
      of Maria tests with --big (back-ports from 6.0-maria)
modified:
  mysql-test/suite/maria/r/maria-big.result
  mysql-test/suite/maria/r/maria-recovery-big.result
  mysql-test/suite/maria/t/maria-big.test
  mysql-test/suite/maria/t/maria-recovery-big-master.opt
  mysql-test/suite/maria/t/maria-recovery-big.test
  mysql-test/suite/maria/t/maria-recovery2-master.opt

per-file messages:
  mysql-test/suite/maria/r/maria-big.result
    result update
  mysql-test/suite/maria/r/maria-recovery-big.result
    result update
  mysql-test/suite/maria/t/maria-big.test
    this test didn't work anymore due to changes in 5.1 around max_allowed_packet allowed settings
    (fix back-ported from 6.0-maria)
  mysql-test/suite/maria/t/maria-recovery-big-master.opt
    this test didn't work anymore due to changes in 5.1 around max_allowed_packet allowed settings
    (fix back-ported from 6.0-maria)
  mysql-test/suite/maria/t/maria-recovery-big.test
    this test didn't work anymore due to changes in 5.1 around max_allowed_packet allowed settings
    (fix back-ported from 6.0-maria)
  mysql-test/suite/maria/t/maria-recovery2-master.opt
    Fix for BUG#42012 "Maria: test maria-recovery2 fails with --embedded": file is updated like
    maria-recovery-master.opt had already been in guilhem@stripped
=== modified file 'mysql-test/suite/maria/r/maria-big.result'
--- a/mysql-test/suite/maria/r/maria-big.result	2008-10-01 12:13:39 +0000
+++ b/mysql-test/suite/maria/r/maria-big.result	2009-01-15 14:29:14 +0000
@@ -1,3 +1,4 @@
+set global max_allowed_packet=400000000;
 set storage_engine=maria;
 affected rows: 0
 set global maria_log_file_size=4294967295;
@@ -61,8 +62,6 @@ count(*)
 affected rows: 1
 drop table t1, t2;
 affected rows: 0
-set @@max_allowed_packet=400000000;
-affected rows: 0
 create table t1 (a int, b longtext);
 affected rows: 0
 insert into t1 values (1,"123456789012345678901234567890"),(2,"09876543210987654321");

=== modified file 'mysql-test/suite/maria/r/maria-recovery-big.result'
--- a/mysql-test/suite/maria/r/maria-recovery-big.result	2008-10-01 12:13:39 +0000
+++ b/mysql-test/suite/maria/r/maria-recovery-big.result	2009-01-15 14:29:14 +0000
@@ -4,7 +4,6 @@ create database mysqltest;
 use mysqltest;
 * TEST of recovery with blobs
 * shut down mysqld, removed logs, restarted it
-set @@max_allowed_packet=32000000;
 create table t1 (a int, b longtext) engine=maria table_checksum=1;
 * copied t1 for feeding_recovery
 insert into t1 values (1,"123456789012345678901234567890"),(2,"09876543210987654321");

=== modified file 'mysql-test/suite/maria/t/maria-big.test'
--- a/mysql-test/suite/maria/t/maria-big.test	2008-10-01 12:13:39 +0000
+++ b/mysql-test/suite/maria/t/maria-big.test	2009-01-15 14:29:14 +0000
@@ -2,6 +2,11 @@
 --source include/have_maria.inc
 --source include/big_test.inc
 
+set global max_allowed_packet=400000000;
+# need new session to use setting above
+connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
+connection root;
+
 enable_info;
 set storage_engine=maria;
 set global maria_log_file_size=4294967295;
@@ -38,7 +43,6 @@ 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");
 

=== modified file 'mysql-test/suite/maria/t/maria-recovery-big-master.opt'
--- a/mysql-test/suite/maria/t/maria-recovery-big-master.opt	2008-10-01 12:13:39 +0000
+++ b/mysql-test/suite/maria/t/maria-recovery-big-master.opt	2009-01-15 14:29:14 +0000
@@ -1 +1 @@
---skip-stack-trace --skip-core-file
+--skip-stack-trace --skip-core-file --max_allowed_packet=32000000

=== modified file 'mysql-test/suite/maria/t/maria-recovery-big.test'
--- a/mysql-test/suite/maria/t/maria-recovery-big.test	2008-10-01 12:13:39 +0000
+++ b/mysql-test/suite/maria/t/maria-recovery-big.test	2009-01-15 14:29:14 +0000
@@ -33,7 +33,6 @@ use mysqltest;
 
 --echo * TEST of recovery with blobs
 -- source include/maria_empty_logs.inc
-set @@max_allowed_packet=32000000;
 create table t1 (a int, b longtext) engine=maria table_checksum=1;
 let $mms_tables=1;
 -- source include/maria_make_snapshot_for_feeding_recovery.inc

=== modified file 'mysql-test/suite/maria/t/maria-recovery2-master.opt'
--- a/mysql-test/suite/maria/t/maria-recovery2-master.opt	2008-10-01 12:13:39 +0000
+++ b/mysql-test/suite/maria/t/maria-recovery2-master.opt	2009-01-15 14:29:14 +0000
@@ -1 +1 @@
---skip-stack-trace --skip-core-file --maria-log-dir-path=../tmp
+--skip-stack-trace --skip-core-file --loose-maria-log-dir-path=$MYSQLTEST_VARDIR/tmp