diff options
| author | unknown <Dao-Gang.Qu@sun.com> | 2010-01-12 20:07:09 +0800 |
|---|---|---|
| committer | unknown <Dao-Gang.Qu@sun.com> | 2010-01-12 20:07:09 +0800 |
| commit | 16e15e69523c5aebd6642a47b216f736cfd456a2 (patch) | |
| tree | 81fd0ce6bdc321649671cd1240deb0d5b1248e49 /mysql-test/r/innodb_bug42101.result | |
| parent | 4b67a11d2bf201e273be79054b26e90ada15be38 (diff) | |
| parent | 3701208a2e890d42aabc678a2a5d4ea539941b36 (diff) | |
| download | mariadb-git-16e15e69523c5aebd6642a47b216f736cfd456a2.tar.gz | |
Manual merge from next-mr.
Diffstat (limited to 'mysql-test/r/innodb_bug42101.result')
| -rw-r--r-- | mysql-test/r/innodb_bug42101.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/innodb_bug42101.result b/mysql-test/r/innodb_bug42101.result index 805097ffe9d..4e3367d5a54 100644 --- a/mysql-test/r/innodb_bug42101.result +++ b/mysql-test/r/innodb_bug42101.result @@ -3,12 +3,12 @@ select @@innodb_commit_concurrency; @@innodb_commit_concurrency 0 set global innodb_commit_concurrency=1; -ERROR HY000: Incorrect arguments to SET +ERROR 42000: Variable 'innodb_commit_concurrency' can't be set to the value of '1' select @@innodb_commit_concurrency; @@innodb_commit_concurrency 0 set global innodb_commit_concurrency=42; -ERROR HY000: Incorrect arguments to SET +ERROR 42000: Variable 'innodb_commit_concurrency' can't be set to the value of '42' select @@innodb_commit_concurrency; @@innodb_commit_concurrency 0 |