bzr commit into libmysql branch (iggy:2817)

[Ignacio Galarza]

#At file:///src/bzr.lp/libmysql/ based on
revid:iggy@stripped

 2817 Ignacio Galarza	2009-02-18 [merge]
      Auto Merged
modified:
  CMakePlatformTests.txt
  include/my_config.h.in
  libmysql/CMakeLists.txt
  unittest/libmysql/ps_bugs.c

=== modified file 'CMakePlatformTests.txt'
--- a/CMakePlatformTests.txt	2009-02-10 16:13:58 +0000
+++ b/CMakePlatformTests.txt	2009-02-18 13:23:14 +0000
@@ -191,6 +191,7 @@ INCLUDE (CheckSymbolExists)
 
 CHECK_SYMBOL_EXISTS(sys_errlist "stdio.h" HAVE_SYS_ERRLIST)
 CHECK_SYMBOL_EXISTS(__bss_start "" HAVE_BSS_START)
+CHECK_SYMBOL_EXISTS(madvise "sys/mman.h" HAVE_DECL_MADVISE)
 
 #
 # Test for endianess

=== modified file 'include/my_config.h.in'
--- a/include/my_config.h.in	2009-02-10 16:13:58 +0000
+++ b/include/my_config.h.in	2009-02-18 13:23:14 +0000
@@ -89,6 +89,7 @@
 #cmakedefine HAVE_LONGJMP 1
 #cmakedefine HAVE_LSTAT 1
 #cmakedefine HAVE_MADVISE 1
+#cmakedefine HAVE_DECL_MADVISE 1
 #cmakedefine HAVE_MALLINFO 1
 #cmakedefine HAVE_MEMCPY 1
 #cmakedefine HAVE_MEMCPY 1

=== modified file 'libmysql/CMakeLists.txt'
--- a/libmysql/CMakeLists.txt	2008-12-23 20:49:22 +0000
+++ b/libmysql/CMakeLists.txt	2009-02-18 06:28:08 +0000
@@ -92,6 +92,19 @@ ADD_LIBRARY(libmysql          SHARED ${C
 SET_TARGET_PROPERTIES(libmysql
                       PROPERTIES VERSION ${SHARED_LIB_VERSION}
                                  SOVERSION ${SHARED_LIB_VERSION})
+
+IF(NOT WIN32)
+  ADD_CUSTOM_COMMAND(OUTPUT "libmysqlclient.so" "libmysqlclient_r.so"
+                    COMMAND ${CMAKE_COMMAND} ARGS -E create_symlink libmysql.so
libmysqlclient.so
+                    COMMAND ${CMAKE_COMMAND} ARGS -E create_symlink libmysql.so
libmysqlclient_r.so
+                    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libmysql
+                    DEPENDS libmysql)
+
+  ADD_CUSTOM_TARGET(LIBMYSQL_SYMLINKS
+                    ALL
+                    DEPENDS "libmysqlclient.so" "libmysqlclient_r.so")
+ENDIF(NOT WIN32)
+
 IF(NOT WIN32)
   # Avoid a redundant 'lib'
   SET_TARGET_PROPERTIES(libmysql
@@ -104,6 +117,11 @@ ENDIF(EMBED_MANIFESTS)
 
 # Installation
 #
-INSTALL(TARGETS libmysql mysqlclient
+INSTALL(TARGETS libmysql mysqlclient 
         LIBRARY DESTINATION "mysql/lib"
         ARCHIVE DESTINATION "mysql/lib")
+IF(NOT WIN32)
+  INSTALL(FILES ${CMAKE_SOURCE_DIR}/libmysql/libmysqlclient.so
+                ${CMAKE_SOURCE_DIR}/libmysql/libmysqlclient_r.so
+          DESTINATION "mysql/lib")
+ENDIF(NOT WIN32)

=== modified file 'unittest/libmysql/ps_bugs.c'
--- a/unittest/libmysql/ps_bugs.c	2009-02-16 07:33:24 +0000
+++ b/unittest/libmysql/ps_bugs.c	2009-02-17 15:24:24 +0000
@@ -3108,12 +3108,11 @@ error:
 
 static int test_mem_overun(MYSQL *mysql)
 {
-  char       buffer[10000], field[10];
+  char       buffer[10000], field[12];
   MYSQL_STMT *stmt;
   MYSQL_RES  *field_res, *res;
   int        rc, i, length;
 
-
   /*
     Test a memory ovverun bug when a table had 1000 fields with
     a row of data