bk commit into 5.1 tree (kent:1.2160)

[kent]

Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent 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://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2160 06/02/24 01:24:41 kent@stripped +2 -0
  Makefile.am:
    Conditionally link with libmysqlclient.la or libmysqlclient_r.la
  configure.in:
    Corrected help text for --with-debug option
    Changed default to be with thread safe client
    Added THREAD_SAFE_CLIENT to be used in 'if' in make files

  client/Makefile.am
    1.63 06/02/23 17:24:21 kent@stripped +20 -13
    Conditionally link with libmysqlclient.la or libmysqlclient_r.la

  configure.in
    1.343 06/02/23 17:21:55 kent@stripped +7 -4
    Corrected help text for --with-debug option
    Changed default to be with thread safe client
    Added THREAD_SAFE_CLIENT to be used in 'if' in make files

# 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:	kent
# Host:	c-5e4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.1-release

--- 1.62/client/Makefile.am	2006-02-19 19:52:19 +01:00
+++ 1.63/client/Makefile.am	2006-02-23 17:24:21 +01:00
@@ -21,14 +21,21 @@
 else
   yassl_dummy_link_fix=
 endif
+
+if THREAD_SAFE_CLIENT
+LIBMYSQLCLIENT_LA =		$(top_builddir)/libmysql_r/libmysqlclient_r.la
+else
+LIBMYSQLCLIENT_LA =		$(top_builddir)/libmysql/libmysqlclient.la
+endif
+
 #AUTOMAKE_OPTIONS =              nostdinc
 INCLUDES =			-I$(top_builddir)/include \
 				-I$(top_srcdir)/include \
 				-I$(top_srcdir)/regex \
-                                $(openssl_includes) $(yassl_includes) 
+				$(openssl_includes) $(yassl_includes) 
 LIBS =				@CLIENT_LIBS@
 LDADD=				@CLIENT_EXTRA_LDFLAGS@ $(CLIENT_THREAD_LIBS) \
-                                $(top_builddir)/libmysql/libmysqlclient.la
+				$(top_builddir)/libmysql/libmysqlclient.la
 bin_PROGRAMS =			mysql mysqladmin mysqlcheck mysqlshow \
 				mysqldump mysqlimport mysqltest mysqlbinlog \
 				mysqltestmanagerc mysqltestmanager-pwgen \
@@ -38,8 +45,8 @@
 mysql_SOURCES =			mysql.cc readline.cc sql_string.cc completion_hash.cc
 mysqladmin_SOURCES =		mysqladmin.cc
 mysql_LDADD =			@readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS)
-mysqltest_SOURCES=              mysqltest.c $(top_srcdir)/mysys/my_getsystime.c \
-                                $(yassl_dummy_link_fix)
+mysqltest_SOURCES=		mysqltest.c $(top_srcdir)/mysys/my_getsystime.c \
+				$(yassl_dummy_link_fix)
 mysqltest_LDADD =		$(top_builddir)/regex/libregex.a $(LDADD)
 mysqlbinlog_SOURCES =		mysqlbinlog.cc $(top_srcdir)/mysys/mf_tempdir.c \
 				$(top_srcdir)/mysys/my_new.cc \
@@ -50,20 +57,20 @@
 mysqlbinlog_LDADD =		$(LDADD) $(CXXLDFLAGS)
 mysqlslap_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
 				@CLIENT_EXTRA_LDFLAGS@ \
-                                $(top_builddir)/libmysql_r/libmysqlclient_r.la \
+				$(LIBMYSQLCLIENT_LA) \
 				$(top_builddir)/mysys/libmysys.a 
 mysqlimport_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
 				@CLIENT_EXTRA_LDFLAGS@ \
-                                $(top_builddir)/libmysql_r/libmysqlclient_r.la \
+				$(LIBMYSQLCLIENT_LA) \
 				$(top_builddir)/mysys/libmysys.a 
-mysqltestmanager_pwgen_SOURCES =   mysqlmanager-pwgen.c 
-mysqltestmanagerc_SOURCES=      mysqlmanagerc.c $(yassl_dummy_link_fix)
-mysqlcheck_SOURCES=             mysqlcheck.c $(yassl_dummy_link_fix)
-mysqlshow_SOURCES=              mysqlshow.c $(yassl_dummy_link_fix)
-mysqlslap_SOURCES=              mysqlslap.c \
+mysqltestmanager_pwgen_SOURCES = mysqlmanager-pwgen.c 
+mysqltestmanagerc_SOURCES=	mysqlmanagerc.c $(yassl_dummy_link_fix)
+mysqlcheck_SOURCES=		 mysqlcheck.c $(yassl_dummy_link_fix)
+mysqlshow_SOURCES=		mysqlshow.c $(yassl_dummy_link_fix)
+mysqlslap_SOURCES=		mysqlslap.c \
 				$(yassl_dummy_link_fix)
-mysqldump_SOURCES=              mysqldump.c my_user.c $(yassl_dummy_link_fix)
-mysqlimport_SOURCES=            mysqlimport.c \
+mysqldump_SOURCES=		mysqldump.c my_user.c $(yassl_dummy_link_fix)
+mysqlimport_SOURCES=		mysqlimport.c \
 				$(yassl_dummy_link_fix)
 sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc
 strings_src=decimal.c

--- 1.342/configure.in	2006-02-21 18:24:22 +01:00
+++ 1.343/configure.in	2006-02-23 17:21:55 +01:00
@@ -589,10 +589,10 @@
 
 # Make thread safe client
 AC_ARG_ENABLE(thread-safe-client,
-    [  --enable-thread-safe-client   
-                          Compile the client with threads.],
+    [  --disable-thread-safe-client   
+                          Compile the client without threads.],
     [ THREAD_SAFE_CLIENT=$enableval ],
-    [ THREAD_SAFE_CLIENT=no ]
+    [ THREAD_SAFE_CLIENT=yes ]
     )
 
 # compile with strings functions in assembler
@@ -1564,7 +1564,8 @@
 fi
 
 AC_ARG_WITH(debug,
-    [  --without-debug         Build a production version without debugging code],
+    [  --with-debug            Add debug code
+  --with-debug=full       Add debug code (adds memory checker, very slow)],
     [with_debug=$withval],
     [with_debug=no])
 if test "$with_debug" = "yes"
@@ -2471,6 +2472,8 @@
 dnl client is just using plain-old libs.
 sql_client_dirs="strings regex mysys libmysql client"
 linked_client_targets="linked_libmysql_sources"
+
+AM_CONDITIONAL(THREAD_SAFE_CLIENT, test "$THREAD_SAFE_CLIENT" != "no")
 
 if test "$THREAD_SAFE_CLIENT" != "no"
 then