Merge

BitKeeper/etc/logging_ok:
  auto-union
libmysqld/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
sql/sql_bitmap.h:
  merge

1 files changed, 11 insertions, 16 deletions

diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index 776bcb4de69..12bae21a5a0 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -86,29 +86,24 @@ INC_LIB=	$(top_builddir)/regex/libregex.a \
 # To make it easy for the end user to use the embedded library we
 # generate a total libmysqld.a from all library files,
 
+# note - InnoDB libraries have circular dependencies, so in INC_LIB
+# few libraries are present two times. Metrowerks linker doesn't like
+# it at all. Traditional ar has no problems with it, but still there's no
+# need to add the same file twice to the library, so 'sort -u' save us
+# some time and spares unnecessary work.
+
 libmysqld.a:	libmysqld_int.a $(INC_LIB)
 if DARWIN_MWCC
-	mwld -lib -o $@ libmysqld_int.a `ls -1 $(INC_LIB) | sort -u`
+	mwld -lib -o $@ libmysqld_int.a `echo $(INC_LIB) | sort -u`
 else
 		if test "$(host_os)" = "netware" ; \
 		then \
 		  $(libmysqld_a_AR) libmysqld.a libmysqld_int.a $(INC_LIB) ; \
 		else \
-		  if test ! -d tmp ; then mkdir tmp ; fi ; \
-		  rm -f $@ libmysqld_int2.a tmp/*.o tmp/*.a ; \
-		  cp $(INC_LIB) tmp ; \
-		  cp libmysqld_int.a libmysqld_int2.a ; \
-		  cd tmp ; \
-		  for file in *.a ; do \
-		    bfile=`basename $$file .a` ; \
-		    $(AR) x $$file; \
-		    for obj in *.o ; do mv $$obj $${bfile}_$$obj ; done ; \
-		    $(AR) q ../libmysqld_int2.a *.o ; \
-		    rm -f *.o ; \
-		  done ; \
-		  cd .. ; \
-		  mv libmysqld_int2.a libmysqld.a ; \
-		  rm -f tmp/* ; \
+		  for arc in ./libmysqld_int.a $(INC_LIB); do \
+		    arpath=`echo $$arc|sed 's|[^/]*$$||'`; \
+		    $(AR) t $$arc|sed "s|^|$$arpath|"; \
+		  done | sort -u | xargs $(AR) cq libmysqld.a ; \
 		  $(RANLIB) libmysqld.a	; \
 		fi
 endif