diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-10-31 03:22:31 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-10-31 03:22:31 +0200 |
| commit | 4765ab612ca4f5ee35c413437f7da04889bd0a14 (patch) | |
| tree | a7cd1bf6f7f295d11ffce88081f69bc1963bfd06 /include | |
| parent | bacf546eaaa2666a1634ea224af2c53cb17dcfb9 (diff) | |
| download | mariadb-git-4765ab612ca4f5ee35c413437f7da04889bd0a14.tar.gz | |
Update for OS2 (patch from Yuri Dario).
Use LONG_TIMEOUT (one year) instead of ~0 for long timeouts
Fixed error messages.
Fixed problem with const propagation when comparing columns of different types
BitKeeper/deleted/.del-.cvsignore~a91d63182f0b2366:
Delete: sql/share/norwegian/.cvsignore
BitKeeper/deleted/.del-.cvsignore~469064b5190d703d:
Delete: sql/share/norwegian-ny/.cvsignore
Docs/manual.texi:
Changelog
client/client_priv.h:
Update for OS2
client/mysqldump.c:
Update for OS2
include/mysqld_error.h:
Updated error texts
isam/create.c:
Removed warning
myisam/myisamchk.c:
Fix for OS2
myisam/myisampack.c:
Fix for OS2
mysys/mf_cache.c:
Fix for OS2
mysys/mf_tempfile.c:
Fix for OS2
mysys/my_os2file64.c:
Fix for OS2
mysys/my_tempnam.c:
Fix for OS2
os2/ChangeLog.os2:
Fix for OS2
os2/MySQL-Client.icc:
Fix for OS2
os2/MySQL-Opt.icc:
Fix for OS2
os2/MySQL-Source.icc:
Fix for OS2
os2/MySQL-Sql.icc:
Fix for OS2
os2/MySQL-Util.icc:
Fix for OS2
sql/mysqld.cc:
Use LONG_TIMEOUT (one year) instead of ~0 for long timeouts. This avoids some problems when users spefices wrong arguments to mysqld.
sql/nt_servc.cc:
C
sql/share/czech/errmsg.txt:
Updated error texts
sql/share/danish/errmsg.txt:
Updated error texts
sql/share/dutch/errmsg.txt:
Updated error texts
sql/share/english/errmsg.txt:
Updated error texts
sql/share/estonian/errmsg.txt:
Updated error texts
sql/share/french/errmsg.txt:
Updated error texts
sql/share/german/errmsg.txt:
Updated error texts
sql/share/greek/errmsg.txt:
Updated error texts
sql/share/hungarian/errmsg.txt:
Updated error texts
sql/share/italian/errmsg.txt:
Updated error texts
sql/share/japanese/errmsg.txt:
Updated error texts
sql/share/korean/errmsg.txt:
Updated error texts
sql/share/norwegian-ny/errmsg.txt:
Updated error texts
sql/share/norwegian/errmsg.txt:
Updated error texts
sql/share/polish/errmsg.txt:
Updated error texts
sql/share/portuguese/errmsg.txt:
Updated error texts
sql/share/romanian/errmsg.txt:
Updated error texts
sql/share/russian/errmsg.txt:
Updated error texts
sql/share/slovak/errmsg.txt:
Updated error texts
sql/share/spanish/errmsg.txt:
Updated error texts
sql/share/swedish/errmsg.txt:
Updated error texts
sql/share/ukrainian/errmsg.txt:
Updated error texts
sql/sql_select.cc:
Fixed problem with const propagation when comparing columns of different types.
Fixed bug when HEAP table is converted to MyISAM tables in GROUP BY on long strings.
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysqld_error.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index af0c8508671..bfa279193b7 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -214,16 +214,8 @@ #define ER_NO_PERMISSON_TO_CREATE_USER 1211 #define ER_UNION_TABLES_IN_DIFFERENT_DIR 1212 #define ER_LOCK_DEADLOCK 1213 -#define ER_DUMMY1 1214 -#define ER_DUMMY2 1215 -#define ER_DUMMY3 1216 -#define ER_DUMMY4 1217 -#define ER_DUMMY5 1218 -#define ER_DUMMY6 1219 -#define ER_DUMMY7 1220 -#define ER_DUMMY8 1221 -#define ER_TABLE_CANT_HANDLE_FULLTEXT 1222 -#define ER_CANNOT_ADD_FOREIGN 1223 -#define ER_NO_REFERENCED_ROW 1224 -#define ER_ROW_IS_REFERENCED 1225 -#define ER_ERROR_MESSAGES 226 +#define ER_TABLE_CANT_HANDLE_FULLTEXT 1214 +#define ER_CANNOT_ADD_FOREIGN 1215 +#define ER_NO_REFERENCED_ROW 1216 +#define ER_ROW_IS_REFERENCED 1217 +#define ER_ERROR_MESSAGES 218 |