merge 5.0-> 5.1
This commit is contained in:
commit
2bbd677f5b
@ -86,6 +86,15 @@ let $check_std_csets= 1;
|
|||||||
let $check_ucs2_csets= 1;
|
let $check_ucs2_csets= 1;
|
||||||
let $check_utf8_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
|
# Check all charsets/collation combinations
|
||||||
#
|
#
|
||||||
|
Loading…
x
Reference in New Issue
Block a user