=== modified file 'storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile'
--- a/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile	2007-05-29 21:39:57 +0000
+++ b/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile	2008-10-22 10:38:54 +0000
@@ -9,13 +9,11 @@
 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)/zlib/.libs \
-          -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings
+          -L$(TOP_SRCDIR)/libmysql_r/.libs
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
 
 $(OBJS): $(SRCS)
 	$(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/mgmapi  -I$(INCLUDE_DIR)/ndbapi $(SRCS)

=== modified file 'storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile'
--- a/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile	2007-05-30 18:29:14 +0000
+++ b/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile	2008-10-22 10:38:54 +0000
@@ -9,13 +9,11 @@
 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)/zlib/.libs \
-          -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings
+          -L$(TOP_SRCDIR)/libmysql_r/.libs
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
 
 $(OBJS): $(SRCS)
 	$(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/mgmapi  -I$(INCLUDE_DIR)/ndbapi $(SRCS)

=== modified file 'storage/ndb/ndbapi-examples/ndbapi_async/Makefile'
--- a/storage/ndb/ndbapi-examples/ndbapi_async/Makefile	2006-09-01 13:14:50 +0000
+++ b/storage/ndb/ndbapi-examples/ndbapi_async/Makefile	2008-10-22 10:38:54 +0000
@@ -9,16 +9,14 @@
 TOP_SRCDIR = ../../../..
 INCLUDE_DIR = $(TOP_SRCDIR)
 LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/src/.libs \
-          -L$(TOP_SRCDIR)/libmysql_r/.libs \
-          -L$(TOP_SRCDIR)/zlib/.libs \
-          -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings
+          -L$(TOP_SRCDIR)/libmysql_r/.libs
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
 
 $(TARGET).o: $(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)
+	$(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)

=== modified file 'storage/ndb/ndbapi-examples/ndbapi_async1/Makefile'
--- a/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile	2006-09-01 13:14:50 +0000
+++ b/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile	2008-10-22 10:38:54 +0000
@@ -8,13 +8,11 @@
 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)/zlib/.libs \
-          -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings
+          -L$(TOP_SRCDIR)/libmysql_r/.libs
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
 
 $(TARGET).o: $(SRCS)
 	$(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)

=== modified file 'storage/ndb/ndbapi-examples/ndbapi_blob/Makefile'
--- a/storage/ndb/ndbapi-examples/ndbapi_blob/Makefile	2007-03-26 08:40:57 +0000
+++ b/storage/ndb/ndbapi-examples/ndbapi_blob/Makefile	2008-10-22 10:38:54 +0000
@@ -9,16 +9,14 @@
 TOP_SRCDIR = ../../../..
 INCLUDE_DIR = $(TOP_SRCDIR)
 LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/src/.libs \
-          -L$(TOP_SRCDIR)/libmysql_r/.libs \
-          -L$(TOP_SRCDIR)/zlib/.libs \
-          -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings
+          -L$(TOP_SRCDIR)/libmysql_r/.libs
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
 
 $(TARGET).o: $(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)
+	$(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)

=== modified file 'storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/Makefile'
--- a/storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/Makefile	2007-07-04 06:55:19 +0000
+++ b/storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/Makefile	2008-10-22 10:38:54 +0000
@@ -9,16 +9,14 @@
 TOP_SRCDIR = ../../../..
 INCLUDE_DIR = $(TOP_SRCDIR)
 LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/src/.libs \
-          -L$(TOP_SRCDIR)/libmysql_r/.libs \
-          -L$(TOP_SRCDIR)/zlib/.libs \
-          -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings
+          -L$(TOP_SRCDIR)/libmysql_r/.libs
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
 
 $(OBJS): $(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)
+	$(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)

=== modified file 'storage/ndb/ndbapi-examples/ndbapi_event/Makefile'
--- a/storage/ndb/ndbapi-examples/ndbapi_event/Makefile	2006-09-01 13:14:50 +0000
+++ b/storage/ndb/ndbapi-examples/ndbapi_event/Makefile	2008-10-22 10:38:54 +0000
@@ -9,13 +9,11 @@
 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)/zlib/.libs \
-          -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings
+          -L$(TOP_SRCDIR)/libmysql_r/.libs
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
 
 $(TARGET).o: $(SRCS) Makefile
 	$(CXX) $(CFLAGS) $(DEBUG) -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi -I$(TOP_SRCDIR)/include $(SRCS)

=== modified file 'storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/Makefile'
--- a/storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/Makefile	2008-04-01 15:37:28 +0000
+++ b/storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/Makefile	2008-10-22 10:38:54 +0000
@@ -9,13 +9,11 @@
 TOP_SRCDIR = ../../../..
 INCLUDE_DIR = $(TOP_SRCDIR)
 LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/src/.libs \
-          -L$(TOP_SRCDIR)/libmysql_r/.libs \
-          -L$(TOP_SRCDIR)/zlib/.libs \
-          -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings
+          -L$(TOP_SRCDIR)/libmysql_r/.libs
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
 
 $(OBJS): $(SRCS)
 	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)

=== modified file 'storage/ndb/ndbapi-examples/ndbapi_retries/Makefile'
--- a/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile	2006-09-01 13:14:50 +0000
+++ b/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile	2008-10-22 10:38:54 +0000
@@ -8,13 +8,11 @@
 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)/zlib/.libs \
-          -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings
+          -L$(TOP_SRCDIR)/libmysql_r/.libs
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
 
 $(TARGET).o: $(SRCS)
 	$(CXX) $(CFLAGS)  -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)

=== modified file 'storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/Makefile'
--- a/storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/Makefile	2007-07-04 06:55:19 +0000
+++ b/storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/Makefile	2008-10-22 10:38:54 +0000
@@ -9,13 +9,11 @@
 TOP_SRCDIR = ../../../..
 INCLUDE_DIR = $(TOP_SRCDIR)
 LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/src/.libs \
-          -L$(TOP_SRCDIR)/libmysql_r/.libs \
-          -L$(TOP_SRCDIR)/zlib/.libs \
-          -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings
+          -L$(TOP_SRCDIR)/libmysql_r/.libs
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
 
 $(OBJS): $(SRCS)
 	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)

=== modified file 'storage/ndb/ndbapi-examples/ndbapi_scan/Makefile'
--- a/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile	2006-09-01 13:14:50 +0000
+++ b/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile	2008-10-22 10:38:54 +0000
@@ -9,16 +9,14 @@
 TOP_SRCDIR = ../../../..
 INCLUDE_DIR = $(TOP_SRCDIR)
 LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/src/.libs \
-          -L$(TOP_SRCDIR)/libmysql_r/.libs \
-          -L$(TOP_SRCDIR)/zlib/.libs \
-          -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings
+          -L$(TOP_SRCDIR)/libmysql_r/.libs
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
 
 $(TARGET).o: $(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)
+	$(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)

=== modified file 'storage/ndb/ndbapi-examples/ndbapi_simple/Makefile'
--- a/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile	2006-09-01 13:14:50 +0000
+++ b/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile	2008-10-22 10:38:54 +0000
@@ -9,13 +9,11 @@
 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)/zlib/.libs \
-          -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings
+          -L$(TOP_SRCDIR)/libmysql_r/.libs
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings  -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
 
 $(TARGET).o: $(SRCS)
 	$(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)

=== modified file 'storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile'
--- a/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile	2007-05-29 21:39:57 +0000
+++ b/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile	2008-10-22 10:38:54 +0000
@@ -9,13 +9,11 @@
 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)/zlib/.libs \
-          -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings
+          -L$(TOP_SRCDIR)/libmysql_r/.libs
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings  -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
 
 $(OBJS): $(SRCS)
 	$(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)

=== modified file 'storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile'
--- a/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile	2007-05-29 21:39:57 +0000
+++ b/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile	2008-10-22 10:38:54 +0000
@@ -9,13 +9,11 @@
 TOP_SRCDIR = ../../../..
 INCLUDE_DIR = $(TOP_SRCDIR)
 LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/src/.libs \
-          -L$(TOP_SRCDIR)/libmysql_r/.libs \
-          -L$(TOP_SRCDIR)/zlib/.libs \
-          -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings
+          -L$(TOP_SRCDIR)/libmysql_r/.libs
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
 
 $(OBJS): $(SRCS)
 	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)