Fixes for OS2.

Fix bug in isamlog
Add argument types to function declarations.


Docs/manual.texi:
  Updated credits
client/mysql.cc:
  Fixes for OS2
client/mysqladmin.c:
  Fixes for OS2
client/mysqldump.c:
  Fixes for OS2
client/mysqlimport.c:
  Fixes for OS2
client/mysqltest.c:
  Fixes for OS2
dbug/dbug.c:
  Fixes for OS2.
  Use new C calling convention.
dbug/factorial.c:
  Fixes for OS2.
  Use new C calling convention.
include/errmsg.h:
  Fix for OS2
include/global.h:
  Fixes for OS2.
include/my_pthread.h:
  Fixes for OS2.
include/my_sys.h:
  Fixes for OS2.
include/mysql_com.h:
  Move defines to global.h
include/thr_alarm.h:
  Fixes for OS2.
isam/isamchk.c:
  Fixes for OS2.
  Add arguments to function declarations.
isam/isamlog.c:
  Fixes for OS2.
  Fix bug in logfile handling.
isam/test1.c:
  Add arguments to function decl
isam/test2.c:
  Add arguments to function declarations.
isam/test_all.res:
  Update result
libmysql/get_password.c:
  Fixes for OS2.
libmysql/libmysql.c:
  Fixes for OS2.
libmysql/net.c:
  Fixes for OS2.
libmysql/violite.c:
  Add arguments to function declarations.
merge/_locking.c:
  Add argument types to function declarations.
merge/close.c:
  Add argument types to function declarations.
merge/create.c:
  Add argument types to function declarations.
merge/extra.c:
  Add argument types to function declarations.
merge/open.c:
  Add argument types to function declarations.
merge/panic.c:
  Add argument types to function declarations.
merge/rsame.c:
  Add argument types to function declarations.
merge/update.c:
  Add argument types to function declarations.
myisam/ft_eval.c:
  Portability fix
myisam/ft_search.c:
  Portability fix
myisam/ft_test1.c:
  Portability fix
myisam/ftdefs.h:
  Portability fix
myisam/mi_check.c:
  Portability fix
myisam/mi_test1.c:
  Portability fix
myisam/mi_test2.c:
  Portability fix
myisam/mi_test_all.sh:
  Update to test for MACH variable
myisam/myisamlog.c:
  Cleanup
myisam/myisampack.c:
  Don't use variable 'new'
myisam/sort.c:
  Portability fix
myisammrg/myrg_delete.c:
  Add argument types to function declarations.
myisammrg/myrg_locking.c:
  Add argument types to function declarations.
myisammrg/myrg_open.c:
  Add argument types to function declarations.
myisammrg/myrg_panic.c:
  Add argument types to function declarations.
mysql-test/t/backup.test:
  Fix for OS2
mysql-test/t/show_check.test:
  Fix for OS2
mysys/charset.c:
  Dont use variable 'new'
mysys/default.c:
  Fixes for OS2.
mysys/getopt.c:
  Fixes for OS2.
mysys/getopt1.c:
  Fixes for OS2.
mysys/list.c:
  Don't use variable 'new'
mysys/mf_dirname.c:
  Fixes for OS2.
mysys/mf_format.c:
  Fixes for OS2.
mysys/mf_path.c:
  Fixes for OS2.
mysys/mf_qsort.c:
  Portability fix
mysys/mf_tempfile.c:
  Fixes for OS2.
mysys/my_clock.c:
  Fixes for OS2.
mysys/my_copy.c:
  Fixes for OS2.
mysys/my_create.c:
  Fixes for OS2.
mysys/my_getwd.c:
  Fixes for OS2.
mysys/my_init.c:
  Fixes for OS2.
mysys/my_lib.c:
  Fixes for OS2.
mysys/my_lock.c:
  Fixes for OS2.
mysys/my_malloc.c:
  Portability fix
mysys/my_mkdir.c:
  Fixes for OS2.
mysys/my_open.c:
  Fixes for OS2.
mysys/my_pthread.c:
  Fixes for OS2.
mysys/my_realloc.c:
  Fixes for OS2.
mysys/my_redel.c:
  Fixes for OS2.
mysys/my_static.c:
  Fixes for OS2.
mysys/my_tempnam.c:
  Fixes for OS2.
mysys/my_thr_init.c:
  Fixes for OS2.
mysys/my_write.c:
  Fixes for OS2.
mysys/test_charset.c:
  Fixes for OS2.
mysys/thr_alarm.c:
  Fixes for OS2.
mysys/tree.c:
  Fixes for OS2.
sql/field.cc:
  Fixes for OS2.
sql/field.h:
  Fixes for OS2.
sql/gen_lex_hash.cc:
  Fixes for OS2.
sql/hostname.cc:
  Fixes for OS2.
sql/item_func.cc:
  Fixes for OS2.
sql/item_strfunc.cc:
  Fixes for OS2.
sql/log_event.cc:
  Fixes for OS2.
sql/md5.c:
  Fixes for OS2.
sql/mini_client.cc:
  Fixes for OS2.
sql/mysql_priv.h:
  Fixes for OS2.
sql/mysqld.cc:
  Fixes for OS2.
sql/net_serv.cc:
  Fixes for OS2.
sql/slave.cc:
  Fixes for OS2.
sql/sql_base.cc:
  Fixes for OS2.
sql/sql_db.cc:
  Portability fix
sql/sql_insert.cc:
  Fixes for OS2.
sql/sql_load.cc:
  Fixes for OS2.
sql/sql_parse.cc:
  Fixes for OS2.
sql/sql_table.cc:
  Fixes for OS2.
sql/sql_udf.cc:
  Fixes for OS2.
sql/violite.c:
  Fixes for OS2.
strings/ctype-big5.c:
  Fixes for OS2.
strings/ctype-gbk.c:
  Fixes for OS2.
strings/ctype-sjis.c:
  Fixes for OS2.
strings/ctype-tis620.c:
  Fixes for OS2.
strings/ctype.c:
  Fixes for OS2.
strings/strnlen.c:
  Fixes for OS2.

1 files changed, 117 insertions, 0 deletions

diff --git a/os2/MySQL-Sql.icc b/os2/MySQL-Sql.icc
new file mode 100644
index 00000000000..0c3fc69d68c
--- /dev/null
+++ b/os2/MySQL-Sql.icc
@@ -0,0 +1,117 @@
+// disable code inlining when building static libs
+InlineCode = "no"
+
+// include common options
+include "MySQL-Opt.icc"
+include "MySQL-Source.icc"
+
+option ProjectOptions = MySQLOptions
+                        , define( "MYSQL_SERVER", "")
+{
+
+   option file(genobject, "..\\OBJ\\ZLIB\\")
+   {
+      target "..\\bin\\mysqld.exe"
+      {
+         // 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') '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'
+
+         // target source files
+         source "rint.obj"
+         source zlib, ufc, regex
+         if debug_build  {
+            source type('cpp') dbug
+         }
+         source type('cpp') heap
+         source type('cpp') isam
+         source type('cpp') merge
+         source type('cpp') myisam
+         source type('cpp') myisammrg
+         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"
+      }
+   }
+*/
+}