diff options
author | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-09-02 18:58:17 +0200 |
---|---|---|
committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-09-02 18:58:17 +0200 |
commit | 588e9930b4067bd712ca30c063ccb09dbcfc6c40 (patch) | |
tree | 5558803a46329d136748a32e38c66c6ff19b5b09 /mysql-test/r/innodb_bug42101-nonzero.result | |
parent | d65168fddab05ed08d95eb5fead7cb1aad38edd5 (diff) | |
parent | c4fa4f31ae7389a51d33e871951a236e57f1e19c (diff) | |
download | mariadb-git-588e9930b4067bd712ca30c063ccb09dbcfc6c40.tar.gz |
first merge from main
Diffstat (limited to 'mysql-test/r/innodb_bug42101-nonzero.result')
-rw-r--r-- | mysql-test/r/innodb_bug42101-nonzero.result | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/r/innodb_bug42101-nonzero.result b/mysql-test/r/innodb_bug42101-nonzero.result index 8a14296381c..277dfffdd35 100644 --- a/mysql-test/r/innodb_bug42101-nonzero.result +++ b/mysql-test/r/innodb_bug42101-nonzero.result @@ -11,11 +11,15 @@ set global innodb_commit_concurrency=42; select @@innodb_commit_concurrency; @@innodb_commit_concurrency 42 +set global innodb_commit_concurrency=DEFAULT; +select @@innodb_commit_concurrency; +@@innodb_commit_concurrency +1 set global innodb_commit_concurrency=0; ERROR HY000: Incorrect arguments to SET select @@innodb_commit_concurrency; @@innodb_commit_concurrency -42 +1 set global innodb_commit_concurrency=1; select @@innodb_commit_concurrency; @@innodb_commit_concurrency |