diff options
author | unknown <monty@donna.mysql.com> | 2000-11-22 03:45:02 +0200 |
---|---|---|
committer | unknown <monty@donna.mysql.com> | 2000-11-22 03:45:02 +0200 |
commit | b17e202d3c9de45c0424de8ebcb5e3001b1bf625 (patch) | |
tree | 86a351dd4dd65b86a54c5a4cf62c8500e6ae110b /sql/share | |
parent | 7dd56817a5069eb0210c8e590729973cd98a4acb (diff) | |
download | mariadb-git-b17e202d3c9de45c0424de8ebcb5e3001b1bf625.tar.gz |
Split error message for crashed table to 3 different error messages.
Fixes for Windows
Docs/manual.texi:
Added things to the Windows section
client/mysql.cc:
Fixes to get Jani's changes to work on Windows
include/myisam.h:
Added chk_status()
include/mysqld_error.h:
Split error message for crashed table to 3 different error messages
myisam/mi_check.c:
Added chk_status()
myisam/myisamchk.c:
Added chk_status(). This gives us better error messages when the
table is marked as 'crashed'
sql/ha_myisam.cc:
Better error messages if the table is marked as crashed
sql/handler.cc:
Better error messages if the table is marked as crashed
sql/share/czech/errmsg.sys:
Better error messages if the table is marked as crashed
sql/share/czech/errmsg.txt:
Better error messages if the table is marked as crashed
sql/share/danish/errmsg.sys:
Better error messages if the table is marked as crashed
sql/share/danish/errmsg.txt:
Better error messages if the table is marked as crashed
sql/share/dutch/errmsg.sys:
Better error messages if the table is marked as crashed
sql/share/dutch/errmsg.txt:
Better error messages if the table is marked as crashed
sql/share/english/errmsg.sys:
Better error messages if the table is marked as crashed
sql/share/english/errmsg.txt:
Better error messages if the table is marked as crashed
sql/share/estonian/errmsg.sys:
Better error messages if the table is marked as crashed
sql/share/estonian/errmsg.txt:
Better error messages if the table is marked as crashed
sql/share/french/errmsg.sys:
Better error messages if the table is marked as crashed
sql/share/french/errmsg.txt:
Better error messages if the table is marked as crashed
sql/share/german/errmsg.sys:
Better error messages if the table is marked as crashed
sql/share/german/errmsg.txt:
Better error messages if the table is marked as crashed
sql/share/greek/errmsg.sys:
Better error messages if the table is marked as crashed
sql/share/greek/errmsg.txt:
Better error messages if the table is marked as crashed
sql/share/hungarian/errmsg.sys:
Better error messages if the table is marked as crashed
sql/share/hungarian/errmsg.txt:
Better error messages if the table is marked as crashed
sql/share/italian/errmsg.sys:
Better error messages if the table is marked as crashed
sql/share/italian/errmsg.txt:
Better error messages if the table is marked as crashed
sql/share/japanese/errmsg.sys:
Better error messages if the table is marked as crashed
sql/share/japanese/errmsg.txt:
Better error messages if the table is marked as crashed
sql/share/korean/errmsg.sys:
Better error messages if the table is marked as crashed
sql/share/korean/errmsg.txt:
Better error messages if the table is marked as crashed
sql/share/norwegian-ny/errmsg.txt:
Better error messages if the table is marked as crashed
sql/share/norwegian/errmsg.txt:
Better error messages if the table is marked as crashed
sql/share/polish/errmsg.sys:
Better error messages if the table is marked as crashed
sql/share/polish/errmsg.txt:
Better error messages if the table is marked as crashed
sql/share/portuguese/errmsg.sys:
Better error messages if the table is marked as crashed
sql/share/portuguese/errmsg.txt:
Better error messages if the table is marked as crashed
sql/share/romanian/errmsg.txt:
Better error messages if the table is marked as crashed
sql/share/russian/errmsg.sys:
Better error messages if the table is marked as crashed
sql/share/russian/errmsg.txt:
Better error messages if the table is marked as crashed
sql/share/slovak/errmsg.sys:
Better error messages if the table is marked as crashed
sql/share/slovak/errmsg.txt:
Better error messages if the table is marked as crashed
sql/share/spanish/errmsg.sys:
Better error messages if the table is marked as crashed
sql/share/spanish/errmsg.txt:
Better error messages if the table is marked as crashed
sql/share/swedish/errmsg.OLD:
Better error messages if the table is marked as crashed
sql/share/swedish/errmsg.sys:
Better error messages if the table is marked as crashed
sql/share/swedish/errmsg.txt:
Better error messages if the table is marked as crashed
sql/sql_table.cc:
Fix for gcc 2.7.2
Diffstat (limited to 'sql/share')
40 files changed, 46 insertions, 0 deletions
diff --git a/sql/share/czech/errmsg.sys b/sql/share/czech/errmsg.sys Binary files differindex 2d048a6f6ba..39221d1ab69 100644 --- a/sql/share/czech/errmsg.sys +++ b/sql/share/czech/errmsg.sys diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt index 5991b3f36d4..2a61de73ba1 100644 --- a/sql/share/czech/errmsg.txt +++ b/sql/share/czech/errmsg.txt @@ -209,3 +209,5 @@ "-B®ádný sloupec nemá vytvoøen fulltextový index",-A "Can't execute the given command because you have active locked tables or an active transaction", "Unknown system variable '%-.64'", +"Table '%-.64s' is marked as crashed and should be repaired", +"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", diff --git a/sql/share/danish/errmsg.sys b/sql/share/danish/errmsg.sys Binary files differindex af7d44e4c2d..88d1508e210 100644 --- a/sql/share/danish/errmsg.sys +++ b/sql/share/danish/errmsg.sys diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt index 3881a0c525a..e42b9d0e854 100644 --- a/sql/share/danish/errmsg.txt +++ b/sql/share/danish/errmsg.txt @@ -198,3 +198,5 @@ "Can't find FULLTEXT index matching the column list", "Can't execute the given command because you have active locked tables or an active transaction", "Unknown system variable '%-.64'", +"Table '%-.64s' is marked as crashed and should be repaired", +"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", diff --git a/sql/share/dutch/errmsg.sys b/sql/share/dutch/errmsg.sys Binary files differindex 068499d48fd..92a5833e2c6 100644 --- a/sql/share/dutch/errmsg.sys +++ b/sql/share/dutch/errmsg.sys diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt index dd97f0a4007..8b5c6c0e23e 100644 --- a/sql/share/dutch/errmsg.txt +++ b/sql/share/dutch/errmsg.txt @@ -195,3 +195,5 @@ "Can't find FULLTEXT index matching the column list", "Can't execute the given command because you have active locked tables or an active transaction", "Unknown system variable '%-.64'", +"Table '%-.64s' is marked as crashed and should be repaired", +"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", diff --git a/sql/share/english/errmsg.sys b/sql/share/english/errmsg.sys Binary files differindex 620236eafa6..65496eae040 100644 --- a/sql/share/english/errmsg.sys +++ b/sql/share/english/errmsg.sys diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt index e1bbf40d162..67357b2c054 100644 --- a/sql/share/english/errmsg.txt +++ b/sql/share/english/errmsg.txt @@ -195,3 +195,5 @@ "Can't find FULLTEXT index matching the column list", "Can't execute the given command because you have active locked tables or an active transaction", "Unknown system variable '%-.64'", +"Table '%-.64s' is marked as crashed and should be repaired", +"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", diff --git a/sql/share/estonian/errmsg.sys b/sql/share/estonian/errmsg.sys Binary files differindex 44320e52609..42015a12c22 100644 --- a/sql/share/estonian/errmsg.sys +++ b/sql/share/estonian/errmsg.sys diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt index 71ea8bc5b8b..953c435887d 100644 --- a/sql/share/estonian/errmsg.txt +++ b/sql/share/estonian/errmsg.txt @@ -199,3 +199,5 @@ "Can't find FULLTEXT index matching the column list", "Can't execute the given command because you have active locked tables or an active transaction", "Unknown system variable '%-.64'", +"Table '%-.64s' is marked as crashed and should be repaired", +"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", diff --git a/sql/share/french/errmsg.sys b/sql/share/french/errmsg.sys Binary files differindex 33eb8bef15a..e8f430cdf3e 100644 --- a/sql/share/french/errmsg.sys +++ b/sql/share/french/errmsg.sys diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt index 66a717864fd..a8b5da897c6 100644 --- a/sql/share/french/errmsg.txt +++ b/sql/share/french/errmsg.txt @@ -195,3 +195,5 @@ "Can't find FULLTEXT index matching the column list", "Can't execute the given command because you have active locked tables or an active transaction", "Unknown system variable '%-.64'", +"Table '%-.64s' is marked as crashed and should be repaired", +"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", diff --git a/sql/share/german/errmsg.sys b/sql/share/german/errmsg.sys Binary files differindex 755783a4d20..7bfaa5b5b98 100644 --- a/sql/share/german/errmsg.sys +++ b/sql/share/german/errmsg.sys diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt index 580eddc0cb1..19b91670b8f 100644 --- a/sql/share/german/errmsg.txt +++ b/sql/share/german/errmsg.txt @@ -198,3 +198,5 @@ "Kann keinen FULLTEXT-Index finden der der Spaltenliste entspricht", "Can't execute the given command because you have active locked tables or an active transaction", "Unknown system variable '%-.64'", +"Table '%-.64s' is marked as crashed and should be repaired", +"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", diff --git a/sql/share/greek/errmsg.sys b/sql/share/greek/errmsg.sys Binary files differindex ee3ea496c11..b1eaca8eaf4 100644 --- a/sql/share/greek/errmsg.sys +++ b/sql/share/greek/errmsg.sys diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt index f09cf02f6f8..3a1e2fb8c6f 100644 --- a/sql/share/greek/errmsg.txt +++ b/sql/share/greek/errmsg.txt @@ -195,3 +195,5 @@ "Can't find FULLTEXT index matching the column list", "Can't execute the given command because you have active locked tables or an active transaction", "Unknown system variable '%-.64'", +"Table '%-.64s' is marked as crashed and should be repaired", +"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", diff --git a/sql/share/hungarian/errmsg.sys b/sql/share/hungarian/errmsg.sys Binary files differindex dbdd2e67324..6d990595420 100644 --- a/sql/share/hungarian/errmsg.sys +++ b/sql/share/hungarian/errmsg.sys diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt index fd9bc62d093..f69e8ea4ce2 100644 --- a/sql/share/hungarian/errmsg.txt +++ b/sql/share/hungarian/errmsg.txt @@ -197,3 +197,5 @@ "Can't find FULLTEXT index matching the column list", "Can't execute the given command because you have active locked tables or an active transaction", "Unknown system variable '%-.64'", +"Table '%-.64s' is marked as crashed and should be repaired", +"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", diff --git a/sql/share/italian/errmsg.sys b/sql/share/italian/errmsg.sys Binary files differindex c19f29b2d59..a3f51791820 100644 --- a/sql/share/italian/errmsg.sys +++ b/sql/share/italian/errmsg.sys diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt index a84ea10af53..8fd4358784e 100644 --- a/sql/share/italian/errmsg.txt +++ b/sql/share/italian/errmsg.txt @@ -195,3 +195,5 @@ "Impossibile trovare un indice FULLTEXT che corrisponda all'elenco delle colonne", "Can't execute the given command because you have active locked tables or an active transaction", "Unknown system variable '%-.64'", +"Table '%-.64s' is marked as crashed and should be repaired", +"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", diff --git a/sql/share/japanese/errmsg.sys b/sql/share/japanese/errmsg.sys Binary files differindex f437801bf62..78fe9fba669 100644 --- a/sql/share/japanese/errmsg.sys +++ b/sql/share/japanese/errmsg.sys diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt index 123c862144b..71335336cd3 100644 --- a/sql/share/japanese/errmsg.txt +++ b/sql/share/japanese/errmsg.txt @@ -197,3 +197,5 @@ "Can't find FULLTEXT index matching the column list", "Can't execute the given command because you have active locked tables or an active transaction", "Unknown system variable '%-.64'", +"Table '%-.64s' is marked as crashed and should be repaired", +"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", diff --git a/sql/share/korean/errmsg.sys b/sql/share/korean/errmsg.sys Binary files differindex c8d10748959..da8df0b02aa 100644 --- a/sql/share/korean/errmsg.sys +++ b/sql/share/korean/errmsg.sys diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt index d373294295f..f884a1b13f2 100644 --- a/sql/share/korean/errmsg.txt +++ b/sql/share/korean/errmsg.txt @@ -195,3 +195,5 @@ "Can't find FULLTEXT index matching the column list", "Can't execute the given command because you have active locked tables or an active transaction", "Unknown system variable '%-.64'", +"Table '%-.64s' is marked as crashed and should be repaired", +"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt index 5581c951ac3..8de66328a05 100644 --- a/sql/share/norwegian-ny/errmsg.txt +++ b/sql/share/norwegian-ny/errmsg.txt @@ -197,3 +197,5 @@ "Can't find FULLTEXT index matching the column list", "Can't execute the given command because you have active locked tables or an active transaction", "Unknown system variable '%-.64'", +"Table '%-.64s' is marked as crashed and should be repaired", +"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt index d41b71a0ac7..e5554e0bb43 100644 --- a/sql/share/norwegian/errmsg.txt +++ b/sql/share/norwegian/errmsg.txt @@ -197,3 +197,5 @@ "Can't find FULLTEXT index matching the column list", "Can't execute the given command because you have active locked tables or an active transaction", "Unknown system variable '%-.64'", +"Table '%-.64s' is marked as crashed and should be repaired", +"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", diff --git a/sql/share/polish/errmsg.sys b/sql/share/polish/errmsg.sys Binary files differindex ab4ed6adbf9..547e5a5d60d 100644 --- a/sql/share/polish/errmsg.sys +++ b/sql/share/polish/errmsg.sys diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt index 6fbb550ebca..4338fc49971 100644 --- a/sql/share/polish/errmsg.txt +++ b/sql/share/polish/errmsg.txt @@ -199,3 +199,5 @@ "Can't find FULLTEXT index matching the column list", "Can't execute the given command because you have active locked tables or an active transaction", "Unknown system variable '%-.64'", +"Table '%-.64s' is marked as crashed and should be repaired", +"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", diff --git a/sql/share/portuguese/errmsg.sys b/sql/share/portuguese/errmsg.sys Binary files differindex 040cdea0b47..35b3ba1d3cd 100644 --- a/sql/share/portuguese/errmsg.sys +++ b/sql/share/portuguese/errmsg.sys diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt index 62289c3f2b9..ea9346be023 100644 --- a/sql/share/portuguese/errmsg.txt +++ b/sql/share/portuguese/errmsg.txt @@ -195,3 +195,5 @@ "Can't find FULLTEXT index matching the column list", "Can't execute the given command because you have active locked tables or an active transaction", "Unknown system variable '%-.64'", +"Table '%-.64s' is marked as crashed and should be repaired", +"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt index bd1d0618027..7e301bc9b4d 100644 --- a/sql/share/romanian/errmsg.txt +++ b/sql/share/romanian/errmsg.txt @@ -199,3 +199,5 @@ "Can't find FULLTEXT index matching the column list", "Can't execute the given command because you have active locked tables or an active transaction", "Unknown system variable '%-.64'", +"Table '%-.64s' is marked as crashed and should be repaired", +"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", diff --git a/sql/share/russian/errmsg.sys b/sql/share/russian/errmsg.sys Binary files differindex 7d57defb1b8..3d32c61bd35 100644 --- a/sql/share/russian/errmsg.sys +++ b/sql/share/russian/errmsg.sys diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt index e70d4e343cb..79f113030e5 100644 --- a/sql/share/russian/errmsg.txt +++ b/sql/share/russian/errmsg.txt @@ -198,3 +198,5 @@ "FULLTEXT ÉÎÄÅËÓ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÊ ÚÁÄÁÎÎÏÍÕ ÓÐÉÓËÕ ÓÔÏÌÂÃÏ×, ÎÅ ÎÁÊÄÅÎ", "Can't execute the given command because you have active locked tables or an active transaction", "Unknown system variable '%-.64'", +"Table '%-.64s' is marked as crashed and should be repaired", +"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", diff --git a/sql/share/slovak/errmsg.sys b/sql/share/slovak/errmsg.sys Binary files differindex cdcd6e8d39f..d2a4c792794 100644 --- a/sql/share/slovak/errmsg.sys +++ b/sql/share/slovak/errmsg.sys diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt index 24176719e1f..0dbac3a4d98 100644 --- a/sql/share/slovak/errmsg.txt +++ b/sql/share/slovak/errmsg.txt @@ -203,3 +203,5 @@ "Can't find FULLTEXT index matching the column list", "Can't execute the given command because you have active locked tables or an active transaction", "Unknown system variable '%-.64'", +"Table '%-.64s' is marked as crashed and should be repaired", +"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", diff --git a/sql/share/spanish/errmsg.sys b/sql/share/spanish/errmsg.sys Binary files differindex fd0aeb829b1..ebc069aefbd 100644 --- a/sql/share/spanish/errmsg.sys +++ b/sql/share/spanish/errmsg.sys diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt index cdf40b428d9..9393238c365 100644 --- a/sql/share/spanish/errmsg.txt +++ b/sql/share/spanish/errmsg.txt @@ -196,3 +196,5 @@ "Can't find FULLTEXT index matching the column list", "Can't execute the given command because you have active locked tables or an active transaction", "Unknown system variable '%-.64'", +"Table '%-.64s' is marked as crashed and should be repaired", +"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", diff --git a/sql/share/swedish/errmsg.OLD b/sql/share/swedish/errmsg.OLD index bf5c48af10d..6f315fb456b 100644 --- a/sql/share/swedish/errmsg.OLD +++ b/sql/share/swedish/errmsg.OLD @@ -195,3 +195,7 @@ "Hittar inte ett FULLTEXT index i kolumnlistan", "Kan inte exekvera kommandot emedan du har en låst tabell eller an aktiv transaktion", "Okänd system variabel '%-.64'", +#ER_CRASHED_ON_USAGE +"Tabell '%-.64s' är crashad och bör repareras med REPAIR TABLE", +#ER_CRASHED_ON_REPAIR +"Tabell '%-.64s' är crashad och senast (automatiska?) reparation misslyckades", diff --git a/sql/share/swedish/errmsg.sys b/sql/share/swedish/errmsg.sys Binary files differindex aa35854cdbd..cf773e61228 100644 --- a/sql/share/swedish/errmsg.sys +++ b/sql/share/swedish/errmsg.sys diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt index bf5c48af10d..eb4ded6cfb0 100644 --- a/sql/share/swedish/errmsg.txt +++ b/sql/share/swedish/errmsg.txt @@ -195,3 +195,5 @@ "Hittar inte ett FULLTEXT index i kolumnlistan", "Kan inte exekvera kommandot emedan du har en låst tabell eller an aktiv transaktion", "Okänd system variabel '%-.64'", +"Tabell '%-.64s' är crashad och bör repareras med REPAIR TABLE", +"Tabell '%-.64s' är crashad och senast (automatiska?) reparation misslyckades", |