bzr push into mysql-5.1 branch (bjorn.munch:3767 to 3768)

[Bjorn Munch]

 3768 Bjorn Munch	2012-07-10
      mysql_client_test did not build within limbysqld/examples

    modified:
      libmysqld/examples/CMakeLists.txt
      libmysqld/examples/Makefile.am
 3767 Bjorn Munch	2012-07-09
      Fixed compile error in mysql_client_test using gcc

    modified:
      tests/mysql_client_fw.c
=== modified file 'libmysqld/examples/CMakeLists.txt'
--- a/libmysqld/examples/CMakeLists.txt	2011-06-30 15:37:13 +0000
+++ b/libmysqld/examples/CMakeLists.txt	2012-07-10 08:04:57 +0000
@@ -17,7 +17,8 @@
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
                     ${CMAKE_SOURCE_DIR}/libmysqld/include
                     ${CMAKE_SOURCE_DIR}/regex
-                    ${CMAKE_SOURCE_DIR}/zlib                   
+                    ${CMAKE_SOURCE_DIR}/zlib
+                    ${CMAKE_SOURCE_DIR}/tests
                     ${CMAKE_SOURCE_DIR}/extra/yassl/include)
 
 # Currently does not work with DBUG, there are missing symbols reported.

=== modified file 'libmysqld/examples/Makefile.am'
--- a/libmysqld/examples/Makefile.am	2011-06-30 15:37:13 +0000
+++ b/libmysqld/examples/Makefile.am	2012-07-10 08:04:57 +0000
@@ -35,7 +35,7 @@ link_sources:
 DEFS = 		-DEMBEDDED_LIBRARY
 INCLUDES =	-I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir) \
 		-I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \
-		$(openssl_includes)
+		-I$(top_srcdir)/tests $(openssl_includes)
 LIBS =		@LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs)
 LDADD =		@CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @LIBDL@ $(CXXLDFLAGS) \
                 @NDB_SCI_LIBS@
@@ -51,6 +51,7 @@ mysql_LDADD = @readline_link@ @TERMCAP_L
 
 mysql_client_test_embedded_LINK = $(CXXLINK)
 nodist_mysql_client_test_embedded_SOURCES = mysql_client_test.c
+mysql_client_test.o:	$(top_srcdir)/tests/mysql_client_fw.c
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

No bundle (reason: useless for push emails).