bzr commit into mysql-5.1-bugteam branch (ramil:2733) Bug#33094

[Ramil Kalimullin]

#At file:///home/ram/mysql/mysql-5.1-bugteam/ based on revid:chad@stripped8rpsfh465go

 2733 Ramil Kalimullin	2009-01-15
      bug#33094: Error in upgrading from 5.0 to 5.1 when table contains triggers
      
      Post-fix test failure: fixed mysqlcheck.test on Windows platforms.
modified:
  mysql-test/r/mysqlcheck.result
  mysql-test/t/mysqlcheck.test

per-file messages:
  mysql-test/r/mysqlcheck.result
    Fixed mysqlcheck.test failure on Windows platforms
      - error message differs, so --replace-result
  mysql-test/t/mysqlcheck.test
    Fixed mysqlcheck.test failure on Windows platforms
      - error message differs, so --replace-result
=== modified file 'mysql-test/r/mysqlcheck.result'
--- a/mysql-test/r/mysqlcheck.result	2009-01-14 14:50:51 +0000
+++ b/mysql-test/r/mysqlcheck.result	2009-01-14 20:14:02 +0000
@@ -146,7 +146,7 @@ CREATE TABLE `я` (a INT);
 SET NAMES DEFAULT;
 mysqlcheck --default-character-set="latin1" --databases test
 test.?
-Error    : Table 'test.?' doesn't exist
+Error    : oops
 error    : Corrupt
 mysqlcheck --default-character-set="utf8" --databases test
 test.я                                            OK

=== modified file 'mysql-test/t/mysqlcheck.test'
--- a/mysql-test/t/mysqlcheck.test	2009-01-14 14:50:51 +0000
+++ b/mysql-test/t/mysqlcheck.test	2009-01-14 20:14:02 +0000
@@ -131,6 +131,8 @@ DROP TABLE `@`;
 CREATE TABLE `я` (a INT);
 SET NAMES DEFAULT;
 --echo mysqlcheck --default-character-set="latin1" --databases test
+# Error returned depends on platform, replace it with "oops"
+--replace_result "Can't find file: './test/@003f.frm' (errno: 22)" "oops" "Table 'test.?' doesn't exist" "oops"
 --exec $MYSQL_CHECK --default-character-set="latin1" --databases test
 --echo mysqlcheck --default-character-set="utf8" --databases test
 --exec $MYSQL_CHECK --default-character-set="utf8" --databases test