diff options
| author | unknown <guilhem@mysql.com> | 2004-02-28 23:36:41 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-02-28 23:36:41 +0100 |
| commit | 1911544c6969db76f8db111ac79437796348cc00 (patch) | |
| tree | 372e0ba803d0387040691a324ea57032f0ca2b75 /include | |
| parent | e77cb66ed3e79611db142c8876f090bc5ec95f60 (diff) | |
| download | mariadb-git-1911544c6969db76f8db111ac79437796348cc00.tar.gz | |
small after-merge fixes (error messages).
include/mysqld_error.h:
more generic error code
mysql-test/r/func_compress.result:
update after message change
mysql-test/r/loaddata.result:
update after message change
mysql-test/r/warnings.result:
update after message change
sql/share/czech/errmsg.txt:
message change
sql/share/danish/errmsg.txt:
message change
sql/share/dutch/errmsg.txt:
message change
sql/share/english/errmsg.txt:
message change
sql/share/estonian/errmsg.txt:
message change
sql/share/french/errmsg.txt:
message change
sql/share/german/errmsg.txt:
message change
sql/share/greek/errmsg.txt:
message change
sql/share/hungarian/errmsg.txt:
message change
sql/share/italian/errmsg.txt:
message change
sql/share/japanese/errmsg.txt:
message change
sql/share/korean/errmsg.txt:
message change
sql/share/norwegian-ny/errmsg.txt:
message change
sql/share/norwegian/errmsg.txt:
message change
sql/share/polish/errmsg.txt:
message change
sql/share/portuguese/errmsg.txt:
message change
sql/share/romanian/errmsg.txt:
message change
sql/share/russian/errmsg.txt:
message change
sql/share/slovak/errmsg.txt:
message change
sql/share/spanish/errmsg.txt:
message change
sql/share/swedish/errmsg.txt:
message change
sql/share/ukrainian/errmsg.txt:
message change
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysqld_error.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 494f19aa7bd..e95a35bdc51 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -306,5 +306,5 @@ #define ER_WARN_DEPRECATED_SYNTAX 1287 #define ER_NON_UPDATABLE_TABLE 1288 #define ER_FEATURE_DISABLED 1289 -#define ER_SKIP_GRANT_TABLES 1290 +#define ER_OPTION_PREVENTS_STATEMENT 1290 #define ER_ERROR_MESSAGES 291 |