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

1 files changed, 64 insertions, 16 deletions

diff --git a/os2/MySQL-Util.icc b/os2/MySQL-Util.icc
index 61b1f53bc5f..5a7ae2959b9 100644
--- a/os2/MySQL-Util.icc
+++ b/os2/MySQL-Util.icc
@@ -6,20 +6,51 @@ include "MySQL-Opt.icc"
 include "MySQL-Source.icc"
 
 option ProjectOptions = MySQLOptions
-                        , link(defaultlibsname, "common.lib")
-                        , link(defaultlibsname, "myisam.lib")
-                        , link(defaultlibsname, "isam.lib")
-                        , link(defaultlibsname, "mysql.lib")
+                      , link(defaultlibsname, "mysql.lib")
 {
 
+   option file(genobject, "..\\OBJ\\ZLIB\\")
+          ,link(exportAll)
+   {
+      target "..\\bin\\mysqlu.dll"
+      {
+         // optimized precompiled headers
+         option macros('global', 'yes')
+         {
+            source type('cpp') client_global_pch
+         }
+         // target source files
+         source zlib, ufc, regex, 'strings\bmove_upp.c'
+         if debug_build  {
+            source type('cpp') dbug
+         }
+         source type('cpp') heap
+         source type('cpp') merge
+         source type('cpp') myisam
+         source type('cpp') myisammrg
+         source type('cpp') isam
+         source type('cpp') my_sys
+         source type('cpp') my_sys_cli
+         source type('cpp') my_sys_sql
+         source type('cpp') strings
+         source type('cpp') '..\libmysql\dll.c'
+         source BldLevelInfo
+      }
+   }
+
+
       target "..\\bin\\myisamchk.exe"
       {
          // optimized precompiled headers
          option macros('global', 'yes')
          {
-            source type('cpp') client_pch
+            source type('cpp') client_global_pch
          }
-         source type('cpp') "..\\myisam\\myisamchk.c"
+         // target source files
+         source type('cpp') "..\\myisam\\myisamchk.c",
+                            "..\\myisam\\mi_check.c",
+                            "..\\myisam\\sort.c"
+         source BldLevelInfo
       }
 
       target "..\\bin\\myisamlog.exe"
@@ -27,11 +58,11 @@ option ProjectOptions = MySQLOptions
          // optimized precompiled headers
          option macros('global', 'yes')
          {
-            source type('cpp') client_pch
+            source type('cpp') client_global_pch
          }
-
          // target source files
          source type('cpp') "..\\myisam\\myisamlog.c"
+         source BldLevelInfo
       }
 
       target "..\\bin\\myisampack.exe"
@@ -39,10 +70,23 @@ option ProjectOptions = MySQLOptions
          // optimized precompiled headers
          option macros('global', 'yes')
          {
-            source type('cpp') client_pch
+            source type('cpp') client_global_pch
          }
          // target source files
          source type('cpp') "..\\myisam\\myisampack.c"
+         source BldLevelInfo
+      }
+
+      target "..\\bin\\test\\comp_err.exe"
+      {
+         // target source files
+         source type('cpp') "..\\extra\\comp_err.c"
+      }
+
+      target "..\\bin\\gen_lex_hash.exe"
+      {
+         // target source files
+         source type('cpp') "..\\sql\\gen_lex_hash.cc"
       }
 
       target "..\\bin\\test\\is_test1.exe"
@@ -75,13 +119,13 @@ option ProjectOptions = MySQLOptions
          // target source files
          source type('cpp') "..\\myisam\\ft_test1.c"
       }
-
-      //target "..\\bin\\test\\testhash.exe"
+/*
+      target "..\\bin\\test\\testhash.exe"
       {
          // target source files
-         //source type('cpp') "..\\mysys\\testhash.c"
+         source type('cpp') "..\\mysys\\testhash.c"
       }
-
+*/
       target "..\\bin\\test\\test_charset.exe"
       {
          // target source files
@@ -99,6 +143,7 @@ option ProjectOptions = MySQLOptions
          source type('cpp') "..\\heap\\hp_test2.c"
       }
 
+/*
       option define( "MAIN", "")
       {
          target "..\\bin\\test\\thr_lock.exe"
@@ -107,13 +152,13 @@ option ProjectOptions = MySQLOptions
             source type('cpp') "..\\mysys\\thr_lock.c"
          }
       }
-
+*/
       target "..\\bin\\test\\insert_test.exe"
       {
          // optimized precompiled headers
          option macros('global', 'yes')
          {
-            source type('cpp') client_pch
+            source type('cpp') client_global_pch
          }
          source type('cpp') "..\\client\\insert_test.c"
       }
@@ -126,9 +171,12 @@ option ProjectOptions = MySQLOptions
          // optimized precompiled headers
          option macros('global', 'yes')
          {
-            source type('cpp') client_pch
+            source type('cpp') client_global_pch
          }
          source type('cpp') "..\\client\\thread_test.c"
       }
 
 }
+
+run after sources('..\bin\gen_lex_hash.exe') targets('..\sql\lex_hash.h')
+          '..\bin\gen_lex_has.exe > ..\sql\lex_hash.h'