Manual merge of Novell's changes for NetWare platform from 4.0, 4.1 patches

client/mysql.cc

@@ -1774,9 +1774,6 @@ print_table_data(MYSQL_RES *result)
   MYSQL_ROW	cur;
   MYSQL_FIELD	*field;
   bool		*num_flag;
-#ifdef __NETWARE__
-  uint		lines= 0;
-#endif
 
   num_flag=(bool*) my_alloca(sizeof(bool)*mysql_num_fields(result));
   if (info_flag)
@@ -1832,10 +1829,6 @@ print_table_data(MYSQL_RES *result)
 		  length, str);
     }
     (void) tee_fputs("\n", PAGER);
-#ifdef __NETWARE__
-    // on a long result the screen could hog the cpu
-    if ((lines++ & 1023) == 0) pthread_yield();
-#endif
   }
   tee_puts(separator.c_ptr(), PAGER);
   my_afree((gptr) num_flag);
@@ -1847,9 +1840,6 @@ print_table_data_html(MYSQL_RES *result)
 {
   MYSQL_ROW	cur;
   MYSQL_FIELD	*field;
-#ifdef __NETWARE__
-  uint		lines= 0;
-#endif
 
   mysql_field_seek(result,0);
   (void) tee_fputs("<TABLE BORDER=1><TR>", PAGER);
@@ -1874,10 +1864,6 @@ print_table_data_html(MYSQL_RES *result)
       (void) tee_fputs("</TD>", PAGER);
     }
     (void) tee_fputs("</TR>", PAGER);
-#ifdef __NETWARE__
-    // on a long result the screen could hog the cpu
-    if ((lines++ & 1023) == 0) pthread_yield();
-#endif
   }
   (void) tee_fputs("</TABLE>", PAGER);
 }
@@ -1888,9 +1874,6 @@ print_table_data_xml(MYSQL_RES *result)
 {
   MYSQL_ROW   cur;
   MYSQL_FIELD *fields;
-#ifdef __NETWARE__
-  uint		lines= 0;
-#endif
 
   mysql_field_seek(result,0);
 
@@ -1914,10 +1897,6 @@ print_table_data_xml(MYSQL_RES *result)
 				      " &nbsp; ") : "NULL"));
     }
     (void) tee_fputs("  </row>\n", PAGER);
-#ifdef __NETWARE__
-      // on a long result the screen could hog the cpu
-    if ((lines++ & 1023) == 0) pthread_yield();
-#endif
   }
   (void) tee_fputs("</resultset>\n", PAGER);
 }
@@ -1950,10 +1929,6 @@ print_table_data_vertically(MYSQL_RES *result)
       tee_fprintf(PAGER, "%*s: ",(int) max_length,field->name);
       tee_fprintf(PAGER, "%s\n",cur[off] ? (char*) cur[off] : "NULL");
     }
-#ifdef __NETWARE__
-      // on a long result the screen could hog the cpu
-    if ((row_count & 1023) == 0) pthread_yield();
-#endif
   }
 }
 

client/mysqldump.c

@@ -30,7 +30,7 @@
 ** master/autocommit code by Brian Aker <brian@tangent.org>
 ** SSL by
 ** Andrei Errapart <andreie@no.spam.ee>
-** Tnu Samuel  <tonu@please.do.not.remove.this.spam.ee>
+** Tõnu Samuel  <tonu@please.do.not.remove.this.spam.ee>
 ** XML by Gary Huntress <ghuntress@mediaone.net> 10/10/01, cleaned up
 ** and adapted to mysqldump 05/11/01 by Jani Tolonen
 ** Added --single-transaction option 06/06/2002 by Peter Zaitsev
@@ -986,9 +986,6 @@ static void dumpTable(uint numFields, char *table)
   MYSQL_FIELD	*field;
   MYSQL_ROW	row;
   ulong		rownr, row_break, total_length, init_length;
-#if defined(__NETWARE__) && defined(THREAD)
-  uint		lines= 0;
-#endif
 
   if (verbose)
     fprintf(stderr, "-- Sending SELECT query...\n");
@@ -1218,11 +1215,6 @@ static void dumpTable(uint numFields, char *table)
       }
       else if (!opt_xml)
 	fputs(");\n", md_result_file);
-#if defined(__NETWARE__) && defined(THREAD)
-      /* on a long result the screen could hog the cpu */
-      if ((lines++ & 1023) == 0)
-	pthread_yield();
-#endif
     }
 
     /* XML - close table tag and supress regular output */

include/my_pthread.h

@@ -357,14 +357,6 @@ extern int my_pthread_cond_timedwait(pthread_cond_t *cond,
 #define pthread_cond_timedwait(A,B,C) my_pthread_cond_timedwait((A),(B),(C))
 #endif
 
-
-#ifdef __NETWARE__
-extern int my_pthread_cond_timedwait(pthread_cond_t *cond,
-				     pthread_mutex_t *mutex,
-				     struct timespec *abstime);
-#define pthread_cond_timedwait(A,B,C) my_pthread_cond_timedwait((A),(B),(C))
-#endif /* __NETWARE__ */
-
 #if defined(OS2)
 #define my_pthread_getspecific(T,A) ((T) &(A))
 #define pthread_setspecific(A,B) win_pthread_setspecific(&(A),(B),sizeof(A))

mysys/default.c

@@ -244,7 +244,7 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc,
     strmov(name,config_file);
   }
   fn_format(name,name,"","",4);
-#if !defined(__WIN__) && !defined(OS2)
+#if !defined(__WIN__) && !defined(OS2) && !defined(__NETWARE__)
   {
     MY_STAT stat_info;
     if (!my_stat(name,&stat_info,MYF(0)))

mysys/my_init.c

@@ -387,16 +387,6 @@ static void netware_init()
 	*name = tolower(*name);
       }
     }
-    /*
-      Set the current working directory to the base directory of the file
-      name (assuming the binary is in 'base-file-name/bin/'
-    */
-    strmov(cwd, my_progname);
-    if ((name= strindex(cwd, "/bin/")) != NULL)
-    {
-      *name= 0;
-      chdir(cwd);
-    }
   }
 }
 #endif /* __NETWARE__ */

mysys/my_pthread.c

@@ -426,19 +426,6 @@ int my_pthread_cond_init(pthread_cond_t *mp, const pthread_condattr_t *attr)
 #endif
 
 
-#ifdef __NETWARE__
-/*  NetWare does not re-acquire the lock if the condition fails */
-int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
-			      struct timespec *abstime)
-{
-  int err= pthread_cond_timedwait(cond, mutex, abstime);
-  if (err)
-    pthread_mutex_lock(mutex);
-  return err;
-}
-#endif /* __NETWARE__ */
-
-
 /*****************************************************************************
   Patches for HPUX
   We need these because the pthread_mutex.. code returns -1 on error,

mysys/thr_mutex.c

@@ -241,11 +241,6 @@ int safe_cond_timedwait(pthread_cond_t *cond, safe_mutex_t *mp,
     fflush(stderr);
     abort();
   }
-#ifdef __NETWARE__
-  /* NetWare doesn't re-acquire the mutex on an error */
-  if (error && pthread_mutex_lock(&mp->mutex))
-    mp->count--;
-#endif /* __NETWARE__ */
   mp->thread=pthread_self();
   mp->file= (char*) file;
   mp->line=line;

netware/BUILD/mwenv

@@ -6,9 +6,9 @@
 # the default is "F:/mydev"
 export MYDEV="WINE_BUILD_DIR"
 
-export MWCNWx86Includes="$MYDEV/libc/include"
-export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib"
-export MWNWx86LibraryFiles="libcpre.o;libc.imp;netware.imp;mwcrtl.lib;mwcpp.lib"
+export MWCNWx86Includes="$MYDEV/libc/include;$MYDEV/zlib-1.1.4"
+export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib;$MYDEV/zlib-1.1.4"
+export MWNWx86LibraryFiles="libcpre.o;libc.imp;netware.imp;mwcrtl.lib;mwcpp.lib;libz.a"
 
 export WINEPATH="$MYDEV/mw/bin"
 

netware/Makefile.am

@@ -29,7 +29,7 @@ netware_build_files =           client/mysql.def client/mysqladmin.def \
                                 extra/mysql_install.def extra/my_print_defaults.def \
                                 extra/perror.def extra/replace.def \
                                 extra/resolveip.def extra/comp_err.def \
-																isam/isamchk.def \
+				isam/isamchk.def \
                                 isam/isamlog.def isam/pack_isam.def \
                                 libmysqld/libmysqld.def myisam/myisamchk.def \
                                 myisam/myisamlog.def myisam/myisampack.def \

scripts/make_binary_distribution.sh

@@ -48,7 +48,7 @@ if [ -d $BASE ] ; then
 fi
 
 BS=""
-EXTRA_BIN_FILES=""
+BIN_FILES=""
 BASE_SYSTEM="any"
 MYSQL_SHARE=$BASE/share/mysql
 
@@ -57,9 +57,6 @@ case $system in
     BASE_SYSTEM="netware"
     BS=".nlm"
     MYSQL_SHARE=$BASE/share
-    EXTRA_BIN_FILES="netware/mysqld_safe.nlm netware/mysql_install_db.nlm \
-      netware/init_db.sql netware/test_db.sql netware/mysql_explain_log.nlm \
-      netware/mysqlhotcopy.nlm netware/libmysql.nlm netware/init_secure_db.sql"
     ;;
 esac
 
@@ -86,23 +83,40 @@ do
   fi
 done
 
-for i in extra/comp_err$BS extra/replace$BS extra/perror$BS \
-         extra/resolveip$BS extra/my_print_defaults$BS \
-         extra/resolve_stack_dump$BS extra/mysql_waitpid$BS \
-        isam/isamchk$BS isam/pack_isam$BS \
-        myisam/myisamchk$BS myisam/myisampack$BS myisam/myisamlog$BS \
-        sql/mysqld$BS \
-        client/mysql$BS client/mysqlshow$BS client/mysqladmin$BS \
-	client/mysqldump$BS client/mysqlimport$BS \
-        client/mysqltest$BS client/mysqlcheck$BS \
-        client/mysqlbinlog$BS client/mysqlmanagerc$BS \
-        client/mysqlmanager-pwgen$BS tools/mysqlmanager$BS \
-        client/.libs/mysql client/.libs/mysqlshow client/.libs/mysqladmin \
-        client/.libs/mysqldump client/.libs/mysqlimport \
-        client/.libs/mysqltest client/.libs/mysqlcheck \
-        client/.libs/mysqlbinlog client/.libs/mysqlmanagerc \
-        client/.libs/mysqlmanager-pwgen tools/.libs/mysqlmanager \
-        $EXTRA_BIN_FILES
+# Non platform-specific bin dir files:
+BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \
+  extra/resolveip$BS extra/my_print_defaults$BS \
+  extra/resolve_stack_dump$BS extra/mysql_waitpid$BS \
+  isam/isamchk$BS isam/pack_isam$BS \
+  myisam/myisamchk$BS myisam/myisampack$BS myisam/myisamlog$BS \
+  sql/mysqld$BS \
+  client/mysql$BS client/mysqlshow$BS client/mysqladmin$BS \
+  client/mysqldump$BS client/mysqlimport$BS \
+  client/mysqltest$BS client/mysqlcheck$BS \
+  client/mysqlbinlog$BS 
+";
+
+# Platform-specific bin dir files:
+if [ $BASE_SYSTEM = "netware" ] ; then
+  BIN_FILES="$BIN_FILES \
+    netware/mysqld_safe$BS netware/mysql_install_db$BS \
+    netware/init_db.sql netware/test_db.sql netware/mysql_explain_log$BS \
+    netware/mysqlhotcopy$BS netware/libmysql$BS netware/init_secure_db.sql
+    ";
+else
+  # For all other platforms:
+  BIN_FILES="$BIN_FILES \
+    client/mysqlmanagerc \
+    client/mysqlmanager-pwgen tools/mysqlmanager \
+    client/.libs/mysql client/.libs/mysqlshow client/.libs/mysqladmin \
+    client/.libs/mysqldump client/.libs/mysqlimport \
+    client/.libs/mysqltest client/.libs/mysqlcheck \
+    client/.libs/mysqlbinlog client/.libs/mysqlmanagerc \
+    client/.libs/mysqlmanager-pwgen tools/.libs/mysqlmanager \
+  ";
+fi
+
+for i in $BIN_FILES
 do
   if [ -f $i ]
   then