MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Ramil Kalimullin Date:January 14 2009 8:57pm
Subject:bzr push into mysql-5.1-bugteam branch (ramil:2732 to 2733) Bug#33094
View as plain text  
 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

 2732 Chad MILLER	2009-01-14 [merge]
      Merge from bugteam trunk.
added:
  mysql-test/include/check_events_off.inc
  mysql-test/include/no_running_event_scheduler.inc
  mysql-test/include/no_running_events.inc
  mysql-test/include/running_event_scheduler.inc
renamed:
  mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result => mysql-test/suite/funcs_1/r/is_coll_char_set_appl.result
  mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test => mysql-test/suite/funcs_1/t/is_coll_char_set_appl.test
modified:
  client/mysqlcheck.c
  mysql-test/extra/rpl_tests/rpl_auto_increment.test
  mysql-test/r/events_bugs.result
  mysql-test/r/log_state.result
  mysql-test/r/mysqlcheck.result
  mysql-test/r/type_date.result
  mysql-test/suite/rpl/r/rpl_auto_increment.result
  mysql-test/t/events_bugs.test
  mysql-test/t/log_state.test
  mysql-test/t/mysqlcheck.test
  mysql-test/t/type_date.test
  sql/log_event.cc
  sql/mysql_priv.h
  sql/sql_table.cc
  sql/sql_trigger.cc
  sql/sql_trigger.h
  mysql-test/suite/funcs_1/t/is_coll_char_set_appl.test

=== 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:54:25 +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    : Table doesn't exist
 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:54:25 +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 "Table doesn't exist"
+--replace_result "Can't find file: './test/@003f.frm' (errno: 22)" "Table doesn't exist" "Table 'test.?' doesn't exist" "Table doesn't exist"
 --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

Thread
bzr push into mysql-5.1-bugteam branch (ramil:2732 to 2733) Bug#33094Ramil Kalimullin14 Jan