diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2009-01-15 15:29:14 +0100 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2009-01-15 15:29:14 +0100 |
| commit | ae3aaa5eb67ccaec2c106ff975360f861e1b2b00 (patch) | |
| tree | 3b07a57a1a56ddb4409904e4639bcec7a0f6bd52 /mysql-test/suite/maria/r | |
| parent | 7dc83c50436a36280e99f9c71006b05452d0b9fe (diff) | |
| download | mariadb-git-ae3aaa5eb67ccaec2c106ff975360f861e1b2b00.tar.gz | |
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)
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@mysql.com-20080701204709-pa4megwfvllq3s7g
Diffstat (limited to 'mysql-test/suite/maria/r')
| -rw-r--r-- | mysql-test/suite/maria/r/maria-big.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/maria/r/maria-recovery-big.result | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/mysql-test/suite/maria/r/maria-big.result b/mysql-test/suite/maria/r/maria-big.result index b45816367a5..aca08b4df72 100644 --- a/mysql-test/suite/maria/r/maria-big.result +++ b/mysql-test/suite/maria/r/maria-big.result @@ -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"); diff --git a/mysql-test/suite/maria/r/maria-recovery-big.result b/mysql-test/suite/maria/r/maria-recovery-big.result index ecbcba9ff82..ecc53de437e 100644 --- a/mysql-test/suite/maria/r/maria-recovery-big.result +++ b/mysql-test/suite/maria/r/maria-recovery-big.result @@ -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"); |