Below is the list of changes that have just been committed into a local
5.1 repository of mtaylor. When mtaylor 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@stripped, 2008-04-25 16:09:48-07:00, mtaylor@solace.(none) +10 -0
Rolled back part of the earlier change that split -lm and -lcrypt out of the global LIBS.
configure.in@stripped, 2008-04-25 16:09:44-07:00, mtaylor@solace.(none) +0 -14
Rolled back part of the earlier change that split -lm and -lcrypt out of the global LIBS.
extra/Makefile.am@stripped, 2008-04-25 16:09:44-07:00, mtaylor@solace.(none) +1 -0
Rolled back part of the earlier change that split -lm and -lcrypt out of the global LIBS.
libmysql/Makefile.am@stripped, 2008-04-25 16:09:45-07:00, mtaylor@solace.(none) +1 -1
Rolled back part of the earlier change that split -lm and -lcrypt out of the global LIBS.
libmysql_r/Makefile.am@stripped, 2008-04-25 16:09:45-07:00, mtaylor@solace.(none) +1 -1
Rolled back part of the earlier change that split -lm and -lcrypt out of the global LIBS.
mysys/Makefile.am@stripped, 2008-04-25 16:09:45-07:00, mtaylor@solace.(none) +1 -1
Rolled back part of the earlier change that split -lm and -lcrypt out of the global LIBS.
mysys/tests/Makefile.am@stripped, 2008-04-25 16:09:45-07:00, mtaylor@solace.(none) +1 -1
Rolled back part of the earlier change that split -lm and -lcrypt out of the global LIBS.
sql/Makefile.am@stripped, 2008-04-25 16:09:45-07:00, mtaylor@solace.(none) +0 -1
Rolled back part of the earlier change that split -lm and -lcrypt out of the global LIBS.
storage/myisam/Makefile.am@stripped, 2008-04-25 16:09:45-07:00, mtaylor@solace.(none) +9 -9
Rolled back part of the earlier change that split -lm and -lcrypt out of the global LIBS.
storage/ndb/src/kernel/Makefile.am@stripped, 2008-04-25 16:09:46-07:00, mtaylor@solace.(none) +1 -1
Rolled back part of the earlier change that split -lm and -lcrypt out of the global LIBS.
unittest/mysys/Makefile.am@stripped, 2008-04-25 16:09:46-07:00, mtaylor@solace.(none) +1 -1
Rolled back part of the earlier change that split -lm and -lcrypt out of the global LIBS.
diff -Nrup a/configure.in b/configure.in
--- a/configure.in 2008-04-24 23:32:16 -07:00
+++ b/configure.in 2008-04-25 16:09:44 -07:00
@@ -839,14 +839,7 @@ AC_CHECK_HEADERS([xfs/xfs.h])
# and defines HAVE_LIBM etc
#--------------------------------------------------------------------
-dnl Save the current libs into _libs so we can use AC_CHECK_LIB but
-dnl not have -lm go into the global libs list, since we don't need
-dnl it for everything we build and will use M_LIBS instead
-_libs=${LIBS}
-LIBS=''
AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity))
-M_LIBS=${LIBS}
-LIBS=${_libs}
dnl Save the current libs into _libs so we can put this into NSL_LIBS
_libs=${LIBS}
@@ -864,12 +857,7 @@ AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen
# This may get things to compile even if bind-8 is installed
AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind))
# Check if crypt() exists in libc or libcrypt, sets LIBS if needed
-dnl Save the current libs into _libs so we can put this into CRYPT_LIBS
-_libs=${LIBS}
-LIBS=''
AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))
-CRYPT_LIBS=${LIBS}
-LIBS=${_libs}
# See if we need a library for address lookup.
AC_SEARCH_LIBS(inet_aton, [socket nsl resolv])
@@ -2696,8 +2684,6 @@ sql_client_dirs="$sql_client_dirs client
CLIENT_LIBS="$NON_THREADED_LIBS $openssl_libs $ZLIB_LIBS $STATIC_NSS_FLAGS"
-AC_SUBST(M_LIBS)
-AC_SUBST(CRYPT_LIBS)
AC_SUBST(NSL_LIBS)
AC_SUBST(CLIENT_LIBS)
AC_SUBST(CLIENT_THREAD_LIBS)
diff -Nrup a/extra/Makefile.am b/extra/Makefile.am
--- a/extra/Makefile.am 2008-04-24 23:32:17 -07:00
+++ b/extra/Makefile.am 2008-04-25 16:09:44 -07:00
@@ -46,6 +46,7 @@ $(top_builddir)/include/sql_state.h: $(t
bin_PROGRAMS = replace perror resolveip my_print_defaults \
resolve_stack_dump mysql_waitpid innochecksum
+
noinst_PROGRAMS = charset2html
EXTRA_PROGRAMS = comp_err
EXTRA_DIST = CMakeLists.txt
diff -Nrup a/libmysql/Makefile.am b/libmysql/Makefile.am
--- a/libmysql/Makefile.am 2008-04-24 23:32:17 -07:00
+++ b/libmysql/Makefile.am 2008-04-25 16:09:45 -07:00
@@ -22,7 +22,7 @@
target = libmysqlclient.la
target_defs = -DUNDEF_THREADS_HACK -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@
-LIBS = @CLIENT_LIBS@ @M_LIBS@
+LIBS = @CLIENT_LIBS@
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
$(openssl_includes) @ZLIB_INCLUDES@
diff -Nrup a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am
--- a/libmysql_r/Makefile.am 2008-04-24 23:32:17 -07:00
+++ b/libmysql_r/Makefile.am 2008-04-25 16:09:45 -07:00
@@ -22,7 +22,7 @@
target = libmysqlclient_r.la
target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@
-LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@ @M_LIBS@
+LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
$(openssl_includes) @ZLIB_INCLUDES@
diff -Nrup a/mysys/Makefile.am b/mysys/Makefile.am
--- a/mysys/Makefile.am 2008-04-25 12:26:09 -07:00
+++ b/mysys/Makefile.am 2008-04-25 16:09:45 -07:00
@@ -19,7 +19,7 @@ MYSQLBASEdir= $(prefix)
INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \
-I$(top_srcdir)/include -I$(srcdir)
LDADD = $(top_builddir)/strings/libmystringslt.la \
- $(top_builddir)/dbug/libdbuglt.la @M_LIBS@ @ZLIB_LIBS@
+ $(top_builddir)/dbug/libdbuglt.la @ZLIB_LIBS@
pkglib_LTLIBRARIES = libmysys.la
diff -Nrup a/mysys/tests/Makefile.am b/mysys/tests/Makefile.am
--- a/mysys/tests/Makefile.am 2008-04-24 23:32:21 -07:00
+++ b/mysys/tests/Makefile.am 2008-04-25 16:09:45 -07:00
@@ -46,7 +46,7 @@ test_io_cache_SOURCES = $(top_srcdir)/my
testhash_SOURCES = testhash.c
test_gethwaddr_SOURCES = $(top_srcdir)/mysys/my_gethwaddr.c
test_base64_SOURCES = $(top_srcdir)/mysys/base64.c
-test_base64_LDADD = @M_LIBS@ $(top_builddir)/mysys/libmysyslt.la $(top_builddir)/strings/libmystrings.la
+test_base64_LDADD = $(top_builddir)/mysys/libmysyslt.la $(top_builddir)/strings/libmystrings.la
# Don't update the files from bitkeeper
%::SCCS/s.%
diff -Nrup a/sql/Makefile.am b/sql/Makefile.am
--- a/sql/Makefile.am 2008-04-24 23:32:18 -07:00
+++ b/sql/Makefile.am 2008-04-25 16:09:45 -07:00
@@ -43,7 +43,6 @@ mysqld_LDADD = libndb.la \
@MYSQLD_EXTRA_LDFLAGS@ \
@pstack_libs@ \
@mysql_plugin_libs@ \
- @CRYPT_LIBS@ \
$(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
$(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@
diff -Nrup a/storage/myisam/Makefile.am b/storage/myisam/Makefile.am
--- a/storage/myisam/Makefile.am 2008-04-24 23:32:19 -07:00
+++ b/storage/myisam/Makefile.am 2008-04-25 16:09:45 -07:00
@@ -36,17 +36,17 @@ myisamchk_DEPENDENCIES= $(LIBRARIES)
myisamchk_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
$(top_builddir)/mysys/libmysyslt.la \
$(top_builddir)/dbug/libdbuglt.la \
- $(top_builddir)/strings/libmystringslt.la @ZLIB_LIBS@ @M_LIBS@
+ $(top_builddir)/strings/libmystringslt.la @ZLIB_LIBS@
myisamlog_DEPENDENCIES= $(LIBRARIES)
myisamlog_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
$(top_builddir)/mysys/libmysyslt.la \
$(top_builddir)/dbug/libdbuglt.la \
- $(top_builddir)/strings/libmystringslt.la @ZLIB_LIBS@ @M_LIBS@
+ $(top_builddir)/strings/libmystringslt.la @ZLIB_LIBS@
myisampack_DEPENDENCIES=$(LIBRARIES)
myisampack_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
$(top_builddir)/mysys/libmysyslt.la \
$(top_builddir)/dbug/libdbuglt.la \
- $(top_builddir)/strings/libmystringslt.la @ZLIB_LIBS@ @M_LIBS@
+ $(top_builddir)/strings/libmystringslt.la @ZLIB_LIBS@
noinst_PROGRAMS = mi_test1 mi_test2 mi_test3 rt_test sp_test #ft_test1 ft_eval
noinst_HEADERS = myisamdef.h rt_index.h rt_key.h rt_mbr.h sp_defs.h \
fulltext.h ftdefs.h ft_test1.h ft_eval.h \
@@ -55,34 +55,34 @@ mi_test1_DEPENDENCIES= $(LIBRARIES)
mi_test1_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
$(top_builddir)/mysys/libmysyslt.la \
$(top_builddir)/dbug/libdbuglt.la \
- $(top_builddir)/strings/libmystringslt.la @ZLIB_LIBS@ @M_LIBS@
+ $(top_builddir)/strings/libmystringslt.la @ZLIB_LIBS@
mi_test2_DEPENDENCIES= $(LIBRARIES)
mi_test2_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
$(top_builddir)/mysys/libmysyslt.la \
$(top_builddir)/dbug/libdbuglt.la \
- $(top_builddir)/strings/libmystringslt.la @ZLIB_LIBS@ @M_LIBS@
+ $(top_builddir)/strings/libmystringslt.la @ZLIB_LIBS@
mi_test3_DEPENDENCIES= $(LIBRARIES)
mi_test3_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
$(top_builddir)/mysys/libmysyslt.la \
$(top_builddir)/dbug/libdbuglt.la \
- $(top_builddir)/strings/libmystringslt.la @ZLIB_LIBS@ @M_LIBS@
+ $(top_builddir)/strings/libmystringslt.la @ZLIB_LIBS@
#ft_test1_DEPENDENCIES= $(LIBRARIES)
#ft_eval_DEPENDENCIES= $(LIBRARIES)
myisam_ftdump_DEPENDENCIES= $(LIBRARIES)
myisam_ftdump_LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
$(top_builddir)/mysys/libmysyslt.la \
$(top_builddir)/dbug/libdbuglt.la \
- $(top_builddir)/strings/libmystringslt.la @ZLIB_LIBS@ @M_LIBS@
+ $(top_builddir)/strings/libmystringslt.la @ZLIB_LIBS@
rt_test_DEPENDENCIES= $(LIBRARIES)
rt_test_LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
$(top_builddir)/mysys/libmysyslt.la \
$(top_builddir)/dbug/libdbuglt.la \
- $(top_builddir)/strings/libmystringslt.la @ZLIB_LIBS@ @M_LIBS@
+ $(top_builddir)/strings/libmystringslt.la @ZLIB_LIBS@
sp_test_DEPENDENCIES= $(LIBRARIES)
sp_test_LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
$(top_builddir)/mysys/libmysyslt.la \
$(top_builddir)/dbug/libdbuglt.la \
- $(top_builddir)/strings/libmystringslt.la @ZLIB_LIBS@ @M_LIBS@
+ $(top_builddir)/strings/libmystringslt.la @ZLIB_LIBS@
libmyisam_a_SOURCES = mi_open.c mi_extra.c mi_info.c mi_rkey.c \
mi_rnext.c mi_rnext_same.c \
mi_search.c mi_page.c mi_key.c mi_locking.c \
diff -Nrup a/storage/ndb/src/kernel/Makefile.am b/storage/ndb/src/kernel/Makefile.am
--- a/storage/ndb/src/kernel/Makefile.am 2008-04-25 13:18:37 -07:00
+++ b/storage/ndb/src/kernel/Makefile.am 2008-04-25 16:09:46 -07:00
@@ -56,7 +56,7 @@ LDADD += \
$(top_builddir)/dbug/libdbuglt.la \
$(top_builddir)/mysys/libmysyslt.la \
$(top_builddir)/strings/libmystringslt.la \
- $(top_builddir)/zlib/libzlt.la @M_LIBS@ @NDB_SCI_LIBS@
+ $(top_builddir)/zlib/libzlt.la @NDB_SCI_LIBS@
windoze-dsp: ndbd.dsp
diff -Nrup a/unittest/mysys/Makefile.am b/unittest/mysys/Makefile.am
--- a/unittest/mysys/Makefile.am 2008-04-24 23:32:21 -07:00
+++ b/unittest/mysys/Makefile.am 2008-04-25 16:09:46 -07:00
@@ -20,7 +20,7 @@ LDADD = $(top_builddir)/unittest/mytap
$(top_builddir)/mysys/libmysyslt.la \
$(top_builddir)/dbug/libdbuglt.la \
$(top_builddir)/strings/libmystringslt.la \
- @M_LIBS@ @ZLIB_LIBS@
+ @ZLIB_LIBS@
noinst_PROGRAMS = bitmap-t base64-t my_atomic-t
| Thread |
|---|
| • bk commit into 5.1 tree (mtaylor:1.2582) | Monty Taylor | 26 Apr |
