diff options
| author | Gleb Shchepa <gshchepa@mysql.com> | 2009-04-14 19:19:15 +0500 |
|---|---|---|
| committer | Gleb Shchepa <gshchepa@mysql.com> | 2009-04-14 19:19:15 +0500 |
| commit | 5156c2d294574444de112d80c87414afce063bc0 (patch) | |
| tree | 95479de090ac195363f3336c8cbeb0ad9a8187b1 | |
| parent | 0141da0444ede35ff5a52dda2e6ffbef9cb95003 (diff) | |
| download | mariadb-git-5156c2d294574444de112d80c87414afce063bc0.tar.gz | |
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!"
| -rw-r--r-- | mysql-test/r/repair.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/varbinary.result | 2 | ||||
| -rw-r--r-- | sql/share/errmsg.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/repair.result b/mysql-test/r/repair.result index 0cb2dff6f64..5bb3dd76fed 100644 --- a/mysql-test/r/repair.result +++ b/mysql-test/r/repair.result @@ -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 diff --git a/mysql-test/r/varbinary.result b/mysql-test/r/varbinary.result index 271d7a0fe8d..b623ea1d86e 100644 --- a/mysql-test/r/varbinary.result +++ b/mysql-test/r/varbinary.result @@ -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 diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index aa1521acab6..f9b66990e93 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -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" |