MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Monty Taylor Date:January 19 2007 12:32am
Subject:bk commit into 5.1 tree (mtaylor:1.2414)
View as plain text  
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, 2007-01-18 16:32:21-08:00, mtaylor@qualinost.(none) +2 -0
  Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
  into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
  MERGE: 1.1810.2371.58

  configure.in@stripped, 2007-01-18 16:32:17-08:00, mtaylor@qualinost.(none) +0 -8
    Auto merged
    MERGE: 1.245.1.180

  storage/ndb/src/Makefile.am@stripped, 2007-01-18 16:32:17-08:00, mtaylor@qualinost.(none) +0 -1
    Auto merged
    MERGE: 1.13.3.2

  storage/ndb/src/Makefile.am@stripped, 2007-01-18 16:32:17-08:00, mtaylor@qualinost.(none) +0 -0
    Merge rename: ndb/src/Makefile.am -> storage/ndb/src/Makefile.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:	mtaylor
# Host:	qualinost.(none)
# Root:	/home/mtaylor/src/mysql-5.1-new-maint/RESYNC

--- 1.13.3.1/ndb/src/Makefile.am	2007-01-18 16:32:29 -08:00
+++ 1.19/storage/ndb/src/Makefile.am	2007-01-18 16:32:29 -08:00
@@ -15,7 +15,7 @@
 
 SUBDIRS = common mgmapi ndbapi . kernel mgmclient mgmsrv cw
 
-include $(top_srcdir)/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/common.mk.am
 
 ndblib_LTLIBRARIES = libndbclient.la
 
@@ -37,16 +37,16 @@
 windoze-dsp: libndbclient.dsp
 
 libndbclient.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 $@ $(ndblib_LTLIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ dummy.cpp
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(libndbclient_la_LIBADD)
+               $(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 $@ $(ndblib_LTLIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ dummy.cpp
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(libndbclient_la_LIBADD)
 	@touch dummy.cpp
 
 # Don't update the files from bitkeeper
Thread
bk commit into 5.1 tree (mtaylor:1.2414)Monty Taylor19 Jan