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@stripped, 2006-11-29 18:36:51+01:00, kent@stripped +7 -0
Many files:
Changed paths to ndb include directory to include "storage"
Makefile.am:
Adjusted path to yaSSL libtool libraries
ssl.m4:
Use libtool way of specifying yaSSL libraries
config/ac-macros/ssl.m4@stripped, 2006-11-29 18:30:30+01:00, kent@stripped +2 -3
Use libtool way of specifying yaSSL libraries
libmysqld/Makefile.am@stripped, 2006-11-29 18:30:56+01:00, kent@stripped +2 -2
Adjusted path to yaSSL libtool libraries
storage/ndb/config/type_kernel.mk.am@stripped, 2006-11-29 18:34:26+01:00, kent@stripped +1 -1
Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapi.mk.am@stripped, 2006-11-29 18:34:26+01:00, kent@stripped +1 -1
Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapitest.mk.am@stripped, 2006-11-29 18:34:26+01:00, kent@stripped +1 -1
Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapitools.mk.am@stripped, 2006-11-29 18:34:26+01:00, kent@stripped +1 -1
Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_util.mk.am@stripped, 2006-11-29 18:34:26+01:00, kent@stripped +1 -1
Changed paths to ndb include directory to include "storage"
# 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: kent-amd64.(none)
# Root: /home/kent/bk/mysql-5.1-build
--- 1.102/libmysqld/Makefile.am 2006-11-29 18:36:56 +01:00
+++ 1.103/libmysqld/Makefile.am 2006-11-29 18:36:56 +01:00
@@ -94,8 +94,8 @@
$(yassl_inc_libs)
if HAVE_YASSL
-yassl_inc_libs= $(top_srcdir)/extra/yassl/src/.libs/libyassl.a \
- $(top_srcdir)/extra/yassl/taocrypt/src/.libs/libtaocrypt.a
+yassl_inc_libs= $(top_builddir)/extra/yassl/src/.libs/libyassl.a \
+ $(top_builddir)/extra/yassl/taocrypt/src/.libs/libtaocrypt.a
endif
# Storage engine specific compilation options
--- 1.3/config/ac-macros/ssl.m4 2006-11-29 18:36:56 +01:00
+++ 1.4/config/ac-macros/ssl.m4 2006-11-29 18:36:56 +01:00
@@ -28,10 +28,9 @@
yassl_dir="yassl"
AC_SUBST([yassl_dir])
- yassl_libs="-L\$(top_srcdir)/extra/yassl/src -lyassl -L\$(top_srcdir)/extra/yassl/taocrypt/src -ltaocrypt"
+ yassl_libs="\$(top_builddir)/extra/yassl/src/libyassl.la \
+ \$(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la"
AC_SUBST(yassl_libs)
- yassl_includes="-I\$(top_srcdir)/extra/yassl/include"
- AC_SUBST(yassl_includes)
AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for SSL.])
AC_DEFINE([HAVE_YASSL], [1], [Defined by configure. Using yaSSL for SSL.])
--- 1.5/storage/ndb/config/type_kernel.mk.am 2006-11-29 18:36:56 +01:00
+++ 1.6/storage/ndb/config/type_kernel.mk.am 2006-11-29 18:36:56 +01:00
@@ -2,7 +2,7 @@
INCLUDES += \
-I$(srcdir) \
-I$(top_builddir)/include \
- -I$(top_builddir)/ndb/include \
+ -I$(top_builddir)/storage/ndb/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/storage/ndb/include \
-I$(top_srcdir)/storage/ndb/src/kernel/vm \
--- 1.8/storage/ndb/config/type_ndbapi.mk.am 2006-11-29 18:36:56 +01:00
+++ 1.9/storage/ndb/config/type_ndbapi.mk.am 2006-11-29 18:36:56 +01:00
@@ -2,7 +2,7 @@
INCLUDES += \
-I$(srcdir) \
-I$(top_builddir)/include \
- -I$(top_builddir)/ndb/include \
+ -I$(top_builddir)/storage/ndb/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/mysys \
-I$(top_srcdir)/storage/ndb/include \
--- 1.13/storage/ndb/config/type_ndbapitest.mk.am 2006-11-29 18:36:56 +01:00
+++ 1.14/storage/ndb/config/type_ndbapitest.mk.am 2006-11-29 18:36:56 +01:00
@@ -7,7 +7,7 @@
INCLUDES += -I$(top_srcdir) \
-I$(top_builddir)/include \
- -I$(top_builddir)/ndb/include \
+ -I$(top_builddir)/storage/ndb/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/storage/ndb/include \
-I$(top_srcdir)/storage/ndb/include/ndbapi \
--- 1.7/storage/ndb/config/type_util.mk.am 2006-11-29 18:36:56 +01:00
+++ 1.8/storage/ndb/config/type_util.mk.am 2006-11-29 18:36:56 +01:00
@@ -1,7 +1,7 @@
INCLUDES += -I$(srcdir) \
-I$(top_builddir)/include \
- -I$(top_builddir)/ndb/include \
+ -I$(top_builddir)/storage/ndb/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/mysys \
-I$(top_srcdir)/storage/ndb/include \
--- 1.13/storage/ndb/config/type_ndbapitools.mk.am 2006-11-29 18:36:56 +01:00
+++ 1.14/storage/ndb/config/type_ndbapitools.mk.am 2006-11-29 18:36:56 +01:00
@@ -7,7 +7,7 @@
INCLUDES += -I$(srcdir) \
-I$(top_builddir)/include \
- -I$(top_builddir)/ndb/include \
+ -I$(top_builddir)/storage/ndb/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/storage/ndb/include \
-I$(top_srcdir)/storage/ndb/include/ndbapi \
| Thread |
|---|
| • bk commit into 5.1 tree (kent:1.2377) | kent | 29 Nov |
