List:Commits« Previous MessageNext Message »
From:knielsen Date:January 11 2006 8:21am
Subject:bk commit into 5.1 tree (knielsen:1.2028)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen 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.2028 06/01/11 09:21:11 knielsen@stripped +3 -0
  Merge mysql.com:/usr/local/mysql/mysql-5.0-sol10-sparc-a-fix
  into  mysql.com:/usr/local/mysql/mysql-5.1-new

  storage/ndb/config/common.mk.am
    1.9 06/01/11 09:21:06 knielsen@stripped +0 -1
    Manual merge.

  BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838
    1.6 06/01/11 09:09:47 knielsen@stripped +0 -0
    Auto merged

  storage/ndb/src/common/portlib/Makefile.am
    1.11 06/01/11 09:09:47 knielsen@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838
    1.5 06/01/11 09:09:47 knielsen@stripped +0 -0
    Merge rename: storage/ndb/src/common/portlib/gcc.cpp -> BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838

  storage/ndb/src/common/portlib/Makefile.am
    1.8.1.2 06/01/11 09:05:05 knielsen@stripped +0 -0
    Merge rename: ndb/src/common/portlib/Makefile.am -> storage/ndb/src/common/portlib/Makefile.am

  storage/ndb/config/common.mk.am
    1.6.1.2 06/01/11 09:05:05 knielsen@stripped +0 -0
    Merge rename: ndb/config/common.mk.am -> storage/ndb/config/common.mk.am

# 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:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/mysql-5.1-new/RESYNC

--- 1.6.1.1/ndb/config/common.mk.am	2006-01-08 07:42:20 +01:00
+++ 1.9/storage/ndb/config/common.mk.am	2006-01-11 09:21:06 +01:00
@@ -2,9 +2,9 @@
 ndbtoolsdir      = "$(bindir)"
 ndbtestdir       = "$(bindir)"
 ndblibdir        = "$(pkglibdir)"
-ndbincludedir    = "$(pkgincludedir)/ndb"
-ndbapiincludedir = "$(pkgincludedir)/ndb/ndbapi"
-mgmapiincludedir = "$(pkgincludedir)/ndb/mgmapi"
+ndbincludedir    = "$(pkgincludedir)/storage/ndb"
+ndbapiincludedir = "$(pkgincludedir)/storage/ndb/ndbapi"
+mgmapiincludedir = "$(pkgincludedir)/storage/ndb/mgmapi"
 
 INCLUDES = $(INCLUDES_LOC)
 LDADD = $(LDADD_LOC)

--- 1.8.1.1/ndb/src/common/portlib/Makefile.am	2006-01-08 07:42:20 +01:00
+++ 1.11/storage/ndb/src/common/portlib/Makefile.am	2006-01-11 09:09:47 +01:00
@@ -6,8 +6,8 @@
 	NdbDaemon.c NdbMem.c \
 	NdbConfig.c
 
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_util.mk.am
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_util.mk.am
 
 EXTRA_PROGRAMS = memtest PortLibTest munmaptest
 
@@ -29,13 +29,13 @@
 windoze-dsp: libportlib.dsp
 
 libportlib.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(WIN_src)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(WIN_src)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
Thread
bk commit into 5.1 tree (knielsen:1.2028)knielsen11 Jan