bzr push into mysql-5.1-bugteam branch (gshchepa:2874 to 2875) Bug#42563

[Gleb Shchepa]

 2875 Gleb Shchepa	2009-04-14
      Bug #42563: Message tells me to repair table though Storage
                  Engine doesn't allow me to.
      
      In case of incompatible changes between old and new table
      versions, the mysqlcheck program prints error messages like
      this:
        error: Table upgrade required. Please do
               "REPAIR TABLE `table_name`" to fix it!
      
      However, InnoDB doesn't support REPAIR TABLE query, so the
      message is confusing.
      
      
      Error message text has been changed to:
      
        Table upgrade required. Please do "REPAIR TABLE `table_name`"
        or dump/reload to fix it!"
     @ mysql-test/r/repair.result
        Updated test case for bug #42563.
     @ mysql-test/r/varbinary.result
        Updated test case for bug #42563.
     @ sql/share/errmsg.txt
        Bug #42563: Message tells me to repair table though Storage
                    Engine doesn't allow me to.
        
        The ER_TABLE_NEEDS_UPGRADE error message has been changed to:
        
          Table upgrade required. Please do "REPAIR TABLE ``%-.32s`"
          or dump/reload to fix it!"

    modified:
      mysql-test/r/repair.result
      mysql-test/r/varbinary.result
      sql/share/errmsg.txt
 2874 Narayanan V	2009-04-14
      Importing test cases for IBMDB2I
      
      The current patch
      
      -- Adds the ibmdb2i suite
      -- related include(.inc) files
      -- tests for Bug#44020 and Bug#44025

    added:
      mysql-test/suite/ibmdb2i/
      mysql-test/suite/ibmdb2i/include/
      mysql-test/suite/ibmdb2i/include/have_i61.inc
      mysql-test/suite/ibmdb2i/include/have_ibmdb2i.inc
      mysql-test/suite/ibmdb2i/r/
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44020.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44025.result
      mysql-test/suite/ibmdb2i/t/
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44020.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44025.test
=== modified file 'mysql-test/r/repair.result'
--- a/mysql-test/r/repair.result	2009-02-27 15:06:23 +0000
+++ b/mysql-test/r/repair.result	2009-04-14 14:19:15 +0000
@@ -126,7 +126,7 @@ id
 # Run CHECK TABLE, it should indicate table need a REPAIR TABLE
 CHECK TABLE t1 FOR UPGRADE;
 Table	Op	Msg_type	Msg_text
-test.t1	check	error	Table upgrade required. Please do "REPAIR TABLE `t1`" to fix it!
+test.t1	check	error	Table upgrade required. Please do "REPAIR TABLE `t1`" or dump/reload to fix it!
 # REPAIR old table USE_FRM should fail
 REPAIR TABLE t1 USE_FRM;
 Table	Op	Msg_type	Msg_text

=== modified file 'mysql-test/r/varbinary.result'
--- a/mysql-test/r/varbinary.result	2008-07-14 10:50:31 +0000
+++ b/mysql-test/r/varbinary.result	2009-04-14 14:19:15 +0000
@@ -38,7 +38,7 @@ length(a)	length(b)
 255	3
 CHECK TABLE t1 FOR UPGRADE;
 Table	Op	Msg_type	Msg_text
-test.t1	check	error	Table upgrade required. Please do "REPAIR TABLE `t1`" to fix it!
+test.t1	check	error	Table upgrade required. Please do "REPAIR TABLE `t1`" or dump/reload to fix it!
 REPAIR TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK

=== modified file 'sql/share/errmsg.txt'
--- a/sql/share/errmsg.txt	2009-03-05 11:20:01 +0000
+++ b/sql/share/errmsg.txt	2009-04-14 14:19:15 +0000
@@ -5614,7 +5614,7 @@ ER_SP_WRONG_NAME 42000
         eng "Incorrect routine name '%-.192s'"
         ger "Ung�ltiger Routinenname '%-.192s'"
 ER_TABLE_NEEDS_UPGRADE
-        eng "Table upgrade required. Please do \"REPAIR TABLE `%-.32s`\" to fix it!"
+        eng "Table upgrade required. Please do \"REPAIR TABLE `%-.32s`\" or dump/reload to fix it!"
         ger "Tabellenaktualisierung erforderlich. Bitte zum Reparieren \"REPAIR TABLE `%-.32s`\" eingeben!"
 ER_SP_NO_AGGREGATE 42000
         eng "AGGREGATE is not supported for stored functions"

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