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, 9 insertions, 80 deletions

diff --git a/os2/MySQL-Sql.icc b/os2/MySQL-Sql.icc
index addb645e2db..c1256d5e39e 100644
--- a/os2/MySQL-Sql.icc
+++ b/os2/MySQL-Sql.icc
@@ -5,6 +5,9 @@ InlineCode = "no"
 include "MySQL-Opt.icc"
 include "MySQL-Source.icc"
 
+run before sources('..\sql\sql_yacc.yy') targets('..\sql\sql_yacc.c')
+          'bison -y -d -o ..\sql\sql_yacc.c ..\sql\sql_yacc.yy'
+
 option ProjectOptions = MySQLOptions
                         , define( "MYSQL_SERVER", "")
 {
@@ -16,68 +19,9 @@ option ProjectOptions = MySQLOptions
          // optimized precompiled headers
          option macros('global', 'yes')
          {
-            //source type('cpp') gpch
-            source type('cpp') 'os2.h'
-            source type('cpp')
-               //'ctype.h',
-               'string.h', 'assert.h', 'share.h', 'stdarg.h', 'stdio.h',
-               'stdlib.h', 'stddef.h', 'math.h', 'io.h', 'limits.h',
-               'process.h', 'errno.h', 'nerrno.h', 'sys/types.h',
-               'sys/time.h', 'sys/stat.h', 'sys/param.h', 'sys/ioccom.h',
-               'sys/filio.h', 'sys/sockio.h', 'sys/ioctlos2.h','sys/ioctl.h', 'types.h'
-
-            source type('cpp')
-               'global.h', 'my_base.h', 'config-os2.h',
-               'my_dir.h', 'my_sys.h', 'mysql.h',
-               'my_bitmap.h', 'violite.h', 'mysql_priv.h',
-               'm_string.h', 'm_ctype.h'
-
-            source type('cpp') 'myisam.h'
-            source type('cpp') 'myisampack.h'
-            source type('cpp') '.\myisam\myisamdef.h'
-
-            source type('cpp') 'sql_string.h'
-            source type('cpp') 'item.h'
-            source type('cpp') 'unireg.h'
-            source type('cpp') 'field.h'
-            source type('cpp') 'sql_lex.h'
-            source type('cpp') 'sql_list.h'
-            source type('cpp') 'md5.h'
-            source type('cpp') 'sql_acl.h'
-            source type('cpp') 'slave.h'
-            source type('cpp') 'ha_myisam.h'
-            source type('cpp') 'procedure.h'
-            source type('cpp') 'sql_select.h'
-            source type('cpp') 'errmsg.h'
-            source type('cpp') 't_ctype.h'
-            source type('cpp') 'direct.h'
-            source type('cpp') 'mysys_err.h'
-            source type('cpp') 'zconf.h'
-            source type('cpp') 'zlib.h'
-            source type('cpp') 'my_tree.h'
-            source type('cpp') '..\mysys\my_static.h'
-            source type('cpp') 'netdb.h'
-            source type('cpp') 'thr_alarm.h'
-            source type('cpp') 'heap.h'
-            source type('cpp') '..\myisam\fulltext.h'
-            source type('cpp') '..\myisam\ftdefs.h'
-            source type('cpp') 'myisammrg.h'
-
+            source type('cpp') server_global_pch
          }
-         source type('cpp') 'sys/un.h'
-         source type('cpp') 'ha_heap.h'
-         source type('cpp') 'ha_myisammrg.h'
-         source type('cpp') 'opt_ft.h'
-         source type('cpp') 'hash_filo.h'
-         source type('cpp') 'mini_client.h'
-         source type('cpp') 'sql_repl.h'
-         source type('cpp') 'netinet/in_systm.h'
-         source type('cpp') 'netinet/tcp.h'
-         source type('cpp') 'sql_analyse.h'
-         source type('cpp') 'item_create.h'
-         source type('cpp') '..\mysys\mysys_priv.h'
-         source type('cpp') 'sys/utime.h'
-         source type('cpp') 'sys/select.h'
+         source type('cpp') server_pch
 
          // target source files
          source "rint.obj"
@@ -93,25 +37,10 @@ option ProjectOptions = MySQLOptions
          source type('cpp') my_sys
          source type('cpp') my_sys_sql
          source type('cpp') strings
-         source type('cpp') sql
-      }
-   }
-/*
-   option define( "MYSQL_SERVER", "")
-   {
-      target "..\\bin\\mysqlbinlog.exe"
-      {
-         // optimized precompiled headers
-         option macros('global', 'yes')
-         {
-            //source type('cpp') client_pch //, 'sql_string.h'
-         }
-         // target source files
-         source type('cpp')
-                     "..\\sql\\mysqlbinlog.cc",
-                     "..\\sql\\mini_client.cc",
-                     "..\\sql\\net_serv.cc"
+         source type('cpp') sql,
+                            "..\\myisam\\mi_check.c",
+                            "..\\myisam\\sort.c"
+         source BldLevelInfo
       }
    }
-*/
 }