Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1

into mc05.(none):/space/tomas/mysql-4.1-ndb

.bzrignore

@@ -779,3 +779,4 @@ ndb/config/config.mk
 ndb/src/common/mgmcommon/printConfig/*.d
 ndb/src/mgmclient/test_cpcd/*.d
 *.d
+libmysqld/examples/client_test.c

libmysqld/examples/Makefile.am

-noinst_PROGRAMS =	mysqltest mysql
+noinst_PROGRAMS =	mysqltest mysql client_test
 client_sources =	$(mysqltest_SOURCES) $(mysql_SOURCES)
+tests_sources= $(client_test_SOURCES)
 
 link_sources:
 	for f in $(client_sources); do \
 	  rm -f $(srcdir)/$$f; \
 	  @LN_CP_F@ $(srcdir)/../../client/$$f $(srcdir)/$$f; \
 	done;
+	for f in $(tests_sources); do \
+	  rm -f $(srcdir)/$$f; \
+	  @LN_CP_F@ $(srcdir)/../../tests/$$f $(srcdir)/$$f; \
+	done;
 
 DEFS = 		-DEMBEDDED_LIBRARY
 INCLUDES =	@MT_INCLUDES@ -I$(top_srcdir)/include -I$(srcdir) \
@@ -21,8 +26,11 @@ mysql_SOURCES = mysql.cc readline.cc completion_hash.cc \
                 my_readline.h sql_string.h completion_hash.h
 mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD)
 
+client_test_SOURCES =	client_test.c
+
 clean:
 	rm -f $(client_sources)
+	rm -f $(tests_sources)
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%