From 996255648b392ea5cb59d086e7ef49499f58df78 Mon Sep 17 00:00:00 2001
From: "lenz@mysql.com" <>
Date: Sun, 17 Nov 2002 16:45:21 +0100
Subject:  - Applied required modifications for automake 1.5  - "make
 distcheck" needs to be fixed

---
 mysys/Makefile.am | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'mysys')

diff --git a/mysys/Makefile.am b/mysys/Makefile.am
index e3918f71b58..9141ab132bd 100644
--- a/mysys/Makefile.am
+++ b/mysys/Makefile.am
@@ -69,15 +69,6 @@ DEFS =			-DDEFAULT_BASEDIR=\"$(prefix)\" \
 
 libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@
 
-OMIT_DEPENDENCIES =	pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\
-			__math.h time.h __time.h unistd.h __unistd.h types.h \
-			xtypes.h ac-types.h posix.h string.h __string.h \
-			errno.h socket.h inet.h dirent.h netdb.h \
-			cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \
-			prio_queue.h pthread_attr.h pthread_once.h queue.h\
-			sleep.h specific.h version.h pwd.h timers.h uio.h \
-			cdefs.h machdep.h signal.h __signal.h util.h
-
 # I hope this always does the right thing. Otherwise this is only test programs
 FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@
 
@@ -104,7 +95,7 @@ test_vsnprintf: my_vsnprintf.c $(LIBRARIES)
 test_dir: test_dir.c $(LIBRARIES)
 	$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_dir.c $(LDADD) $(LIBS)
 
-test_charset: test_charset.c $(LIBRARIES)
+test_charset$(EXEEXT): test_charset.c $(LIBRARIES)
 	$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_charset.c $(LDADD) $(LIBS)
 
 testhash: testhash.c $(LIBRARIES)
-- 
cgit v1.2.1


From 0d0bf207c4b7e987ac4daf6ea0d44434ee4e30ce Mon Sep 17 00:00:00 2001
From: "monty@mashka.mysql.fi" <>
Date: Mon, 18 Nov 2002 14:59:45 +0200
Subject: Small change to make key cache code cleaer

---
 mysys/mf_keycache.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'mysys')

diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c
index 5b8ec96b4d1..d5b0a0a056a 100644
--- a/mysys/mf_keycache.c
+++ b/mysys/mf_keycache.c
@@ -548,13 +548,14 @@ int flush_key_blocks(File file, enum flush_type type)
 	  count++;
       }
       /* Only allocate a new buffer if its bigger than the one we have */
-      if (count <= FLUSH_CACHE ||
-	  !(cache=(SEC_LINK**) my_malloc(sizeof(SEC_LINK*)*count,MYF(0))))
+      if (count > FLUSH_CACHE)
       {
-	cache=cache_buff;		/* Fall back to safe buffer */
-	count=FLUSH_CACHE;
+	if (!(cache=(SEC_LINK**) my_malloc(sizeof(SEC_LINK*)*count,MYF(0))))
+        {
+	  cache=cache_buff;		/* Fall back to safe buffer */
+	  count=FLUSH_CACHE;
+        }
       }
-      end=cache+count;
     }
 
     /* Go through the keys and write them to buffer to be flushed */
-- 
cgit v1.2.1