bk commit into 6.0 tree (gkodinov:1.2626)

[kgeorge]

Below is the list of changes that have just been committed into a local
6.0 repository of gkodinov.  When gkodinov does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-04-03 12:58:19+03:00, gkodinov@stripped +1 -0
  merging 5.1-bugteam to 6.0-bugteam : error codes

  mysql-test/suite/falcon/r/falcon_bug_22972.result@stripped, 2008-04-03 12:58:17+03:00, gkodinov@stripped +1 -1
    merging 5.1-bugteam to 6.0-bugteam : error codes

diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_22972.result b/mysql-test/suite/falcon/r/falcon_bug_22972.result
--- a/mysql-test/suite/falcon/r/falcon_bug_22972.result	2007-12-03 16:22:36 +02:00
+++ b/mysql-test/suite/falcon/r/falcon_bug_22972.result	2008-04-03 12:58:17 +03:00
@@ -5,6 +5,6 @@ DROP TABLE t1;
 ERROR 42S02: Unknown table 't1'
 SHOW WARNINGS;
 Level	Code	Message
-Error	173	Can't execute the given command because you have active locked tables or an active transaction
+Error	177	Can't execute the given command because you have active locked tables or an active transaction
 COMMIT;
 DROP TABLE t1;