bzr commit into mysql-trunk branch (vasil.dimov:3015)

[vasil.dimov]

#At file:///usr/local/devel/bzrroot/server/mysql-trunk-innodb/ based on revid:vasil.dimov@stripped

 3015 Vasil Dimov	2010-04-14
      Update mysql-test innodb_bug42101-nonzero to match the latest behavior
      (different error number).

    modified:
      mysql-test/r/innodb_bug42101-nonzero.result
      mysql-test/t/innodb_bug42101-nonzero.test
=== modified file 'mysql-test/r/innodb_bug42101-nonzero.result'
--- a/mysql-test/r/innodb_bug42101-nonzero.result	2010-04-14 11:14:48 +0000
+++ b/mysql-test/r/innodb_bug42101-nonzero.result	2010-04-14 15:24:33 +0000
@@ -1,5 +1,5 @@
 set global innodb_commit_concurrency=0;
-ERROR HY000: Incorrect arguments to SET
+ERROR 42000: Variable 'innodb_commit_concurrency' can't be set to the value of '0'
 select @@innodb_commit_concurrency;
 @@innodb_commit_concurrency
 1
@@ -16,7 +16,7 @@ select @@innodb_commit_concurrency;
 @@innodb_commit_concurrency
 1
 set global innodb_commit_concurrency=0;
-ERROR HY000: Incorrect arguments to SET
+ERROR 42000: Variable 'innodb_commit_concurrency' can't be set to the value of '0'
 select @@innodb_commit_concurrency;
 @@innodb_commit_concurrency
 1

=== modified file 'mysql-test/t/innodb_bug42101-nonzero.test'
--- a/mysql-test/t/innodb_bug42101-nonzero.test	2010-04-14 11:14:48 +0000
+++ b/mysql-test/t/innodb_bug42101-nonzero.test	2010-04-14 15:24:33 +0000
@@ -5,7 +5,7 @@
 
 -- source include/have_innodb.inc
 
---error ER_WRONG_ARGUMENTS
+--error ER_WRONG_VALUE_FOR_VAR
 set global innodb_commit_concurrency=0;
 select @@innodb_commit_concurrency;
 set global innodb_commit_concurrency=1;
@@ -14,7 +14,7 @@ set global innodb_commit_concurrency=42;
 select @@innodb_commit_concurrency;
 set global innodb_commit_concurrency=DEFAULT;
 select @@innodb_commit_concurrency;
---error ER_WRONG_ARGUMENTS
+--error ER_WRONG_VALUE_FOR_VAR
 set global innodb_commit_concurrency=0;
 select @@innodb_commit_concurrency;
 set global innodb_commit_concurrency=1;


Attachment: [text/bzr-bundle] bzr/[e-mail]