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.
2025-08-07 00:04:31 +03:00 · 2001-08-22 01:45:07 +03:00
parent d61418b94f
commit 31b9e6e03f
137 changed files with 9927 additions and 852 deletions
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -77,7 +77,7 @@ extern "C" {

 #undef bcmp				// Fix problem with new readline
 #undef bzero
-#ifdef __WIN__
+#if defined( __WIN__) || defined(OS2)
 #include <conio.h>
 #else
 #include <readline/readline.h>
@@ -569,7 +569,7 @@ static int get_options(int argc, char **argv)

  set_all_changeable_vars(changeable_vars);
  while ((c=getopt_long(argc,argv,
-			"?ABCD:LfgGHinNoqrstTU::vVw::WEe:h:O:P:S:u:#::p::",
+			(char*) "?ABCD:LfgGHinNoqrstTU::vVw::WEe:h:O:P:S:u:#::p::",
 			long_options, &option_index)) != EOF)
  {
    switch(c) {
@@ -767,10 +767,20 @@ static int get_options(int argc, char **argv)
  return(0);
 }

+#if  defined(OS2)
+static char* readline( char* prompt)
+{
+#if defined(OS2)
+   static char linebuffer[254];
+#endif
+   puts( prompt);
+   return gets( linebuffer);
+}
+#endif

 static int read_lines(bool execute_commands)
 {
-#ifdef __WIN__
+#if defined( __WIN__) || defined(OS2)
  char linebuffer[254];
 #endif
  char	*line;
@@ -790,7 +800,7 @@ static int read_lines(bool execute_commands)
    }
    else
    {
-#ifdef __WIN__
+#if defined( __WIN__) || defined(OS2)
      if (opt_outfile && glob_buffer.is_empty())
 	fflush(OUTFILE);
      tee_fputs(glob_buffer.is_empty() ? "mysql> " :
@@ -1483,7 +1493,7 @@ com_go(String *buffer,char *line __attribute__((unused)))

 static void init_pager()
 {
-#ifndef __WIN__
+#if !defined( __WIN__) && !defined( OS2)
  if (!opt_nopager)
  {
    if (!(PAGER= popen(pager, "w")))
@@ -1499,7 +1509,7 @@ static void init_pager()

 static void end_pager()
 {
-#ifndef __WIN__
+#if !defined( __WIN__) && !defined( OS2)
  if (!opt_nopager)
    pclose(PAGER);
 #endif
@@ -2337,6 +2347,9 @@ void tee_fprintf(FILE *file, const char *fmt, ...)

  va_start(args, fmt);
  (void) vfprintf(file, fmt, args);
+#ifdef OS2
+  fflush( file);
+#endif
  if (opt_outfile)
    (void) vfprintf(OUTFILE, fmt, args);
  va_end(args);
@@ -2346,6 +2359,9 @@ void tee_fprintf(FILE *file, const char *fmt, ...)
 void tee_fputs(const char *s, FILE *file)
 {
  fputs(s, file);
+#ifdef OS2
+  fflush( file);
+#endif
  if (opt_outfile)
    fputs(s, OUTFILE);
 }
@@ -2355,6 +2371,9 @@ void tee_puts(const char *s, FILE *file)
 {
  fputs(s, file);
  fputs("\n", file);
+#ifdef OS2
+  fflush( file);
+#endif
  if (opt_outfile)
  {
    fputs(s, OUTFILE);
@@ -2365,11 +2384,14 @@ void tee_puts(const char *s, FILE *file)
 void tee_putc(int c, FILE *file)
 {
  putc(c, file);
+#ifdef OS2
+  fflush( file);
+#endif
  if (opt_outfile)
    putc(c, OUTFILE);
 }

-#ifdef __WIN__
+#if defined( __WIN__) || defined( OS2)
 #include <time.h>
 #else
 #include <sys/times.h>
@@ -2379,7 +2401,7 @@ void tee_putc(int c, FILE *file)

 static ulong start_timer(void)
 {
-#ifdef __WIN__
+#if defined( __WIN__) || defined( OS2)
 return clock();
 #else
  struct tms tms_tmp;