MySQL Lists: internals: bk commit into 5.1 tree (tomas:1.1854)

List:	Internals	« Previous Message Next Message »
From:	tomas	Date:	July 18 2005 11:23pm
Subject:	bk commit into 5.1 tree (tomas:1.1854)
View as plain text
Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.1854 05/07/19 01:22:49 tomas@stripped +8 -0
  fixed makefiles in examples to adopt to change in file structure

  storage/ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile
    1.10 05/07/19 01:22:43 tomas@stripped +3 -3
    fixed makefiles in examples to adopt to change in file structure

  storage/ndb/ndbapi-examples/ndbapi_simple_example/Makefile
    1.10 05/07/19 01:22:43 tomas@stripped +4 -4
    fixed makefiles in examples to adopt to change in file structure

  storage/ndb/ndbapi-examples/ndbapi_scan_example/Makefile
    1.9 05/07/19 01:22:43 tomas@stripped +3 -3
    fixed makefiles in examples to adopt to change in file structure

  storage/ndb/ndbapi-examples/ndbapi_retries_example/Makefile
    1.9 05/07/19 01:22:43 tomas@stripped +4 -3
    fixed makefiles in examples to adopt to change in file structure

  storage/ndb/ndbapi-examples/ndbapi_event_example/Makefile
    1.9 05/07/19 01:22:43 tomas@stripped +3 -3
    fixed makefiles in examples to adopt to change in file structure

  storage/ndb/ndbapi-examples/ndbapi_async_example1/Makefile
    1.9 05/07/19 01:22:43 tomas@stripped +6 -5
    fixed makefiles in examples to adopt to change in file structure

  storage/ndb/ndbapi-examples/ndbapi_async_example/Makefile
    1.7 05/07/19 01:22:43 tomas@stripped +3 -3
    fixed makefiles in examples to adopt to change in file structure

  storage/ndb/ndbapi-examples/mgmapi_logevent_example/Makefile
    1.4 05/07/19 01:22:43 tomas@stripped +6 -6
    fixed makefiles in examples to adopt to change in file structure

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1

--- 1.6/storage/ndb/ndbapi-examples/ndbapi_async_example/Makefile	2005-04-08 02:43:54 +02:00
+++ 1.7/storage/ndb/ndbapi-examples/ndbapi_async_example/Makefile	2005-07-19 01:22:43 +02:00
@@ -6,9 +6,9 @@
 CXXFLAGS = -g
 DEBUG = 
 LFLAGS = -Wall
-TOP_SRCDIR = ../../..
+TOP_SRCDIR = ../../../..
 INCLUDE_DIR = $(TOP_SRCDIR)
-LIB_DIR = -L$(TOP_SRCDIR)/ndb/src/.libs \
+LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/src/.libs \
           -L$(TOP_SRCDIR)/libmysql_r/.libs \
           -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings
 SYS_LIB = 
@@ -17,7 +17,7 @@
 	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
 
 $(TARGET).o: $(SRCS)
-	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/extra -I$(INCLUDE_DIR)/ndb/include -I$(INCLUDE_DIR)/ndb/include/ndbapi $(SRCS)
+	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/extra -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)
 
 clean:
 	rm -f *.o $(TARGET)

--- 1.9/storage/ndb/ndbapi-examples/ndbapi_simple_example/Makefile	2005-04-08 02:43:54 +02:00
+++ 1.10/storage/ndb/ndbapi-examples/ndbapi_simple_example/Makefile	2005-07-19 01:22:43 +02:00
@@ -6,9 +6,9 @@
 CXXFLAGS = 
 DEBUG = 
 LFLAGS = -Wall
-TOP_SRCDIR = ../../..
-INCLUDE_DIR = $(TOP_SRCDIR)
-LIB_DIR = -L$(TOP_SRCDIR)/ndb/src/.libs \
+TOP_SRCDIR = ../../../..
+INCLUDE_DIR = $(TOP_SRCDIR)/storage/ndb/include
+LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/src/.libs \
           -L$(TOP_SRCDIR)/libmysql_r/.libs \
           -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings
 SYS_LIB = 
@@ -17,7 +17,7 @@
 	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings  -lz $(SYS_LIB) -o $(TARGET)
 
 $(TARGET).o: $(SRCS)
-	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/ndb/include -I$(INCLUDE_DIR)/ndb/include/ndbapi $(SRCS)
+	$(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)
 
 clean:
 	rm -f *.o $(TARGET)

--- 1.8/storage/ndb/ndbapi-examples/ndbapi_async_example1/Makefile	2005-04-08 02:43:54 +02:00
+++ 1.9/storage/ndb/ndbapi-examples/ndbapi_async_example1/Makefile	2005-07-19 01:22:43 +02:00
@@ -5,17 +5,18 @@
 CFLAGS = -c -Wall -fno-rtti -fno-exceptions
 DEBUG = 
 LFLAGS = -Wall
-INCLUDE_DIR = ../../include
-LIB_DIR = -L../../src/.libs \
-          -L../../../libmysql_r/.libs \
-          -L../../../mysys -L../../../strings
+TOP_SRCDIR = ../../../..
+INCLUDE_DIR = $(TOP_SRCDIR)
+LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/src/.libs \
+          -L$(TOP_SRCDIR)/libmysql_r/.libs \
+          -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
 	$(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
 
 $(TARGET).o: $(SRCS)
-	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)
+	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)
 
 clean:
 	rm -f *.o $(TARGET)

--- 1.8/storage/ndb/ndbapi-examples/ndbapi_retries_example/Makefile	2005-04-08 02:43:54 +02:00
+++ 1.9/storage/ndb/ndbapi-examples/ndbapi_retries_example/Makefile	2005-07-19 01:22:43 +02:00
@@ -5,10 +5,11 @@
 CFLAGS = -c -Wall -fno-rtti -fno-exceptions
 DEBUG = 
 LFLAGS = -Wall
+TOP_SRCDIR = ../../../..
 INCLUDE_DIR = ../../include
-LIB_DIR = -L../../src/.libs \
-          -L../../../libmysql_r/.libs \
-          -L../../../mysys -L../../../strings
+LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/src/.libs \
+          -L$(TOP_SRCDIR)/libmysql_r/.libs \
+          -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings
 SYS_LIB = 
 
 $(TARGET): $(OBJS)

--- 1.9/storage/ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile	2005-04-08 02:43:54 +02:00
+++ 1.10/storage/ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile	2005-07-19 01:22:43 +02:00
@@ -6,9 +6,9 @@
 CXXFLAGS = 
 DEBUG = 
 LFLAGS = -Wall
-TOP_SRCDIR = ../../..
+TOP_SRCDIR = ../../../..
 INCLUDE_DIR = $(TOP_SRCDIR)
-LIB_DIR = -L$(TOP_SRCDIR)/ndb/src/.libs \
+LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/src/.libs \
           -L$(TOP_SRCDIR)/libmysql_r/.libs \
           -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings
 SYS_LIB = 
@@ -17,7 +17,7 @@
 	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
 
 $(TARGET).o: $(SRCS)
-	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/ndb/include -I$(INCLUDE_DIR)/ndb/include/ndbapi $(SRCS)
+	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)
 
 clean:
 	rm -f *.o $(TARGET)

--- 1.8/storage/ndb/ndbapi-examples/ndbapi_event_example/Makefile	2005-04-08 02:43:54 +02:00
+++ 1.9/storage/ndb/ndbapi-examples/ndbapi_event_example/Makefile	2005-07-19 01:22:43 +02:00
@@ -6,9 +6,9 @@
 CXXFLAGS = 
 DEBUG = 
 LFLAGS = -Wall
-TOP_SRCDIR = ../../..
-INCLUDE_DIR = $(TOP_SRCDIR)/ndb/include
-LIB_DIR = -L$(TOP_SRCDIR)/ndb/src/.libs \
+TOP_SRCDIR = ../../../..
+INCLUDE_DIR = $(TOP_SRCDIR)/storage/ndb/include
+LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/src/.libs \
           -L$(TOP_SRCDIR)/libmysql_r/.libs \
           -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings
 SYS_LIB = 

--- 1.8/storage/ndb/ndbapi-examples/ndbapi_scan_example/Makefile	2005-04-08 02:43:54 +02:00
+++ 1.9/storage/ndb/ndbapi-examples/ndbapi_scan_example/Makefile	2005-07-19 01:22:43 +02:00
@@ -6,9 +6,9 @@
 CXXFLAGS = -g
 DEBUG = 
 LFLAGS = -Wall
-TOP_SRCDIR = ../../..
+TOP_SRCDIR = ../../../..
 INCLUDE_DIR = $(TOP_SRCDIR)
-LIB_DIR = -L$(TOP_SRCDIR)/ndb/src/.libs \
+LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/src/.libs \
           -L$(TOP_SRCDIR)/libmysql_r/.libs \
           -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings
 SYS_LIB = 
@@ -17,7 +17,7 @@
 	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
 
 $(TARGET).o: $(SRCS)
-	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/extra -I$(INCLUDE_DIR)/ndb/include -I$(INCLUDE_DIR)/ndb/include/ndbapi $(SRCS)
+	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/extra -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)
 
 clean:
 	rm -f *.o $(TARGET)

--- 1.3/storage/ndb/ndbapi-examples/mgmapi_logevent_example/Makefile	2005-04-08 02:43:54 +02:00
+++ 1.4/storage/ndb/ndbapi-examples/mgmapi_logevent_example/Makefile	2005-07-19 01:22:43 +02:00
@@ -6,18 +6,18 @@
 CXXFLAGS = 
 DEBUG = 
 LFLAGS = -Wall
-TOP_SRCDIR = ../../..
-INCLUDE_DIR = $(TOP_SRCDIR)
-LIB_DIR = -L$(TOP_SRCDIR)/ndb/src/.libs \
+TOP_SRCDIR = ../../../..
+INCLUDE_DIR = $(TOP_SRCDIR)/storage/ndb/include
+LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/src/.libs \
           -L$(TOP_SRCDIR)/libmysql_r/.libs \
-          -L$(TOP_SRCDIR)/mysys
+          -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
 
 $(TARGET).o: $(SRCS)
-	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/ndb/include -I$(INCLUDE_DIR)/ndb/include/mgmapi  -I$(INCLUDE_DIR)/ndb/include/ndbapi $(SRCS)
+	$(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/mgmapi  -I$(INCLUDE_DIR)/ndbapi $(SRCS)
 
 clean:
 	rm -f *.o $(TARGET)
Thread
• bk commit into 5.1 tree (tomas:1.1854)	tomas	18 Jul