diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2009-02-12 15:08:56 +0100 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2009-02-12 15:08:56 +0100 |
| commit | 704b4845aa9ce51a6c5a9f5f42265e376db0dfb3 (patch) | |
| tree | 73476f970c229f75846855edeeddfbc6fd87ed4b /mysql-test/suite/maria/r/maria-purge.result | |
| parent | 2637dda66845868fe996e60e54996acf03f6c537 (diff) | |
| parent | a5e5b0180a6b86cce258eef232ef59d6e7c40bb0 (diff) | |
| download | mariadb-git-704b4845aa9ce51a6c5a9f5f42265e376db0dfb3.tar.gz | |
merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.
There were so many changes into mtr (this is the new mtr coming) that I rather
copied mtr from 6.0-main here (at least this one knows how to run Maria tests).
I also fixed suite/maria tests to be accepted by the new mtr.
mysys/thr_mutex.c:
adding DBUG_PRINT here, so that we can locate where the warning is issued.
Diffstat (limited to 'mysql-test/suite/maria/r/maria-purge.result')
| -rw-r--r-- | mysql-test/suite/maria/r/maria-purge.result | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/mysql-test/suite/maria/r/maria-purge.result b/mysql-test/suite/maria/r/maria-purge.result index 14cf51948a8..eb67bab8cde 100644 --- a/mysql-test/suite/maria/r/maria-purge.result +++ b/mysql-test/suite/maria/r/maria-purge.result @@ -38,13 +38,13 @@ set global maria_log_file_size=16777216; set global maria_checkpoint_interval=30; SHOW ENGINE maria logs; Type Name Status -MARIA master-data/maria_log.00000002 in use +MARIA maria_log.00000002 in use insert into t2 select * from t1; insert into t1 select * from t2; set global maria_checkpoint_interval=30; SHOW ENGINE maria logs; Type Name Status -MARIA master-data/maria_log.00000004 in use +MARIA maria_log.00000004 in use set global maria_log_file_size=16777216; select @@global.maria_log_file_size; @@global.maria_log_file_size @@ -52,7 +52,7 @@ select @@global.maria_log_file_size; set global maria_checkpoint_interval=30; SHOW ENGINE maria logs; Type Name Status -MARIA master-data/maria_log.00000004 in use +MARIA maria_log.00000004 in use set global maria_log_file_size=8388608; select @@global.maria_log_file_size; @@global.maria_log_file_size @@ -62,32 +62,32 @@ insert into t1 select * from t2; set global maria_checkpoint_interval=30; SHOW ENGINE maria logs; Type Name Status -MARIA master-data/maria_log.00000004 free -MARIA master-data/maria_log.00000005 free -MARIA master-data/maria_log.00000006 free -MARIA master-data/maria_log.00000007 free -MARIA master-data/maria_log.00000008 in use +MARIA maria_log.00000004 free +MARIA maria_log.00000005 free +MARIA maria_log.00000006 free +MARIA maria_log.00000007 free +MARIA maria_log.00000008 in use flush logs; SHOW ENGINE maria logs; Type Name Status -MARIA master-data/maria_log.00000008 in use +MARIA maria_log.00000008 in use set global maria_log_file_size=16777216; set global maria_log_purge_type=external; insert into t1 select * from t2; set global maria_checkpoint_interval=30; SHOW ENGINE maria logs; Type Name Status -MARIA master-data/maria_log.00000008 free -MARIA master-data/maria_log.00000009 in use +MARIA maria_log.00000008 free +MARIA maria_log.00000009 in use flush logs; SHOW ENGINE maria logs; Type Name Status -MARIA master-data/maria_log.00000008 free -MARIA master-data/maria_log.00000009 in use +MARIA maria_log.00000008 free +MARIA maria_log.00000009 in use set global maria_log_purge_type=immediate; insert into t1 select * from t2; set global maria_checkpoint_interval=30; SHOW ENGINE maria logs; Type Name Status -MARIA master-data/maria_log.00000011 in use +MARIA maria_log.00000011 in use drop table t1, t2; |