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.

Docs/manual.texi

@@ -46840,6 +46840,12 @@ not yet 100% confident in this code.
 @appendixsubsec Changes in release 3.23.44
 @itemize @bullet
 @item
+Fixed bug in const-propagation when comparing columns of different
+types. (@code{SELECT * FROM date_col="2001-01-01" and date_col=time_col})
+@item
+Fixed bug that caused error message @code{Can't write, because of unique
+constraint} with some @code{GROUP BY} queries.
+@item
 Fixed problem with sjis character strings used within quoted table names.
 @item
 Fixed coredump when using @code{CREATE ... FULLTEXT} keys with other table
@@ -46847,6 +46853,8 @@ handlers than MyISAM.
 @item
 Add missing @code{InnoDB} variables to @code{SHOW VARIABLES}.
 @item
+Foreign keys checking is now done for @code{InnoDB} tables.
+@item
 Don't use @code{signal()} on windows because this appears to not be
 100 % reliable.
 @item
@@ -46858,7 +46866,9 @@ Fixed bug when doing @code{LEFT JOIN ...  ON (column_name = constant) WHERE colu
 When using replications, aborted queries that contained @code{%} could cause
 a core dump.
 @item
-TCP_NODELAY was not used on some systems. (Speed problem).
+@code{TCP_NODELAY} was not used on some systems. (Speed problem).
+@item
+Applied portability fixes for OS/2 (Patch by Yuri Dario).
 @end itemize
 
 @node News-3.23.43, News-3.23.42, News-3.23.44, News-3.23.x

client/client_priv.h

@@ -28,4 +28,5 @@
 enum options { OPT_CHARSETS_DIR=256, OPT_DEFAULT_CHARSET,
 	       OPT_PAGER, OPT_NOPAGER, OPT_TEE, OPT_NOTEE,
 	       OPT_LOW_PRIORITY, OPT_AUTO_REPAIR, OPT_COMPRESS,
+	       OPT_DROP, OPT_LOCKS, OPT_KEYWORDS, OPT_DELAYED, OPT_OPTIMIZE,
 	       OPT_FTB, OPT_LTB, OPT_ENC, OPT_O_ENC, OPT_ESC, OPT_TABLES};

client/mysqldump.c

@@ -44,6 +44,7 @@
 #include <m_string.h>
 #include <m_ctype.h>
 
+#include "client_priv.h"
 #include "mysql.h"
 #include "mysql_version.h"
 #include "mysqld_error.h"
@@ -87,10 +88,6 @@ static DYNAMIC_STRING extended_row;
 #include "sslopt-vars.h"
 FILE  *md_result_file;
 
-enum md_options {OPT_FTB=256, OPT_LTB, OPT_ENC, OPT_O_ENC, OPT_ESC,
-		 OPT_KEYWORDS, OPT_LOCKS, OPT_DROP, OPT_OPTIMIZE, OPT_DELAYED,
-		 OPT_TABLES, MD_OPT_CHARSETS_DIR, MD_OPT_DEFAULT_CHARSET};
-
 static struct option long_options[] =
 {
   {"all-databases",     no_argument,    0,      'A'},
@@ -98,12 +95,12 @@ static struct option long_options[] =
   {"add-drop-table",	no_argument,    0, 	OPT_DROP},
   {"add-locks",    	no_argument,    0,	OPT_LOCKS},
   {"allow-keywords",	no_argument,    0, 	OPT_KEYWORDS},
-  {"character-sets-dir",required_argument,0,    MD_OPT_CHARSETS_DIR},
+  {"character-sets-dir",required_argument,0,    OPT_CHARSETS_DIR},
   {"complete-insert",	no_argument,    0, 	'c'},
   {"compress",          no_argument,    0, 	'C'},
   {"databases",         no_argument,    0,      'B'},
   {"debug",		optional_argument, 	0, '#'},
-  {"default-character-set", required_argument,  0, MD_OPT_DEFAULT_CHARSET},
+  {"default-character-set", required_argument,  0, OPT_DEFAULT_CHARSET},
   {"delayed-insert",	no_argument,    0, 	OPT_DELAYED},
   {"extended-insert",   no_argument,    0, 	'e'},
   {"fields-terminated-by", required_argument,   0, (int) OPT_FTB},
@@ -307,10 +304,10 @@ static int get_options(int *argc,char ***argv)
     case 'A':
       opt_alldbs=1;
       break;
-    case MD_OPT_DEFAULT_CHARSET:
+    case OPT_DEFAULT_CHARSET:
       default_charset= optarg;
       break;
-    case MD_OPT_CHARSETS_DIR:
+    case OPT_CHARSETS_DIR:
       charsets_dir= optarg;
       break;
     case 'f':

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

isam/create.c

@@ -253,10 +253,10 @@ int nisam_create(const char *name,uint keys,N_KEYDEF *keyinfo,
   share.base.fields=fields;
   share.base.pack_fields=packed;
   share.base.sortkey= (ushort) ~0;
-  share.base.max_data_file_length= (pointer == 4) ? ~0L :
+  share.base.max_data_file_length= (pointer == 4) ? (ulong) ~0L :
     (options & (HA_OPTION_PACK_RECORD | HA_OPTION_COMPRESS_RECORD)) ?
-    (1L << (pointer*8)) :
-    (pointer == 3 && reclength >= 256L) ? NI_POS_ERROR :
+    (ulong) (1L << (pointer*8)) :
+    (pointer == 3 && reclength >= 256L) ? (ulong) NI_POS_ERROR :
     ((ulong) reclength * (1L << (pointer*8)));
   share.base.max_key_file_length= (share.base.key_reflength == 3 ?
 				  NI_POS_ERROR :

myisam/myisamchk.c

@@ -35,6 +35,10 @@ SET_STACK_SIZE(9000)			/* Minimum stack size for program */
 #define my_raid_delete(A,B,C) my_delete(A,B)
 #endif
 
+#ifdef OS2
+#define _sanity(a,b)
+#endif
+
 static uint decode_bits;
 static char **default_argv;
 static const char *load_default_groups[]= { "myisamchk", 0 };

myisam/myisampack.c

@@ -229,7 +229,7 @@ int main(int argc, char **argv)
 #endif
 }
 
-enum options {OPT_CHARSETS_DIR_MP=256};
+enum options_mp {OPT_CHARSETS_DIR_MP=256};
 
 static struct option long_options[] =
 {

mysys/mf_cache.c

@@ -37,11 +37,11 @@ static my_bool cache_remove_open_tmp(IO_CACHE *cache, const char *name)
 #else
   int length;
   if (!(cache->file_name=
-	(char*) my_malloc((length=strlen(name)+1),MYF(MY_WME)))
+	(char*) my_malloc((length=strlen(name)+1),MYF(MY_WME))))
   {
     my_close(cache->file,MYF(0));
     cache->file = -1;
-    errno=my_error=ENOMEM;
+    errno=my_errno=ENOMEM;
     return 1;
   }
   memcpy(cache->file_name,name,length);

mysys/mf_tempfile.c

@@ -126,6 +126,9 @@ File create_temp_file(char *to, const char *dir, const char *prefix,
     // changing environ variable doesn't work with VACPP
     char  buffer[256];
     sprintf( buffer, "TMP=%s", dir);
+    // remove ending backslash
+    if (buffer[strlen(buffer)-1] == '\\')
+       buffer[strlen(buffer)-1] = '\0';
     putenv( buffer);
 #else
     old_env= (char**) environ;

mysys/my_os2file64.c

@@ -22,7 +22,6 @@ void        _OS2errno( APIRET rc);
 longlong    _lseek64( int fd, longlong offset, int seektype);
 int         _lock64( int fd, int locktype, my_off_t start,
                      my_off_t length, myf MyFlags);
-int         _sopen64( const char *name, int oflag, int shflag, int mask);
 
 //
 // this class is used to define a global c++ variable, that
@@ -255,7 +254,7 @@ int         _lock64( int fd, int locktype, my_off_t start,
    return(-1);
 }
 
-int         _sopen64( const char *name, int oflag, int shflag, int mask)
+int         _sopen( const char *name, int oflag, int shflag, int mask)
 {
    int      fail_errno;
    APIRET   rc = 0;
@@ -325,17 +324,60 @@ int         _sopen64( const char *name, int oflag, int shflag, int mask)
    return hf;
 }
 
-inline int   open( const char *name, int oflag)
+int      read( int fd, void *buffer, unsigned int count)
 {
-   return _sopen64( name, oflag, OPEN_SHARE_DENYNONE, S_IREAD | S_IWRITE);
+   APIRET   rc;
+   ULONG    actual;
+
+   rc = DosRead( fd, (PVOID) buffer, count, &actual);
+
+   if (!rc)
+      return( actual);/* NO_ERROR */
+
+   // set errno
+   _OS2errno( rc);
+   // write failed
+   return(-1);
 }
 
-inline int   open( const char *name, int oflag, int mask)
+int      write( int fd, const void *buffer, unsigned int count)
 {
-   return _sopen64( name, oflag, OPEN_SHARE_DENYNONE, mask);
+   APIRET   rc;
+   ULONG    actual;
+
+   rc = DosWrite( fd, (PVOID) buffer, count, &actual);
+
+   if (!rc)
+      return( actual);/* NO_ERROR */
+
+   // set errno
+   _OS2errno( rc);
+   // write failed
+   return(-1);
+}
+
+int      close( int fd)
+{
+   APIRET   rc;
+   ULONG    actual;
+
+   rc = DosClose( fd);
+
+   if (!rc)
+      return( 0);/* NO_ERROR */
+
+   // set errno
+   _OS2errno( rc);
+   // write failed
+   return(-1);
 }
 
-inline int   sopen( const char *name, int oflag, int shflag, int mask)
+inline int   open( const char *name, int oflag)
+{
+   return sopen( name, oflag, OPEN_SHARE_DENYNONE, S_IREAD | S_IWRITE);
+}
+
+inline int   open( const char *name, int oflag, int mask)
 {
-   return _sopen64( name, oflag, shflag, mask);
+   return sopen( name, oflag, OPEN_SHARE_DENYNONE, mask);
 }

mysys/my_tempnam.c

@@ -95,6 +95,9 @@ my_string my_tempnam(const char *dir, const char *pfx,
   // changing environ variable doesn't work with VACPP
   char  buffer[256];
   sprintf( buffer, "TMP=%s", dir);
+  // remove ending backslash
+  if (buffer[strlen(buffer)-1] == '\\')
+     buffer[strlen(buffer)-1] = '\0';
   putenv( buffer);
 #else
   old_env=(char**)environ;

os2/BldLevel.cmd

+@echo off
+
+REM I'm using resources for BLDLEVEL info, because VA4 linker has the bad
+REM feature of using versionstring content for padding files.
+
+REM To set fixpak level: -P"fixpak level"
+SET MYSQL_VERSION=3.23.42
+SET MYSQL_BUILD=1
+
+BldLevelInf -V%MYSQL_VERSION% -N"MySQL AB, Yuri Dario" -D"MySQL %MYSQL_VERSION% for OS/2 - Build %MYSQL_BUILD%" -Len BldLevel.rc

os2/BldLevel.rc

+RCDATA 1 { "@#MySQL AB, Yuri Dario:3.23.42#@##1## 10 Sep 2001 11:57:17     paperino::en::::@@MySQL 3.23.42 for OS/2 - Build 1" }

os2/ChangeLog.os2

 
+2001/09/16
+	- fixed creation directory of temporary files
+	- enabled cached list file for deleting temp open files
+
+2001/09/10
+	- Build source 3.23.42, released
+
+2001/09/08
+	- fixed file api
+
 2001/06/12
 	- fixed support for > 2GB file size, needs also DosOpenL
 	- mixed 64bit/32bit file size support, dinamic loading of

os2/MySQL-Client.icc

@@ -6,7 +6,6 @@ include "MySQL-Opt.icc"
 include "MySQL-Source.icc"
 
 option ProjectOptions = MySQLOptions
-                        //, link(defaultlibsname, "readline.lib")
 {
 
    option file(genobject, "..\\OBJ\\ZLIB\\")
@@ -16,7 +15,7 @@ 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 zlib
@@ -27,6 +26,8 @@ option ProjectOptions = MySQLOptions
          source type('cpp') my_sys_cli
          source type('cpp') strings
          source type('cpp') mysqlclientlib
+         source type('cpp') '..\libmysql\dll.c'
+         source BldLevelInfo
       }
    }
 
@@ -37,51 +38,84 @@ option ProjectOptions = MySQLOptions
          // optimized precompiled headers
          option macros('global', 'yes')
          {
-            source type('cpp') client_pch //, 'sql_string.h'
+            source type('cpp') client_global_pch
          }
          // target source files
-         //source readline
          source type('cpp') "..\\client\\mysql.cc"
+         source BldLevelInfo
       }
    }
 
+   option file(genobject, "..\\OBJ\\READLINE\\")
+   {
       target "..\\bin\\mysqladmin.exe"
       {
          // optimized precompiled headers
          option macros('global', 'yes')
          {
-            source type('cpp') client_pch //, 'sql_string.h'
+            source type('cpp') client_global_pch
          }
          // target source files
          source type('cpp') "..\\client\\mysqladmin.c"
+         source BldLevelInfo
       }
+   }
 
       target "..\\bin\\mysqldump.exe"
       {
          // optimized precompiled headers
          option macros('global', 'yes')
          {
-            source type('cpp') client_pch
+            source type('cpp') client_global_pch
          }
          // target source files
          source type('cpp') "..\\client\\mysqldump.c"
+         source BldLevelInfo
       }
 
       target "..\\bin\\mysqlshow.exe"
       {
          // target source files
          source type('cpp') "..\\client\\mysqlshow.c"
+         source BldLevelInfo
       }
 
       target "..\\bin\\mysqlimport.exe"
       {
          // target source files
          source type('cpp') "..\\client\\mysqlimport.c"
+         source BldLevelInfo
       }
 
       target "..\\bin\\mysqltest.exe"
       {
          source type('cpp') "..\\client\\mysqltest.c"
+         source BldLevelInfo
+      }
+
+      target "..\\bin\\mysqlbinlog.exe"
+      {
+         // optimized precompiled headers
+         option macros('global', 'yes')
+         {
+            source type('cpp') client_global_pch
+         }
+         // target source files
+         source type('cpp') "..\\client\\mysqlbinlog.cc"
+         source BldLevelInfo
+      }
+
+      target "..\\bin\\mysqlcheck.exe"
+      {
+         // optimized precompiled headers
+         option macros('global', 'yes')
+         {
+            source type('cpp') client_global_pch
+         }
+
+         // target source files
+         source type('cpp') "..\\client\\mysqlcheck.c"
+         source BldLevelInfo
       }
 
 }

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", )

os2/MySQL-Source.icc

-group client_pch =
+group client_global_pch =
             'os2.h',
             'assert.h', 'direct.h', 'errno.h', 'nerrno.h',
             'limits.h', 'io.h', 'math.h',
@@ -9,17 +9,46 @@ group client_pch =
             'my_base.h', 'config-os2.h', 'my_dir.h',
             'global.h', 'thr_alarm.h', 'm_string.h',
             'mysql.h', 'zconf.h', 'zlib.h', 'mysys_err.h',
-            //'my_os2dirsrch.h',
-            'm_ctype.h',
-            'mysqld_error.h',
+            'm_ctype.h', 'mysqld_error.h',
             'my_list.h', 'my_sys.h', 'my_net.h',
-            'myisam.h', 'myisampack.h', '.\myisam\myisamdef.h'
+            'myisam.h', 'myisampack.h', '.\myisam\myisamdef.h',
+            '.\regex\regex.h'
+
+group server_global_pch =
+            'os2.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',
+            'sys/utime.h', 'sys/select.h', 'sys/un.h',
+            'netinet/in_systm.h', 'netinet/tcp.h',
+
+            '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',
+            'myisam.h', 'myisampack.h', '.\myisam\myisamdef.h',
+            'sql_string.h', 'item.h', 'unireg.h',
+            'field.h', 'sql_lex.h', 'sql_list.h',
+            'md5.h', 'sql_acl.h', 'slave.h',
+            'ha_myisam.h', 'procedure.h', 'sql_select.h',
+            'errmsg.h', 't_ctype.h', 'direct.h',
+            'mysys_err.h', 'zconf.h', 'zlib.h',
+            'my_tree.h', '..\mysys\my_static.h', 'netdb.h',
+            'thr_alarm.h', 'heap.h', '..\myisam\fulltext.h',
+            '..\myisam\ftdefs.h', 'myisammrg.h',
+            '.\regex\regex.h'
+
+group server_pch =
+            'ha_heap.h', 'ha_myisammrg.h', 'opt_ft.h',
+            'hash_filo.h', 'mini_client.h', 'sql_repl.h',
+            'sql_analyse.h', 'item_create.h', '..\mysys\mysys_priv.h'
 
 group mysqlclientlib =
                "..\\client\\readline.cc",
                "..\\client\\sql_string.cc",
                "..\\client\\completion_hash.cc",
-               //"..\\libmysql\\dll.c",
                "..\\libmysql\\libmysql.c",
                "..\\libmysql\\errmsg.c",
                "..\\libmysql\\get_password.c",
@@ -28,17 +57,17 @@ group mysqlclientlib =
                "..\\libmysql\\violite.c"
 
 group zlib =
-               "\\rd\\mysql\\zlib-1.1.3\\compress.c", "\\rd\\mysql\\zlib-1.1.3\\crc32.c",
-               "\\rd\\mysql\\zlib-1.1.3\\deflate.c", "\\rd\\mysql\\zlib-1.1.3\\gzio.c", "\\rd\\mysql\\zlib-1.1.3\\infblock.c",
-               "\\rd\\mysql\\zlib-1.1.3\\infcodes.c", "\\rd\\mysql\\zlib-1.1.3\\inffast.c",
-               "\\rd\\mysql\\zlib-1.1.3\\inflate.c", "\\rd\\mysql\\zlib-1.1.3\\inftrees.c",
-               "\\rd\\mysql\\zlib-1.1.3\\infutil.c", "\\rd\\mysql\\zlib-1.1.3\\trees.c", "\\rd\\mysql\\zlib-1.1.3\\uncompr.c",
-               "\\rd\\mysql\\zlib-1.1.3\\zutil.c", "\\rd\\mysql\\zlib-1.1.3\\adler32.c"
+               "..\\..\\zlib-1.1.3\\compress.c", "..\\..\\zlib-1.1.3\\crc32.c",
+               "..\\..\\zlib-1.1.3\\deflate.c", "..\\..\\zlib-1.1.3\\gzio.c", "..\\..\\zlib-1.1.3\\infblock.c",
+               "..\\..\\zlib-1.1.3\\infcodes.c", "..\\..\\zlib-1.1.3\\inffast.c",
+               "..\\..\\zlib-1.1.3\\inflate.c", "..\\..\\zlib-1.1.3\\inftrees.c",
+               "..\\..\\zlib-1.1.3\\infutil.c", "..\\..\\zlib-1.1.3\\trees.c", "..\\..\\zlib-1.1.3\\uncompr.c",
+               "..\\..\\zlib-1.1.3\\zutil.c", "..\\..\\zlib-1.1.3\\adler32.c"
 
 group ufc =
-               "\\rd\\mysql\\ufc\\crypt.c",
-               "\\rd\\mysql\\ufc\\crypt_util.c",
-               "\\rd\\mysql\\ufc\\crypt-entry.c"
+               "..\\..\\ufc\\crypt.c",
+               "..\\..\\ufc\\crypt_util.c",
+               "..\\..\\ufc\\crypt-entry.c"
 
 group sql =
                "..\\sql\\convert.cc",
@@ -106,7 +135,7 @@ group sql =
                "..\\sql\\sql_test.cc",
                "..\\sql\\sql_update.cc",
                "..\\sql\\sql_udf.cc",
-               "..\\sql\\sql_yacc.cc",
+               "..\\sql\\sql_yacc.c",
                "..\\sql\\table.cc",
                "..\\sql\\thr_malloc.cc",
                "..\\sql\\time.cc",
@@ -140,8 +169,6 @@ group strings =
                "..\\strings\\ctype-sjis.c",
                "..\\strings\\ctype-tis620.c",
                "..\\strings\\ctype-ujis.c",
-               "..\\strings\\ctype_extra_sources.c",
-               "..\\strings\\ctype_autoconf.c",
                "..\\strings\\ctype.c",
                "..\\strings\\int2str.c",
                "..\\strings\\is_prefix.c",
@@ -162,6 +189,8 @@ group strings =
                "..\\strings\\strxmov.c",
                "..\\strings\\strxnmov.c"
 
+/*
+*/
 
    group heap = "..\\heap\\hp_block.c", "..\\heap\\hp_clear.c",
                 "..\\heap\\hp_close.c", "..\\heap\\hp_create.c", "..\\heap\\hp_delete.c",
@@ -242,7 +271,8 @@ group strings =
                    "..\\mysys\\my_thr_init.c", "..\\mysys\\my_vsnprintf.c",
                    "..\\mysys\\my_write.c", "..\\mysys\\ptr_cmp.c",
                    "..\\mysys\\queues.c", "..\\mysys\\raid.cc",
-                   "..\\mysys\\safemalloc.c", "..\\mysys\\string.c",
+                   //"..\\mysys\\safemalloc.c",
+                   "..\\mysys\\string.c",
                    "..\\mysys\\thr_alarm.c",
                    "..\\mysys\\thr_mutex.c", "..\\mysys\\thr_rwlock.c",
                    "..\\mysys\\tree.c", "..\\mysys\\typelib.c"
@@ -254,11 +284,13 @@ group strings =
                   "..\\myisam\\ft_search.c", "..\\myisam\\ft_static.c",
                   "..\\myisam\\ft_stopwords.c", "..\\myisam\\ft_update.c",
                   "..\\myisam\\mi_cache.c", "..\\myisam\\mi_changed.c",
-                  "..\\myisam\\mi_check.c", "..\\myisam\\mi_checksum.c",
+                  //"..\\myisam\\mi_check.c",
+                  "..\\myisam\\mi_checksum.c",
                   "..\\myisam\\mi_close.c", "..\\myisam\\mi_create.c",
                   "..\\myisam\\mi_dbug.c", "..\\myisam\\mi_delete.c",
                   "..\\myisam\\mi_delete_all.c", "..\\myisam\\mi_delete_table.c",
                   "..\\myisam\\mi_dynrec.c", "..\\myisam\\mi_extra.c",
+                  //"..\\myisam\\mi_error.c",
                   "..\\myisam\\mi_info.c", "..\\myisam\\mi_key.c",
                   "..\\myisam\\mi_locking.c", "..\\myisam\\mi_log.c",
                   "..\\myisam\\mi_open.c", "..\\myisam\\mi_packrec.c",
@@ -271,8 +303,8 @@ group strings =
                   "..\\myisam\\mi_rsamepos.c", "..\\myisam\\mi_scan.c",
                   "..\\myisam\\mi_search.c", "..\\myisam\\mi_static.c",
                   "..\\myisam\\mi_statrec.c", "..\\myisam\\mi_unique.c",
-                  "..\\myisam\\mi_update.c", "..\\myisam\\mi_write.c",
-                  "..\\myisam\\sort.c"
+                  "..\\myisam\\mi_update.c", "..\\myisam\\mi_write.c"
+                  //"..\\myisam\\sort.c"
 
    group dbug =   "..\\dbug\\dbug.c", "..\\dbug\\factorial.c", "..\\dbug\\sanity.c"
 
@@ -293,6 +325,7 @@ group strings =
                           //"..\\readline\\vi_keymap.c",
                           "..\\readline\\vi_mode.c", "..\\readline\\xmalloc.c"
 
-group regex =     "..\\regex\\regcomp.c", "..\\regex\\regerror.c",
-                  "..\\regex\\regexec.c", "..\\regex\\regfree.c", "..\\regex\\reginit.c"
+   group regex =     "..\\regex\\regcomp.c", "..\\regex\\regerror.c",
+                     "..\\regex\\regexec.c", "..\\regex\\regfree.c", "..\\regex\\reginit.c"
 
+   group BldLevelInfo = 'os2\BldLevel.rc'

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
       }
    }
-*/
 }

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'

os2/ReadMe.txt

+====================================================
+
+Contents
+--------
+Welcome to the latest port of MySQL for OS/2 and eComStation.
+
+Modules included in this build:
+	- protocol data compression
+	- transaction support
+	- perl BDB/BDI support (not in this package)
+	- Library and header files for C/CPP developers included
+
+This package has been built using IBM VAC++ 4.0
+
+The MySQL server is distributed under the GPL license. Please refer to
+the file COPYING for the license information.
+
+The MySQL client library is distributed under the LGPL license.
+Please refer to the file COPYING for the license information.
+
+Most of the MySQL clients are distributed under the GPL license, but
+some files may be in the public domain.
+
+The latest information about MySQL can be found at: http://www.mysql.com
+
+To get the latest information about this port please subscribe to our
+newsgroup/mailinglist mysql2 at www.egroups.com.
+
+To see what MySQL can do, take a look at the features section in the
+manual. For future plans see the TODO appendix in the manual.
+
+New features/bug fixes history is in the news appendix in the manual.
+
+For the currently known bugs/misfeatures (known errors) see the bugs
+appendix in the manual.  The OS/2 section contains notes that are
+specific to the MySQL OS/2 and eComStation version.
+
+Please note that MySQL is a constantly moving target. New builds for
+Linux are made available every week. This port may therefore be a few
+minor versions after the latest Linux/Win32 builds but its generally
+more stable than the "latest and greates" port.
+
+MySQL is brought to you by: TcX DataKonsult AB & MySQL Finland AB
+
+This port is brought to you by:
+
+Yuri Dario <mc6530@mclink.it>, development, porting
+Timo Maier <tam@gmx.de>, documentation, testing
+John M Alfredsson <jma@jmast.se>, documentation, testing
+
+
+Installation
+------------
+Prerequisite:
+
+- OS/2 Warp 3 with FP ?? or later, 
+  OS/2 Warp 4 with FP ?? or later,
+  OS/2 Warp Server for e-Business,
+  eComStation 1.0 (prev 1/2 OK)
+- TCPIP 4.x installed (requires 32-bit tcpip stack)
+- WarpIN installer 0.9.14 (ftp://ftp.os2.org/xworkplace/warpin-0-9-14.exe)
+
+Note: probably some fixpak level is required on both Warp3&Warp4 to
+      support >2GB file sizes.
+
+Save the installation archives into a temporary folder and double click 
+on the main package; otherwise you can drop the mysql package in your 
+WarpIN object or type 
+
+	WARPIN MYSQL-3-23-??-BLD1.WPI 
+
+from the command line.
+The configuration file for MySQL is named my.cnf and it is placed into
+your %ETC% directory. Usually it located into the boot driver under
+
+	x:\MPTN\ETC
+
+If the installation detect an existing configuration file, this will be
+renamed to my.cnf.bak; your current settings aren't migrated to current 
+installation. This file is not deleted by uninstall process.
+Startup options for MySQL daemon could be added there.
+
+As default, client connections uses data compression: if you don't like it,
+remove the following from your %ETC%\my.cnf
+
+	[client]
+	compress
+
+The server switches automatically compression mode on client request.
+
+This release comes with DLL client library MYSQL.DLL: it is installed by
+default into mysql\bin together with client applications. Copy it to your
+x:\OS2\DLL or another directory in your LIBPATH to run command line 
+utilities from every place.
+
+
+Documentation
+-------------
+Documentation is provided in separate files. You can use either
+the PDF documentation (requires Adobe Acrobat Reader) or the
+INF documentation (requires OS/2 view or NewView).
+
+The PDF documentation is found in 
+
+		MYSQL-3-23-42-PDF.WPI 
+
+and the INF documentation is found in 
+
+		MYSQL-3-23-28-INF.WPI
+
+The latest documentation in other formats can always be downloaded from 
+http://www.mysql.com. However this documentation may not fully apply to 
+this port.
+The INF documentation could contain errors because of semi-automatic
+translation from texi original. Also it is not updated as the latest PDF
+manual (sorry, but conversion from texi to ipf requires quite a lot of 
+work).
+
+
+Support
+-------
+Since MySQL is a OpenSource freeware product there are no
+formal support options available.
+
+Please subscribe to mysql2 at www.yahoogroups.com to get in contact
+with other users using this port.
+
+http://www.yahoogroups.com/group/mysql2
+
+This newsgroup/mailinglist is the official "home" of this port.
+
+
+Donations
+---------
+Since this software is ported for free, donations are welcome!
+You can get also an extended support, which is not free and subject to
+custom rates.
+Ask in the mailing list for details.
+
+
+Know problems
+-------------
+alter_table.test and show_check are failing, reporting a different status 
+message: actually seems only a different text, no bugs in table checking.
+
+
+Apache/2 + PHP
+--------------
+To avoid problems with different socket when you use PHP and Apache
+webserver, get the PHP4 module from the Apache Server for OS/2 homepage
+http://silk.apana.org.au/apache/ 
+
+
+Developing MySQL
+----------------
+If you want to help us develop MySQL for OS2/eComStation please join
+the mysql2 mailinglist at www.egroups.com and ask for help to set up 
+your environment!
+
+All questions that are specific to the OS2/eComStation version should 
+be posted to this list!  Please remember to include all relevant
+information that may help solve your problem.
+
+Building MySQL (VAC++ 4)
+------------------------
+Apply file and patches found in the src\ directory (if exists).
+Create the following subdirectories
+
+	bin\
+	bin\test
+	lib\
+	obj\
+	obj\zlib
+
+Build os2\MySQL-Client.icc project first.
+Then os2\MySQL-Util.icc; last is os2\MySQL-Sql.icc
+

os2/mysql-inf.wis

+#include "mysql.ih"
+
+<WARPIN VERSION <$WARPIN_VERSION>>
+<HEAD>
+<MSG>
+This is not an installable archive.
+
+Please download and install the main archive:
+
+ mysql-<$MySQL-Ver>-bld1.wpi
+
+</MSG>
+</HEAD>
+</WARPIN>
+
\ No newline at end of file

os2/mysql.wis

+#include "mysql.ih"
+
+<WARPIN VERSION <$WARPIN_VERSION>>
+<HEAD>
+
+<PCK INDEX=1 
+     PACKAGEID="TCX Datakonsult AB\MySQL for OS/2\SQL Database Engine\<$MySQL\Ver>"
+     TARGET="?:\usr\local\mysql" BASE
+     TITLE="SQL Database Engine"
+     EXECUTE="$(1)\bootstrap.cmd [bootstrap]"
+     CONFIG.SYS="SET EMXOPT=-h1024 | UNIQUE(-h)"
+     CREATEOBJECT="WPFolder|MySQL <$MySQL.Ver>|<WP_DESKTOP>|OBJECTID=<MYSQL_<$MySQL.Major>_<$MySQL.Minor>_FOLDER>"
+     CREATEOBJECT="WPProgram|Console|<MYSQL_<$MySQL.Major>_<$MySQL.Minor>_FOLDER>|EXENAME=$(1)\bin\mysql.exe;STARTUPDIR=$(1)\bin;ICONFILE=$(1)\bin\icons\mysql-client.ico;OBJECTID=<MYSQL_<$MySQL.Major>_<$MySQL.Minor>_CONSOLE>;"
+     CREATEOBJECT="WPProgram|Start server|<MYSQL_<$MySQL.Major>_<$MySQL.Minor>_FOLDER>|EXENAME=$(1)\bin\mysqld.exe;ICONFILE=$(1)\bin\icons\mysql-startserver.ico;OBJECTID=<MYSQL_<$MySQL.Major>_<$MySQL.Minor>_START>;"
+     CREATEOBJECT="WPProgram|Shutdown server|<MYSQL_<$MySQL.Major>_<$MySQL.Minor>_FOLDER>|EXENAME=$(1)\bin\mysqladmin.exe;STARTUPDIR=$(1)\bin;PARAMETERS=-u root shutdown;ICONFILE=$(1)\bin\icons\mysql-shutdownserver.ico;OBJECTID=<MYSQL_<$MySQL.Major>_<$MySQL.Minor>_SHUTDOWN>;"
+     CREATEOBJECT="WPProgram|Readme first|<MYSQL_<$MySQL.Major>_<$MySQL.Minor>_FOLDER>|EXENAME=e.exe;PARAMETERS=$(1)\ReadMe.txt;OBJECTID=<MYSQL_<$MySQL.Major>_<$MySQL.Minor>_README>;"
+     SELECT
+     >This package will install MySQL for OS/2 SQL engine
+</PCK>
+
+<PCK INDEX=2
+     PACKAGEID="TCX Datakonsult AB\MySQL for OS/2\Developement Kit\<$MySQL\Ver>"
+     TARGET="?:\usr\local\mysql"
+     TITLE="Developement Kit"
+     SELECT
+     >This package will install MySQL for OS/2 sdk
+</PCK>
+
+<PCK INDEX=3
+     PACKAGEID="TCX Datakonsult AB\MySQL for OS/2\PDF manual\<$MySQL\Ver>"
+     TARGET="?:\usr\local\mysql"
+     TITLE="PDF manual"
+     EXTERNAL="mysql-<$MySQL-Ver>-pdf.wpi"
+     CREATEOBJECT="WPShadow|PDF Manual|<MYSQL_<$MySQL.Major>_<$MySQL.Minor>_FOLDER>|SHADOWID=$(1)\docs\manual.pdf"
+     SELECT
+     >This package will install MySQL for OS/2 documentation
+</PCK>
+
+<PCK INDEX=4
+     PACKAGEID="TCX Datakonsult AB\MySQL for OS/2\INF manual\3\23\28"
+     TARGET="?:\usr\local\mysql"
+     TITLE="INF manual"
+     EXTERNAL="mysql-3-23-28-gamma-inf.wpi"
+     CREATEOBJECT="WPProgram|MySQL Manual|<MYSQL_<$MySQL.Major>_<$MySQL.Minor>_FOLDER>|EXENAME=view.exe;PARAMETERS=$(1)\docs\manual.inf;ICONFILE=$(1)\bin\icons\mysql-manual.ico;OBJECTID=<MYSQL_<$MySQL.Major>_<$MySQL.Minor>_INFMANUAL>;"
+     SELECT
+     >This package will install MySQL for OS/2 documentation
+</PCK>
+
+<PCK INDEX=5
+     PACKAGEID="TCX Datakonsult AB\MySQL for OS/2\Test suite\<$MySQL\Ver>"
+     TARGET="?:\usr\local\mysql"
+     TITLE="Test suite"
+     EXTERNAL="mysql-<$MySQL-Ver>-test.wpi"
+     CREATEOBJECT="WPProgram|Run MySQL Test Suite|<MYSQL_<$MySQL.Major>_<$MySQL.Minor>_FOLDER>|EXENAME=$(5)\mysql-test\mysql-test.cmd;PARAMETERS=$(1)\docs\manual.inf;ICONFILE=$(1)\bin\icons\mysql-manual.ico;OBJECTID=<MYSQL_<$MySQL.Major>_<$MySQL.Minor>_TESTSUITE>;"
+     SELECT
+     >This package will install MySQL for OS/2 test suite
+</PCK>
+
+</HEAD>
+
+<!-- Here come the different pages. They are linked by
+     the <NEXTBUTTON> tags, which must have a target.
+     Each page must have a TYPE= attribute, which tells
+     WarpIn what will be visible on that page. -->
+
+<BODY>
+
+<!-- page1: introduction ->>
+<PAGE INDEX=1 TYPE=README>
+<TEXT>
+</TEXT>
+<NEXTBUTTON TARGET=2>~Next</NEXTBUTTON>
+<README FORMAT=HTML>
+
+<P>Welcome to the latest port of <B>MySQL for OS/2 and eComStation</B>.
+<BR>
+<P>You are about to install <B>MySQL <$MySQL.Ver></B>
+
+<BR>
+<BR>
+<P>Select "Next" to continue.
+
+<P>Select "Cancel" to abort installation.
+</README>
+</PAGE>
+
+<!-- show ReadMe.txt -->
+<PAGE INDEX=2 TYPE=README>
+<NEXTBUTTON TARGET=3>~Next</NEXTBUTTON>
+<TEXT>
+</TEXT>
+<README FORMAT=PLAIN EXTRACTFROMPCK="1">ReadMe.txt</README>
+</PAGE>
+
+<!-- show GPL license -->
+<PAGE INDEX=3 TYPE=README>
+<NEXTBUTTON TARGET=4>~I agree</NEXTBUTTON>
+<TEXT>
+By pressing the "I agree" button, you agree to all terms and conditions to the below licence agreement.
+</TEXT>
+<README FORMAT=HTML EXTRACTFROMPCK="1">license.htm</README>
+</PAGE>
+
+
+<!-- The TYPE=CONTAINER will list the packages which can be installed. -->
+
+<PAGE INDEX=4 TYPE=CONTAINER>
+<NEXTBUTTON TARGET=5>~Next</NEXTBUTTON>
+<TEXT>
+Please select the packages which are to be installed. You may change the target paths for the packages.
+</TEXT>
+</PAGE>
+
+<!-- Here's another TYPE=TEXT page before we install.
+     The special target "0" indicates that after this page we
+     should start installation.
+     Note that the TYPE=INSTALL page (which we had in Alpha #3)
+     is no longer supported. -->
+
+<PAGE INDEX=5 TYPE=TEXT>
+<NEXTBUTTON TARGET=0>I~nstall</NEXTBUTTON>
+<TEXT>
+Press "Install" to begin installing this archive.</TEXT>
+</PAGE>
+
+</BODY>
+</WARPIN>

os2/mysqlalt.wis

+#include "mysql.ih"
+
+<WARPIN VERSION <$WARPIN_VERSION>>
+<HEAD>
+<MSG>
+This is not an installable archive.
+
+Please download and install the main archive:
+
+ mysql-<$MySQL-Ver>-bld1.wpi
+
+</MSG>
+</HEAD>
+</WARPIN>
+
\ No newline at end of file

sql/mysqld.cc

@@ -1220,7 +1220,7 @@ the thread stack. Please read http://www.mysql.com/doc/L/i/Linux.html\n\n",
 Some pointers may be invalid and cause the dump to abort...\n");
     safe_print_str("thd->query", thd->query, 1024);
     fprintf(stderr, "thd->thread_id=%ld\n", thd->thread_id);
-    fprintf(stderr, "\n
+    fprintf(stderr, "\n\
 Successfully dumped variables, if you ran with --log, take a look at the\n\
 details of what thread %ld did to cause the crash.  In some cases of really\n\
 bad corruption, the values shown above may be invalid\n\n",
@@ -2721,6 +2721,8 @@ static struct option long_options[] = {
   {0, 0, 0, 0}
 };
 
+#define LONG_TIMEOUT ((ulong) 3600L*24L*365L)
+
 CHANGEABLE_VAR changeable_vars[] = {
   { "back_log",                (long*) &back_log, 
       50, 1, 65535, 0, 1 },
@@ -2738,15 +2740,15 @@ CHANGEABLE_VAR changeable_vars[] = {
   { "binlog_cache_size",       (long*) &binlog_cache_size,
       32*1024L, IO_SIZE, ~0L, 0, IO_SIZE },
   { "connect_timeout",         (long*) &connect_timeout,
-      CONNECT_TIMEOUT, 2, 65535, 0, 1 },
+      CONNECT_TIMEOUT, 2, LONG_TIMEOUT, 0, 1 },
   { "delayed_insert_timeout",  (long*) &delayed_insert_timeout, 
-      DELAYED_WAIT_TIMEOUT, 1, ~0L, 0, 1 },
+      DELAYED_WAIT_TIMEOUT, 1, LONG_TIMEOUT, 0, 1 },
   { "delayed_insert_limit",    (long*) &delayed_insert_limit, 
       DELAYED_LIMIT, 1, ~0L, 0, 1 },
   { "delayed_queue_size",      (long*) &delayed_queue_size,
       DELAYED_QUEUE_SIZE, 1, ~0L, 0, 1 },
   { "flush_time",              (long*) &flush_time,
-      FLUSH_TIME, 0, ~0L, 0, 1 },
+      FLUSH_TIME, 0, LONG_TIMEOUT, 0, 1 },
 #ifdef HAVE_GEMINI_DB
   { "gemini_buffer_cache",     (long*) &gemini_buffer_cache,
       128 * 8192, 16, LONG_MAX, 0, 1 },
@@ -2791,13 +2793,13 @@ CHANGEABLE_VAR changeable_vars[] = {
      (long*) &innobase_force_recovery, 0, 0, 6, 0, 1},
 #endif
   { "interactive_timeout",     (long*) &net_interactive_timeout,
-      NET_WAIT_TIMEOUT, 1, 31*24*60*60, 0, 1 },
+      NET_WAIT_TIMEOUT, 1, LONG_TIMEOUT, 0, 1 },
   { "join_buffer_size",        (long*) &join_buff_size,
       128*1024L, IO_SIZE*2+MALLOC_OVERHEAD, ~0L, MALLOC_OVERHEAD, IO_SIZE },
   { "key_buffer_size",         (long*) &keybuff_size,
       KEY_CACHE_SIZE, MALLOC_OVERHEAD, (long) ~0, MALLOC_OVERHEAD, IO_SIZE },
   { "long_query_time",         (long*) &long_query_time,
-      10, 1, ~0L, 0, 1 },
+      10, 1, LONG_TIMEOUT, 0, 1 },
   { "lower_case_table_names",  (long*) &lower_case_table_names,
       IF_WIN(1,0), 0, 1, 0, 1 },
   { "max_allowed_packet",      (long*) &max_allowed_packet,
@@ -2836,9 +2838,9 @@ CHANGEABLE_VAR changeable_vars[] = {
   { "net_retry_count",         (long*) &mysqld_net_retry_count,
       MYSQLD_NET_RETRY_COUNT, 1, ~0L, 0, 1 },
   { "net_read_timeout",        (long*) &net_read_timeout, 
-      NET_READ_TIMEOUT, 1, 65535, 0, 1 },
+      NET_READ_TIMEOUT, 1, LONG_TIMEOUT, 0, 1 },
   { "net_write_timeout",       (long*) &net_write_timeout,
-      NET_WRITE_TIMEOUT, 1, 65535, 0, 1 },
+      NET_WRITE_TIMEOUT, 1, LONG_TIMEOUT, 0, 1 },
   { "open_files_limit",        (long*) &open_files_limit,
       0, 0, 65535, 0, 1},
   { "query_buffer_size",       (long*) &query_buff_size,
@@ -2848,9 +2850,9 @@ CHANGEABLE_VAR changeable_vars[] = {
   { "record_rnd_buffer",           (long*) &record_rnd_cache_size,
       0, IO_SIZE*2+MALLOC_OVERHEAD, ~0L, MALLOC_OVERHEAD, IO_SIZE },
   { "slave_net_timeout",        (long*) &slave_net_timeout, 
-      SLAVE_NET_TIMEOUT, 1, 65535, 0, 1 },
+      SLAVE_NET_TIMEOUT, 1, LONG_TIMEOUT, 0, 1 },
   { "slow_launch_time",        (long*) &slow_launch_time, 
-      2L, 0L, ~0L, 0, 1 },
+      2L, 0L, LONG_TIMEOUT, 0, 1 },
   { "sort_buffer",             (long*) &sortbuff_size,
       MAX_SORT_MEMORY, MIN_SORT_MEMORY+MALLOC_OVERHEAD*2, ~0L, MALLOC_OVERHEAD, 1 },
   { "table_cache",             (long*) &table_cache_size,
@@ -2864,7 +2866,7 @@ CHANGEABLE_VAR changeable_vars[] = {
   { "thread_stack",            (long*) &thread_stack,
       DEFAULT_THREAD_STACK, 1024*32, ~0L, 0, 1024 },
   { "wait_timeout",            (long*) &net_wait_timeout,
-      NET_WAIT_TIMEOUT, 1, ~0L, 0, 1 },
+      NET_WAIT_TIMEOUT, 1, LONG_TIMEOUT, 0, 1 },
   { NullS, (long*) 0, 0, 0, 0, 0, 0}
 };
 

sql/share/czech/errmsg.txt

@@ -224,14 +224,6 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
 "The used table type doesn't support FULLTEXT indexes",
 "Cannot add foreign key constraint",
 "Cannot add a child row: a foreign key constraint fails",

sql/share/danish/errmsg.txt

@@ -218,14 +218,6 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
 "The used table type doesn't support FULLTEXT indexes",
 "Cannot add foreign key constraint",
 "Cannot add a child row: a foreign key constraint fails",

sql/share/dutch/errmsg.txt

@@ -167,6 +167,8 @@
 "Communicatiepakket kon niet worden gedecomprimeerd",
 "Fout bij het lezen van communicatiepakketten"
 "Timeout bij het lezen van communicatiepakketten",
+"Got an error writing communication packets",
+"Got timeout writing communication packets",
 "Resultaat string is langer dan max_allowed_packet",
 "Het gebruikte tabel type ondersteunt geen BLOB/TEXT kolommen",
 "Het gebruikte tabel type ondersteunt geen AUTO_INCREMENT kolommen",
@@ -219,14 +221,6 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
 "The used table type doesn't support FULLTEXT indexes",
 "Cannot add foreign key constraint",
 "Cannot add a child row: a foreign key constraint fails",

sql/share/english/errmsg.txt

@@ -215,15 +215,7 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
 "The used table type doesn't support FULLTEXT indexes",
 "Cannot add foreign key constraint",
 "Cannot add a child row: a foreign key constraint fails",
-"Cannot delete a parent row: a foreign key constraint fails",
+"Cannot delete a parent row: a foreign key constraint fails",
\ No newline at end of file

sql/share/estonian/errmsg.txt

@@ -219,14 +219,6 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
 "The used table type doesn't support FULLTEXT indexes",
 "Cannot add foreign key constraint",
 "Cannot add a child row: a foreign key constraint fails",

sql/share/french/errmsg.txt

@@ -215,14 +215,6 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
 "The used table type doesn't support FULLTEXT indexes",
 "Cannot add foreign key constraint",
 "Cannot add a child row: a foreign key constraint fails",

sql/share/german/errmsg.txt

@@ -218,14 +218,6 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
 "The used table type doesn't support FULLTEXT indexes",
 "Cannot add foreign key constraint",
 "Cannot add a child row: a foreign key constraint fails",

sql/share/greek/errmsg.txt

@@ -215,15 +215,6 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
-"Deadlock found when trying to get lock; Try restarting transaction",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
 "The used table type doesn't support FULLTEXT indexes",
 "Cannot add foreign key constraint",
 "Cannot add a child row: a foreign key constraint fails",

sql/share/hungarian/errmsg.txt

@@ -217,15 +217,6 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
-"Deadlock found when trying to get lock; Try restarting transaction",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
 "The used table type doesn't support FULLTEXT indexes",
 "Cannot add foreign key constraint",
 "Cannot add a child row: a foreign key constraint fails",

sql/share/italian/errmsg.txt

@@ -215,15 +215,6 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
-"Deadlock found when trying to get lock; Try restarting transaction",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
 "The used table type doesn't support FULLTEXT indexes",
 "Cannot add foreign key constraint",
 "Cannot add a child row: a foreign key constraint fails",

sql/share/japanese/errmsg.txt

@@ -217,15 +217,6 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
-"Deadlock found when trying to get lock; Try restarting transaction",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
 "The used table type doesn't support FULLTEXT indexes",
 "Cannot add foreign key constraint",
 "Cannot add a child row: a foreign key constraint fails",

sql/share/korean/errmsg.txt

@@ -215,15 +215,6 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
-"Deadlock found when trying to get lock; Try restarting transaction",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
 "The used table type doesn't support FULLTEXT indexes",
 "Cannot add foreign key constraint",
 "Cannot add a child row: a foreign key constraint fails",

sql/share/norwegian-ny/.cvsignore

-errmsg.sys

sql/share/norwegian-ny/errmsg.txt

@@ -217,15 +217,6 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
-"Deadlock found when trying to get lock; Try restarting transaction",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
 "The used table type doesn't support FULLTEXT indexes",
 "Cannot add foreign key constraint",
 "Cannot add a child row: a foreign key constraint fails",

sql/share/norwegian/.cvsignore

-errmsg.sys

sql/share/norwegian/errmsg.txt

@@ -217,15 +217,6 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
-"Deadlock found when trying to get lock; Try restarting transaction",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
 "The used table type doesn't support FULLTEXT indexes",
 "Cannot add foreign key constraint",
 "Cannot add a child row: a foreign key constraint fails",

sql/share/polish/errmsg.txt

@@ -219,15 +219,6 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
-"Deadlock found when trying to get lock; Try restarting transaction",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
 "The used table type doesn't support FULLTEXT indexes",
 "Cannot add foreign key constraint",
 "Cannot add a child row: a foreign key constraint fails",

sql/share/portuguese/errmsg.txt

@@ -215,15 +215,6 @@
 "Não é permitido a %-.32s@%-.64s criar novos usuários",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
-"Deadlock found when trying to get lock; Try restarting transaction",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
 "The used table type doesn't support FULLTEXT indexes",
 "Cannot add foreign key constraint",
 "Cannot add a child row: a foreign key constraint fails",

sql/share/romanian/errmsg.txt

@@ -219,15 +219,6 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
-"Deadlock found when trying to get lock; Try restarting transaction",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
 "The used table type doesn't support FULLTEXT indexes",
 "Cannot add foreign key constraint",
 "Cannot add a child row: a foreign key constraint fails",

sql/share/russian/errmsg.txt

@@ -207,26 +207,17 @@
 "   slave,       CHANGE MASTER TO",
 "    master info,  persmissions   master.info",
 "    SLAVE,   ",
-"User %-.64s has already more than 'max_user_connections' active connections",
-"You may only use constant expressions with SET",
-"Lock wait timeout exceeded",
-"The total number of locks exceeds the lock table size",
-"Update locks cannot be acquired during a READ UNCOMMITTED transaction",
-"DROP DATABASE not allowed while thread is holding global read lock",
-"CREATE DATABASE not allowed while thread is holding global read lock",
-"Wrong arguments to %s",
-"%-.32s@%-.64s is not allowed to create new users",
-"Incorrect table definition; All MERGE tables must be in the same database",
-"Deadlock found when trying to get lock; Try restarting transaction",
-"Deadlock found when trying to get lock; Try restarting transaction",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
+"  %-.64s    'max_user_connections'  ",
+"   -   SET",
+"  ",
+"      ",
+"        READ UNCOMMITTED ",
+"DROP DATABASE      ",
+"CREATE DATABASE      ",
+"   %s",
+"%-.32s@%-.64s      ",
+"  ;  MERGE-      ",
+" deadlock    ;   ",
 "      FULLTEXT ",
 "Cannot add foreign key constraint",
 "Cannot add a child row: a foreign key constraint fails",

sql/share/slovak/errmsg.txt

@@ -223,15 +223,6 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
-"Deadlock found when trying to get lock; Try restarting transaction",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
 "The used table type doesn't support FULLTEXT indexes",
 "Cannot add foreign key constraint",
 "Cannot add a child row: a foreign key constraint fails",

sql/share/spanish/errmsg.txt

@@ -216,15 +216,6 @@
 "%-.32s@%-.64s is not allowed to create new users",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
-"Deadlock found when trying to get lock; Try restarting transaction",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
 "The used table type doesn't support FULLTEXT indexes",
 "Cannot add foreign key constraint",
 "Cannot add a child row: a foreign key constraint fails",

sql/share/swedish/errmsg.txt

@@ -215,16 +215,7 @@
 "%-.32s@%-.64s har inte rättigheter att skapa nya användare",
 "Felaktig tabell definition: Alla tabeller i en MERGE tabell måste vara i samma databas",
 "Fick 'DEADLOCK' vid låsförsök av block/rad; Försök att starta om transaktionen",
-"Deadlock found when trying to get lock; Try restarting transaction",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"The used table type doesn't support FULLTEXT indexes",
-"Cannot add foreign key constraint",
-"Cannot add a child row: a foreign key constraint fails",
-"Cannot delete a parent row: a foreign key constraint fails",
+"Tabelltypen har inte hantering av FULLTEXT index",
+"Kan inte lägga till 'FOREIGN KEY constraint'",
+"FOREIGN KEY konflikt:  Kan inte skriva barn",
+"FOREIGN KEY konflikt:  Kan inte radera fader",

sql/share/ukrainian/errmsg.txt

@@ -220,15 +220,6 @@
 " %-.32s@%-.64s     ަ",
 "Incorrect table definition; All MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
-"Deadlock found when trying to get lock; Try restarting transaction",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
-"Dummy error message: this error number should only occur in MySQL-4",
 "  æ  Цդ FULLTEXT Ӧ",
 "Cannot add foreign key constraint",
 "Cannot add a child row: a foreign key constraint fails",

sql/sql_select.cc

@@ -2942,7 +2942,9 @@ propagate_cond_constants(I_List<COND_CMP> *save_list,COND *and_level,
       Item_func_eq *func=(Item_func_eq*) cond;
       bool left_const= func->arguments()[0]->const_item();
       bool right_const=func->arguments()[1]->const_item();
-      if (!(left_const && right_const))
+      if (!(left_const && right_const) &&
+	  (func->arguments()[0]->result_type() ==
+	   (func->arguments()[1]->result_type())))
       {
 	if (right_const)
 	{
@@ -3986,14 +3988,17 @@ do_select(JOIN *join,List<Item> *fields,TABLE *table,Procedure *procedure)
   {
     if (table->group && join->tmp_table_param.sum_func_count)
     {
-      DBUG_PRINT("info",("Using end_update"));
       if (table->keys)
       {
+	DBUG_PRINT("info",("Using end_update"));
 	end_select=end_update;
 	table->file->index_init(0);
       }
       else
+      {
+	DBUG_PRINT("info",("Using end_unique_update"));
 	end_select=end_unique_update;
+      }
     }
     else if (join->sort_and_group)
     {
@@ -4109,8 +4114,6 @@ sub_select(JOIN *join,JOIN_TAB *join_tab,bool end_of_records)
   int error;
   bool found=0;
   COND *on_expr=join_tab->on_expr, *select_cond=join_tab->select_cond;
-  int  (*next_select)(JOIN *,struct st_join_table *,bool)=
-    join_tab->next_select;
 
   if (!(error=(*join_tab->read_first_record)(join_tab)))
   {
@@ -4134,7 +4137,7 @@ sub_select(JOIN *join,JOIN_TAB *join_tab,bool end_of_records)
 	  break;			// Searching after not null columns
 	if (!select_cond || select_cond->val_int())
 	{
-	  if ((error=(*next_select)(join,join_tab+1,0)) < 0)
+	  if ((error=(*join_tab->next_select)(join,join_tab+1,0)) < 0)
 	    return error;
 	  if (not_used_in_distinct && found_records != join->found_records)
 	    return 0;
@@ -4155,7 +4158,7 @@ sub_select(JOIN *join,JOIN_TAB *join_tab,bool end_of_records)
     mark_as_null_row(join_tab->table);		// For group by without error
     if (!select_cond || select_cond->val_int())
     {
-      if ((error=(*next_select)(join,join_tab+1,0)) < 0)
+      if ((error=(*join_tab->next_select)(join,join_tab+1,0)) < 0)
 	return error;				/* purecov: inspected */
     }
   }