List:Commits« Previous MessageNext Message »
From:georg Date:August 30 2006 12:17pm
Subject:bk commit into 5.1 tree (georg:1.2287) BUG#20907
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of georg. When georg 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@stripped, 2006-08-30 12:17:35+02:00, georg@stripped +1 -0
  Fix for bug #20907
  
  CMake versions > 2.4 allow linking to STATIC or SHARED libraries only.
  

  libmysql/CMakeLists.txt@stripped, 2006-08-30 12:17:28+02:00, georg@stripped +1 -1
    Fix for Cmake BC problems (as suggested by Elliot)

# 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:	georg
# Host:	lmy002.wdf.sap.corp
# Root:	/home/georg/work/mysql/prod/mysql-5.1

--- 1.10/libmysql/CMakeLists.txt	2006-08-30 12:17:54 +02:00
+++ 1.11/libmysql/CMakeLists.txt	2006-08-30 12:17:54 +02:00
@@ -11,7 +11,7 @@
                     ${CMAKE_SOURCE_DIR}/sql
                     ${CMAKE_SOURCE_DIR}/strings)
 
-ADD_LIBRARY(libmysql MODULE dll.c libmysql.def
+ADD_LIBRARY(libmysql SHARED dll.c libmysql.def
                      ../mysys/array.c ../strings/bchange.c ../strings/bmove.c 
                      ../strings/bmove_upp.c ../mysys/charset-def.c ../mysys/charset.c
                      ../sql-common/client.c ../strings/ctype-big5.c
../strings/ctype-bin.c 
Thread
bk commit into 5.1 tree (georg:1.2287) BUG#20907georg30 Aug