bk commit into 4.0 tree (1.1692)

Below is the list of changes that have just been committed into a local
4.0 repository of serg. When serg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1692 03/03/24 11:19:28 serg@xxxxxxxxxxxxxxxxxx +3 -0
  make myisam usable without threads (and even w/o pthread_t)

  myisam/sort.c
    1.26 03/03/24 11:19:25 serg@xxxxxxxxxxxxxxxxxx +3 -1
    make myisam usable without threads (and even w/o pthread_t)

  myisam/mi_check.c
    1.115 03/03/24 11:19:25 serg@xxxxxxxxxxxxxxxxxx +5 -1
    make myisam usable without threads (and even w/o pthread_t)

  include/myisam.h
    1.53 03/03/24 11:19:24 serg@xxxxxxxxxxxxxxxxxx +4 -0
    make myisam usable without threads (and even w/o pthread_t)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: serg
# Host: sergbook.mysql.com
# Root: /usr/home/serg/Abk/mysql-4.0

--- 1.52/include/myisam.h       Sun Mar  2 01:48:55 2003
+++ 1.53/include/myisam.h       Mon Mar 24 11:19:24 2003
@@ -366,14 +366,18 @@
   SORT_KEY_BLOCKS *key_block,*key_block_end;
   /* sync things*/
   uint got_error, threads_running;
+#ifdef THREAD
   pthread_mutex_t mutex;
   pthread_cond_t  cond;
+#endif
 } SORT_INFO;
 
 
 typedef struct st_mi_sort_param
 {
+#ifdef THREAD
   pthread_t  thr;
+#endif
   IO_CACHE read_cache, tempfile, tempfile_for_exceptions;
   DYNAMIC_ARRAY buffpek;
   ulonglong unique[MI_MAX_KEY_SEG+1];

--- 1.114/myisam/mi_check.c     Sun Mar  2 01:48:55 2003
+++ 1.115/myisam/mi_check.c     Mon Mar 24 11:19:25 2003
@@ -2109,7 +2109,7 @@
   Threaded repair of table using sorting
 
   SYNOPSIS
-    mi_repair_by_sort_r()
+    mi_repair_parallel()
     param              Repair parameters
     info               MyISAM handler to repair
     name               Name of table (for warnings)
@@ -2128,6 +2128,9 @@
 int mi_repair_parallel(MI_CHECK *param, register MI_INFO *info,
                        const char * name, int rep_quick)
 {
+#ifndef THREAD
+  return mi_repair_by_sort(param, info, name, rep_quick);
+#else
   int got_error;
   uint i,key, total_key_length, istep;
   ulong rec_length;
@@ -2489,6 +2492,7 @@
     share->pack.header_length=0;
   }
   DBUG_RETURN(got_error);
+#endif /* THREAD */
 }
 
        /* Read next record and return next key */

--- 1.25/myisam/sort.c  Fri Nov 29 15:40:15 2002
+++ 1.26/myisam/sort.c  Mon Mar 24 11:19:25 2003
@@ -275,6 +275,7 @@
 } /* find_all_keys */
 
 
+#ifdef THREAD
 /* Search after all keys and place them in a temp. file */
 
 pthread_handler_decl(thr_find_all_keys,arg)
@@ -284,7 +285,7 @@
   uint memavl,old_memavl,keys,sort_length;
   uint idx, maxbuffer;
   uchar **sort_keys=0;
-  
+
   error=1;
 
   if (my_thread_init())
@@ -542,6 +543,7 @@
   my_free((gptr) mergebuf,MYF(MY_ALLOW_ZERO_PTR));
   return got_error;
 }
+#endif /* THREAD */
 
         /* Write all keys in memory to file for later merge */
 



-- 
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe:    
http://lists.mysql.com/internals?unsub=gcdmd-internals@xxxxxxxxxxx