Below is the list of changes that have just been committed into a local
5.1 repository of mikron. When mikron 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, 2007-05-07 15:39:36+02:00, mikron@stripped +6 -0
Merge mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.0-ndb
into mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.1-ndb
MERGE: 1.1810.2868.32
BUILD/Makefile.am@stripped, 2007-05-07 15:36:00+02:00, mikron@stripped +0 -0
Auto merged
MERGE: 1.10.1.3
config/ac-macros/ha_ndbcluster.m4@stripped, 2007-05-07 15:36:00+02:00, mikron@stripped +0 -0
Auto merged
MERGE: 1.5.1.5
libmysqld/Makefile.am@stripped, 2007-05-07 15:39:33+02:00, mikron@stripped +1 -1
Manual merge
MERGE: 1.55.1.19
libmysqld/examples/Makefile.am@stripped, 2007-05-07 15:39:33+02:00, mikron@stripped +1 -2
Manual merge
MERGE: 1.31.1.4
storage/ndb/src/common/transporter/SCI_Transporter.cpp@stripped, 2007-05-07 15:36:00+02:00, mikron@stripped +0 -0
Auto merged
MERGE: 1.7.5.2
storage/ndb/src/common/transporter/SCI_Transporter.cpp@stripped, 2007-05-07 15:36:00+02:00, mikron@stripped +0 -0
Merge rename: ndb/src/common/transporter/SCI_Transporter.cpp -> storage/ndb/src/common/transporter/SCI_Transporter.cpp
storage/ndb/src/common/transporter/SCI_Transporter.hpp@stripped, 2007-05-07 15:36:01+02:00, mikron@stripped +0 -0
Auto merged
MERGE: 1.4.3.2
storage/ndb/src/common/transporter/SCI_Transporter.hpp@stripped, 2007-05-07 15:36:00+02:00, mikron@stripped +0 -0
Merge rename: ndb/src/common/transporter/SCI_Transporter.hpp -> storage/ndb/src/common/transporter/SCI_Transporter.hpp
# 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: mikron
# Host: mikael-ronstr-ms-dator.local
# Root: /Users/mikron/mysql_clones/mysql-5.1-ndb/RESYNC
--- 1.25/config/ac-macros/ha_ndbcluster.m4 2007-01-20 02:06:51 +01:00
+++ 1.26/config/ac-macros/ha_ndbcluster.m4 2007-05-07 15:36:00 +02:00
@@ -43,7 +43,7 @@
if test -f "$mysql_sci_dir/lib/libsisci.a" -a \
-f "$mysql_sci_dir/include/sisci_api.h"; then
NDB_SCI_INCLUDES="-I$mysql_sci_dir/include"
- NDB_SCI_LIBS="-L$mysql_sci_dir/lib -lsisci"
+ NDB_SCI_LIBS="$mysql_sci_dir/lib/libsisci.a"
AC_MSG_RESULT([-- including sci transporter])
AC_DEFINE([NDB_SCI_TRANSPORTER], [1],
[Including Ndb Cluster DB sci transporter])
--- 1.13/BUILD/Makefile.am 2006-12-31 01:06:31 +01:00
+++ 1.14/BUILD/Makefile.am 2007-05-07 15:36:00 +02:00
@@ -28,6 +28,7 @@
compile-alpha-debug \
compile-amd64-debug-max \
compile-amd64-max \
+ compile-amd64-max-sci \
compile-darwin-mwcc \
compile-dist \
compile-hpux11-parisc2-aCC \
@@ -52,6 +53,7 @@
compile-pentium-valgrind-max \
compile-pentium64-debug \
compile-pentium64-debug-max \
+ compile-pentium64-max-sci \
compile-pentium64-valgrind-max \
compile-ppc \
compile-ppc-debug \
--- 1.113/libmysqld/Makefile.am 2007-05-02 14:05:42 +02:00
+++ 1.114/libmysqld/Makefile.am 2007-05-07 15:39:33 +02:00
@@ -95,6 +95,7 @@
$(top_builddir)/strings/libmystrings.a \
$(top_builddir)/dbug/libdbug.a \
$(top_builddir)/vio/libvio.a \
+ @NDB_SCI_LIBS@ \
@mysql_plugin_libs@ \
$(yassl_inc_libs)
--- 1.37/libmysqld/examples/Makefile.am 2007-03-27 23:56:46 +02:00
+++ 1.38/libmysqld/examples/Makefile.am 2007-05-07 15:39:33 +02:00
@@ -36,7 +36,8 @@
-I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \
$(openssl_includes)
LIBS = @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs)
-LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @LIBDL@ $(CXXLDFLAGS)
+LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @LIBDL@ $(CXXLDFLAGS) \
+ @NDB_SCI_LIBS@
mysqltest_embedded_LINK = $(CXXLINK)
mysqltest_embedded_SOURCES = mysqltest.c
| Thread |
|---|
| • bk commit into 5.1 tree (mikron:1.2507) | mikael | 7 May |
