diff options
| author | Patrick Crews <patrick.crews@sun.com> | 2009-04-24 13:00:17 -0400 |
|---|---|---|
| committer | Patrick Crews <patrick.crews@sun.com> | 2009-04-24 13:00:17 -0400 |
| commit | 4c566d13051c6757a7ac267c3ee9e0fc6b266c43 (patch) | |
| tree | b30563e29772c8cdc728e44a88588adbe30daf50 /mysql-test/suite/funcs_2 | |
| parent | 4bb4bff1d91c6b7a92edddbd79b9d4bebc750203 (diff) | |
| parent | b7a70c8b3d30db6007b5e731ae2790e9c963d8c9 (diff) | |
| download | mariadb-git-4c566d13051c6757a7ac267c3ee9e0fc6b266c43.tar.gz | |
merge 5.0-> 5.1
Diffstat (limited to 'mysql-test/suite/funcs_2')
| -rw-r--r-- | mysql-test/suite/funcs_2/charset/charset_master.test | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/suite/funcs_2/charset/charset_master.test b/mysql-test/suite/funcs_2/charset/charset_master.test index 09e24e2c246..99ca4564a0b 100644 --- a/mysql-test/suite/funcs_2/charset/charset_master.test +++ b/mysql-test/suite/funcs_2/charset/charset_master.test @@ -86,6 +86,15 @@ let $check_std_csets= 1; let $check_ucs2_csets= 1; let $check_utf8_csets= 1; +# Bug#32784: Timeout in test "innodb_charset": InnoDB much slower +# than other handlers +# NOTE: We turn autocommit off to improve the performance of the innodb variant +# of this test. Per Innobase's recommendation. + +--disable_query_log +SET autocommit=0; +--enable_query_log + # # Check all charsets/collation combinations # |