Added patches from Novell

12 files changed, 101 insertions, 25 deletions

diff --git a/netware/BUILD/compile-netware-all b/netware/BUILD/compile-netware-all
index 6baff699e94..dbe64e8f97e 100755
--- a/netware/BUILD/compile-netware-all
+++ b/netware/BUILD/compile-netware-all
@@ -11,5 +11,5 @@ path=`dirname $0`
 $path/compile-netware-src
 $path/compile-netware-standard
 $path/compile-netware-debug
-#$path/compile-netware-max
-#$path/compile-netware-max-debug
+$path/compile-netware-max
+$path/compile-netware-max-debug
diff --git a/netware/BUILD/compile-netware-standard b/netware/BUILD/compile-netware-standard
index 45f5021862c..a21ea16a445 100755
--- a/netware/BUILD/compile-netware-standard
+++ b/netware/BUILD/compile-netware-standard
@@ -14,6 +14,7 @@ suffix="standard"
 
 extra_configs=" \
 	--with-innodb \
+	--enable-thread-safe-client \
 	"
 
 . $path/compile-netware-END
diff --git a/netware/BUILD/mwenv b/netware/BUILD/mwenv
index c16ada6552a..22f518bcc0d 100755
--- a/netware/BUILD/mwenv
+++ b/netware/BUILD/mwenv
@@ -6,9 +6,9 @@
 # the default is "F:/mydev"
 export MYDEV="WINE_BUILD_DIR"
 
-export MWCNWx86Includes="$MYDEV/libc/include;$MYDEV"
-export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib;$MYDEV/mysql-VERSION/netware/BUILD"
-export MWNWx86LibraryFiles="libcpre.o;libc.imp;netware.imp;mwcrtl.lib;mwcpp.lib;knetware.imp"
+export MWCNWx86Includes="$MYDEV/libc/include;$MYDEV/fs64/headers;$MYDEV"
+export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib;$MYDEV/fs64/imports;$MYDEV/mysql-VERSION/netware/BUILD"
+export MWNWx86LibraryFiles="libcpre.o;libc.imp;netware.imp;mwcrtl.lib;mwcpp.lib;neb.imp;zPublics.imp;knetware.imp"
 
 export WINEPATH="$MYDEV/mw/bin"
 
diff --git a/netware/Makefile.am b/netware/Makefile.am
index 0f5e862c579..8d7efec8e3c 100644
--- a/netware/Makefile.am
+++ b/netware/Makefile.am
@@ -33,7 +33,8 @@ netware_build_files =           client/mysql.def client/mysqladmin.def \
                                 isam/isamlog.def isam/pack_isam.def \
                                 libmysqld/libmysqld.def myisam/myisamchk.def \
                                 myisam/myisamlog.def myisam/myisampack.def \
-                                sql/mysqld.def
+                                sql/mysqld.def extra/mysql_waitpid.def \
+                                extra/resolve_stack_dump.def myisam/myisam_ftdump.def
 
 link_sources:
 	set -x; \
diff --git a/netware/init_db.sql b/netware/init_db.sql
index 1e8354e13a1..569c7bd5283 100644
--- a/netware/init_db.sql
+++ b/netware/init_db.sql
@@ -20,6 +20,6 @@ INSERT INTO user (host,user) values ('%','');
 
 CREATE TABLE func (name char(64) binary DEFAULT '' NOT NULL, ret tinyint(1) DEFAULT '0' NOT NULL, dl char(128) DEFAULT '' NOT NULL, type enum ('function','aggregate') NOT NULL, PRIMARY KEY (name)) comment='User defined functions';
 
-CREATE TABLE tables_priv (Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(60) binary DEFAULT '' NOT NULL, Grantor char(77) DEFAULT '' NOT NULL, Timestamp timestamp(14), Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter') DEFAULT '' NOT NULL, Column_priv set('Select','Insert','Update','References') DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name), KEY Grantor (Grantor)) comment='Table privileges';
+CREATE TABLE tables_priv (Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Grantor char(77) DEFAULT '' NOT NULL, Timestamp timestamp(14), Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter') DEFAULT '' NOT NULL, Column_priv set('Select','Insert','Update','References') DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name), KEY Grantor (Grantor)) comment='Table privileges';
 
 CREATE TABLE columns_priv (Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Column_name char(64) binary DEFAULT '' NOT NULL, Timestamp timestamp(14), Column_priv set('Select','Insert','Update','References') DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name,Column_name)) comment='Column privileges';
diff --git a/netware/my_manage.c b/netware/my_manage.c
index 1c1e75990b4..f5aa3163431 100644
--- a/netware/my_manage.c
+++ b/netware/my_manage.c
@@ -180,7 +180,7 @@ int sleep_until_file_exists(char *pid_file)
 	Wait for the server on the given port to start.
 
 ******************************************************************************/
-int wait_for_server_start(char *bin_dir, char *user, char *password, int port)
+int wait_for_server_start(char *bin_dir, char *user, char *password, int port,char *tmp_dir)
 {
   arg_list_t al;
   int err, i;
@@ -189,7 +189,7 @@ int wait_for_server_start(char *bin_dir, char *user, char *password, int port)
   
 	// mysqladmin file
   snprintf(mysqladmin_file, PATH_MAX, "%s/mysqladmin", bin_dir);
-  snprintf(trash, PATH_MAX, "/tmp/trash.out");
+  snprintf(trash, PATH_MAX, "%s/trash.out",tmp_dir);
 	
   // args
   init_args(&al);
@@ -283,7 +283,7 @@ int spawn(char *path, arg_list_t *al, int join, char *input,
 
 ******************************************************************************/
 int stop_server(char *bin_dir, char *user, char *password, int port,
-                char *pid_file)
+                char *pid_file,char *tmp_dir)
 {
 	arg_list_t al;
 	int err, i, argc = 0;
@@ -292,7 +292,7 @@ int stop_server(char *bin_dir, char *user, char *password, int port,
   
 	// mysqladmin file
   snprintf(mysqladmin_file, PATH_MAX, "%s/mysqladmin", bin_dir);
-  snprintf(trash, PATH_MAX, "/tmp/trash.out");
+  snprintf(trash, PATH_MAX, "%s/trash.out",tmp_dir);
 	
   // args
   init_args(&al);
diff --git a/netware/my_manage.h b/netware/my_manage.h
index b19662c4ee9..ada02378ee4 100644
--- a/netware/my_manage.h
+++ b/netware/my_manage.h
@@ -71,11 +71,11 @@ void free_args(arg_list_t *);
 
 int sleep_until_file_exists(char *);
 int sleep_until_file_deleted(char *);
-int wait_for_server_start(char *, char *, char *, int);
+int wait_for_server_start(char *, char *, char *, int,char *);
 
 int spawn(char *, arg_list_t *, int, char *, char *, char *);
 
-int stop_server(char *, char *, char *, int, char *);
+int stop_server(char *, char *, char *, int, char *,char *);
 pid_t get_server_pid(char *);
 void kill_server(pid_t pid);
 
diff --git a/netware/myisam_ftdump.def b/netware/myisam_ftdump.def
new file mode 100644
index 00000000000..259d6617445
--- /dev/null
+++ b/netware/myisam_ftdump.def
@@ -0,0 +1,12 @@
+#------------------------------------------------------------------------------
+# MySQL MyISAM Dump Tool
+#------------------------------------------------------------------------------
+MODULE	libc.nlm
+SCREENNAME "MySQL MyISAM Table Dump Tool"
+COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
+DESCRIPTION "MySQL MyISAM Table Dump Tool"
+VERSION 4, 0
+STACKSIZE 65536
+XDCDATA ../netware/mysql.xdc
+#DEBUG
+
diff --git a/netware/mysql_install_db.c b/netware/mysql_install_db.c
index b4060bfdb7e..355e18b819a 100644
--- a/netware/mysql_install_db.c
+++ b/netware/mysql_install_db.c
@@ -386,7 +386,8 @@ int main(int argc, char **argv)
   if (!autoclose) setscreenmode(SCR_NO_MODE);
   
   // header
-  printf("MySQL Server %s, for %s (%s)\n\n", VERSION, SYSTEM_TYPE, MACHINE_TYPE);
+  printf("MySQL Server %s, for %s (%s)\n\n", VERSION, SYSTEM_TYPE,
+         MACHINE_TYPE);
   
   // create paths
   create_paths();
diff --git a/netware/mysql_test_run.c b/netware/mysql_test_run.c
index e1a07baca6c..06d5e5985c1 100644
--- a/netware/mysql_test_run.c
+++ b/netware/mysql_test_run.c
@@ -53,6 +53,7 @@
 #define TEST_SKIP		"[ skip ]"
 #define TEST_FAIL		"[ fail ]"
 #define TEST_BAD		"[ bad  ]"
+#define TEST_IGNORE		"[ignore]"
 
 /******************************************************************************
 
@@ -69,7 +70,8 @@ int master_port           = 9306;
 int slave_port            = 9307;
 
 // comma delimited list of tests to skip or empty string
-char skip_test[PATH_MAX]  = "";
+char skip_test[PATH_MAX]  = " lowercase_table3 , system_mysql_db_fix ";
+char ignore_test[PATH_MAX]  = "";
 
 char bin_dir[PATH_MAX];
 char mysql_test_dir[PATH_MAX];
@@ -107,6 +109,7 @@ int total_pass    = 0;
 int total_fail    = 0;
 int total_test    = 0;
 
+int total_ignore  = 0;
 double total_time = 0;
 
 int use_openssl     = FALSE;
@@ -393,7 +396,7 @@ void start_master()
   {
     sleep_until_file_exists(master_pid);
 
-	if ((err = wait_for_server_start(bin_dir, user, password, master_port)) == 0)
+	if ((err = wait_for_server_start(bin_dir, user, password, master_port,mysql_tmp_dir)) == 0)
     {
       master_running = TRUE;
     }
@@ -582,7 +585,7 @@ void start_slave()
   {
     sleep_until_file_exists(slave_pid);
     
-    if ((err = wait_for_server_start(bin_dir, user, password, slave_port)) == 0)
+    if ((err = wait_for_server_start(bin_dir, user, password, slave_port,mysql_tmp_dir)) == 0)
     {
       slave_running = TRUE;
     }
@@ -633,7 +636,7 @@ void stop_slave()
   if (!slave_running) return;
 
   // stop
-  if ((err = stop_server(bin_dir, user, password, slave_port, slave_pid)) == 0)
+  if ((err = stop_server(bin_dir, user, password, slave_port, slave_pid,mysql_tmp_dir)) == 0)
   {
     slave_running = FALSE;
   }
@@ -657,7 +660,7 @@ void stop_master()
   // running?
   if (!master_running) return;
 
-  if ((err = stop_server(bin_dir, user, password, master_port, master_pid)) == 0)
+  if ((err = stop_server(bin_dir, user, password, master_port, master_pid,mysql_tmp_dir)) == 0)
   {
     master_running = FALSE;
   }
@@ -778,21 +781,31 @@ void run_test(char *test)
   char temp[PATH_MAX];
   char *rstr;
   double elapsed = 0;
-  int skip = FALSE;
+  int skip = FALSE, ignore=FALSE;
   int restart = FALSE;
   int flag = FALSE;
   struct stat info;
   
   // single test?
-  if (!single_test)
+//  if (!single_test)
   {
     // skip tests in the skip list
     snprintf(temp, PATH_MAX, " %s ", test);
     skip = (strindex(skip_test, temp) != NULL);
+    if( skip == FALSE )
+      ignore = (strindex(ignore_test, temp) != NULL);
   }
     
-  // skip test?
-  if (!skip)
+  if(ignore)
+  {
+    // show test
+    log("%-46s ", test);
+         
+    // ignore
+    rstr = TEST_IGNORE;
+    ++total_ignore;
+  }  
+  else if (!skip)     // skip test?
   {
     char test_file[PATH_MAX];
     char master_opt_file[PATH_MAX];
@@ -1148,9 +1161,33 @@ void setup(char *file)
 ******************************************************************************/
 int main(int argc, char **argv)
 {
+  int is_ignore_list = 0;
   // setup
   setup(argv[0]);
   
+  /* The --ignore option is comma saperated list of test cases to skip and should 
+   * be very first command line option to the test suite. 
+   * The usage is now:
+   * mysql_test_run --ignore=test1,test2 test3 test4
+   * where test1 and test2 are test cases to ignore
+   * and test3 and test4 are test cases to run. */
+  if( argc >= 2 && !strnicmp(argv[1], "--ignore=", sizeof("--ignore=")-1) )
+  {
+    char *temp, *token;
+    temp=strdup(strchr(argv[1],'=') + 1);
+    for(token=strtok(temp, ","); token != NULL; token=strtok(NULL, ","))
+    {
+      if( strlen(ignore_test) + strlen(token) + 2 <= PATH_MAX-1 )
+        sprintf( ignore_test+strlen(ignore_test), " %s ", token);
+      else
+      {
+        free(temp);
+        die("ignore list too long.");
+      }
+    }
+    free(temp);
+    is_ignore_list = 1;
+  }
   // header
   log("MySQL Server %s, for %s (%s)\n\n", VERSION, SYSTEM_TYPE, MACHINE_TYPE);
   
@@ -1165,14 +1202,14 @@ int main(int argc, char **argv)
   log(HEADER);
   log(DASH);
 
-  if (argc > 1)
+  if ( argc > 1 + is_ignore_list )
   {
     int i;
 
     // single test
     single_test = TRUE;
 
-    for (i = 1; i < argc; i++)
+    for (i = 1 + is_ignore_list; i < argc; i++)
     {
       // run given test
       run_test(argv[i]);
diff --git a/netware/mysql_waitpid.def b/netware/mysql_waitpid.def
new file mode 100644
index 00000000000..4d56d29c42f
--- /dev/null
+++ b/netware/mysql_waitpid.def
@@ -0,0 +1,12 @@
+#------------------------------------------------------------------------------
+# Wait for a Program to Terminate
+#------------------------------------------------------------------------------
+MODULE	libc.nlm
+#SCREENNAME "MySQL Tool - Wait for a Program to Terminate"
+COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
+DESCRIPTION "MySQL Tool - Wait for a Program to Terminate"
+VERSION 4, 0
+STACKSIZE 65536
+XDCDATA ../netware/mysql.xdc
+#DEBUG
+
diff --git a/netware/resolve_stack_dump.def b/netware/resolve_stack_dump.def
new file mode 100644
index 00000000000..21fd177fbc7
--- /dev/null
+++ b/netware/resolve_stack_dump.def
@@ -0,0 +1,12 @@
+#------------------------------------------------------------------------------
+# Resolve Stack Dump
+#------------------------------------------------------------------------------
+MODULE	libc.nlm
+#SCREENNAME "MySQL Stack Dump Resolve Tool"
+COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
+DESCRIPTION "MySQL Stack Dump Resolve Tool"
+VERSION 4, 0
+STACKSIZE 65536
+XDCDATA ../netware/mysql.xdc
+#DEBUG
+