diff options
| author | Mattias Jonsson <mattiasj@mysql.com> | 2008-09-01 13:25:19 +0200 |
|---|---|---|
| committer | Mattias Jonsson <mattiasj@mysql.com> | 2008-09-01 13:25:19 +0200 |
| commit | 47c3b2e12bac01a3322f0ebc0ede10ae8bc976f3 (patch) | |
| tree | e29c39cc3b857ddb2923424bf979cb6ab7597e4b | |
| parent | d726a4998495e150fc74f0b8d1e469c08d324840 (diff) | |
| download | mariadb-git-47c3b2e12bac01a3322f0ebc0ede10ae8bc976f3.tar.gz | |
Bug#38120: main.partition fails sporadically
sporadic failures due to full disk.
Fix by truncating general_log before altering it.
(if running the full main-test, it can be big).
mysql-test/r/partition.result:
Bug#38120: main.partition fails sporadically
updated result file
mysql-test/t/partition.test:
Bug#38120: main.partition fails sporadically
Truncating general_log before altering it.
(if running the full main-test, it can be big
when altering it).
| -rw-r--r-- | mysql-test/r/partition.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/partition.test | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result index a441a841a07..ce1e2954a52 100644 --- a/mysql-test/r/partition.result +++ b/mysql-test/r/partition.result @@ -1448,13 +1448,15 @@ create trigger t_ad after delete on t for each row insert into t values (old.s1) insert into t values (1); drop table t; USE mysql; +TRUNCATE TABLE general_log; +SET @old_general_log_state = @@global.general_log; SET GLOBAL general_log = 0; ALTER TABLE general_log ENGINE = MyISAM; ALTER TABLE general_log PARTITION BY RANGE (TO_DAYS(event_time)) (PARTITION p0 VALUES LESS THAN (733144), PARTITION p1 VALUES LESS THAN (3000000)); ERROR HY000: Incorrect usage of PARTITION and log table ALTER TABLE general_log ENGINE = CSV; -SET GLOBAL general_log = default; +SET GLOBAL general_log = @old_general_log_state; use test; create table t2 (b int); create table t1 (b int) diff --git a/mysql-test/t/partition.test b/mysql-test/t/partition.test index 5270eced05f..64d8f7096d0 100644 --- a/mysql-test/t/partition.test +++ b/mysql-test/t/partition.test @@ -1589,13 +1589,15 @@ drop table t; # USE mysql; +TRUNCATE TABLE general_log; +SET @old_general_log_state = @@global.general_log; SET GLOBAL general_log = 0; ALTER TABLE general_log ENGINE = MyISAM; --error ER_WRONG_USAGE ALTER TABLE general_log PARTITION BY RANGE (TO_DAYS(event_time)) (PARTITION p0 VALUES LESS THAN (733144), PARTITION p1 VALUES LESS THAN (3000000)); ALTER TABLE general_log ENGINE = CSV; -SET GLOBAL general_log = default; +SET GLOBAL general_log = @old_general_log_state; use test; # |