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.

1 files changed, 24 insertions, 23 deletions

diff --git a/os2/MySQL-Opt.icc b/os2/MySQL-Opt.icc
index 5f5cdb7c72f..7045f111d9b 100644
--- a/os2/MySQL-Opt.icc
+++ b/os2/MySQL-Opt.icc
@@ -2,29 +2,30 @@
 debug_build = 0
 
 // common options
-option BaseOptions =    link(defaultlibsname, "tcpip32.lib")
-                        ,link(libsearchpath, "..\\lib\\")
-                        ,link(libsearchpath, "..\\bin\\")
-                        ,link(pmtype, vio)
-                        ,link(linkwithmultithreadlib, "yes")
-                        ,link(linkwithsharedlib, "no")
-                        ,gen(initauto, "yes")
-                        ,define("__MT__", )
-                        ,define("HAVE_BSD_SIGNALS", )
-                        ,define("INCL_DOS", )
-                        ,define("INCL_DOSERRORS", )
-                        ,define("INCL_LONGLONG", )
-                        ,define("OS2", )
-                        ,define("USE_TLS", )
-                        ,lang(signedchars, yes)
-                        ,incl(searchpath, "..")
-                        ,incl(searchpath, "..\\include")
-                        ,incl(searchpath, "..\\my_sys")
-                        ,incl(searchpath, "..\\regex")
-                        ,incl(searchpath, "..\\sql")
-                        ,incl(searchpath, "\\rd\\mysql\\zlib-1.1.3")
-                        ,incl(searchpath, "\\rd\\mysql\\ufc")
-                        ,incl(searchpath, "..\\os2")
+option BaseOptions =      link(defaultlibsname, "tcpip32.lib")
+                        , link(libsearchpath, "..\\lib\\")
+                        , link(libsearchpath, "..\\bin\\")
+                        , link(pmtype, vio)
+                        , link(padding, no)
+                        , link(linkwithmultithreadlib, "yes")
+                        , link(linkwithsharedlib, "no")
+                        , gen(initauto, "yes")
+                        , define("__MT__", )
+                        , define("HAVE_BSD_SIGNALS", )
+                        , define("INCL_DOS", )
+                        , define("INCL_DOSERRORS", )
+                        , define("INCL_LONGLONG", )
+                        , define("OS2", )
+                        , define("USE_TLS", )
+                        , lang(signedchars, yes)
+                        , incl(searchpath, "..")
+                        , incl(searchpath, "..\\include")
+                        , incl(searchpath, "..\\my_sys")
+                        , incl(searchpath, "..\\regex")
+                        , incl(searchpath, "..\\sql")
+                        , incl(searchpath, "..\\..\\zlib-1.1.3")
+                        , incl(searchpath, "..\\..\\ufc")
+                        , incl(searchpath, "..\\os2")
 
 option ReleaseOptions =   link(debug, "no")
                         , define("DBUG_OFF", )