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 | 3cf3f9720e641dea71171e915b0057864ddd8f3b (patch) | |
| tree | 73476f970c229f75846855edeeddfbc6fd87ed4b /mysql-test/suite/maria/t/ps_maria.test | |
| parent | 3550ecb5ccb9b2dbfa012eef445a0de5fc36e40f (diff) | |
| parent | e7dfc37dd0c20238bead920a37586a1c01c0bf40 (diff) | |
| download | mariadb-git-3cf3f9720e641dea71171e915b0057864ddd8f3b.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/t/ps_maria.test')
| -rw-r--r-- | mysql-test/suite/maria/t/ps_maria.test | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/suite/maria/t/ps_maria.test b/mysql-test/suite/maria/t/ps_maria.test index d5a756c261e..3bbc4791d5c 100644 --- a/mysql-test/suite/maria/t/ps_maria.test +++ b/mysql-test/suite/maria/t/ps_maria.test @@ -9,7 +9,6 @@ # BEFORE ADDING NEW TEST CASES HERE !!! -- source include/have_maria.inc -set global maria_log_file_size=4294967295; use test; |