bzr commit into mysql-6.0-bugteam branch (gshchepa:3209)

[Gleb Shchepa]

#At file:///work/bzr/mysql-6.0-bugteam/ based on revid:v.narayanan@stripped96219q2jif

 3209 Gleb Shchepa	2009-04-14 [merge]
      manual merge 5.1-bugteam --> 6.0-bugteam (bug 42563)

    modified:
      mysql-test/r/perror.result
      mysql-test/r/repair.result
      mysql-test/r/varbinary.result
      sql/share/errmsg.txt
=== modified file 'mysql-test/r/perror.result'
--- a/mysql-test/r/perror.result	2008-08-05 23:26:18 +0000
+++ b/mysql-test/r/perror.result	2009-04-14 14:29:45 +0000
@@ -2,5 +2,5 @@ Illegal error code: 10000
 MySQL error code 1062 (ER_DUP_ENTRY): Duplicate entry '%-.192s' for key %d
 MySQL error code 1076 (ER_READY): %s: ready for connections.
 Version: '%s'  socket: '%s'  port: %d
-MySQL error code 1459 (ER_TABLE_NEEDS_UPGRADE): Table upgrade required. Please do "REPAIR TABLE `%-.32s`" to fix it!
+MySQL error code 1459 (ER_TABLE_NEEDS_UPGRADE): Table upgrade required. Please do "REPAIR TABLE `%-.32s`" or dump/reload to fix it!
 MySQL error code 1461 (ER_MAX_PREPARED_STMT_COUNT_REACHED): Can't create more than max_prepared_stmt_count statements (current value: %lu)

=== modified file 'mysql-test/r/repair.result'
--- a/mysql-test/r/repair.result	2009-02-27 15:52:30 +0000
+++ b/mysql-test/r/repair.result	2009-04-14 14:29:45 +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-08-16 05:15:49 +0000
+++ b/mysql-test/r/varbinary.result	2009-04-14 14:29:45 +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-04-01 21:36:07 +0000
+++ b/sql/share/errmsg.txt	2009-04-14 14:29:45 +0000
@@ -5608,7 +5608,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]