Commit 63af18b5 authored by unknown's avatar unknown
Browse files

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/M41/mysql-4.1
parents 4ad77748 2ec8327e

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -946,3 +946,5 @@ libmysqld/ha_tina.cc 
analyse.test

client/mysqladmin.c

mysql-4.1.8-win-src.zip

ndb/include/ndb_version.h

ndb/include/ndb_global.h

Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -23,14 +23,14 @@ EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT 
SUBDIRS =		. include @docs_dirs@ @zlib_dir@ \

			@readline_topdir@ sql-common \

			@thread_dirs@ pstack \

			@sql_server_dirs@ @sql_client_dirs@ scripts man tests \

			@sql_union_dirs@ scripts man tests \

			netware @libmysqld_dirs@ \

			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@



DIST_SUBDIRS =		. include @docs_dirs@ zlib \

			@readline_topdir@ sql-common \

			@thread_dirs@ pstack \

			@sql_server_dirs@ @sql_client_dirs@ scripts @man_dirs@ tests SSL\

			@sql_union_dirs@ scripts @man_dirs@ tests SSL\

			BUILD netware os2 @libmysqld_dirs@ \

			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@

configure.in

+15 −1
Original line number Diff line number Diff line
@@ -2832,7 +2832,7 @@ thread_dirs= 


dnl This probably should be cleaned up more - for now the threaded

dnl client is just using plain-old libs.

sql_client_dirs="libmysql client"

sql_client_dirs="libmysql strings regex client"

linked_client_targets="linked_libmysql_sources"

CLIENT_LIBS=$NON_THREADED_CLIENT_LIBS

if test "$THREAD_SAFE_CLIENT" != "no"
@@ -3014,6 +3014,20 @@ AC_SUBST(sql_server_dirs) 
AC_SUBST(thread_dirs)

AC_SUBST(server_scripts)



# Now that sql_client_dirs and sql_server_dirs are stable, determine the union.

# Start with the (longer) server list, add each client item not yet present.

sql_union_dirs=" $sql_server_dirs "

for DIR in $sql_client_dirs

do

  if echo $sql_union_dirs | grep " $DIR " >/dev/null

  then

    :  # already present, skip

  else

    sql_union_dirs="$sql_union_dirs $DIR "

  fi

done

AC_SUBST(sql_union_dirs)



#if test "$with_posix_threads" = "no" -o "$with_mit_threads" = "yes"

#then

  # MIT pthreads does now support connecting with unix sockets