List:Commits« Previous MessageNext Message »
From:msvensson Date:November 27 2006 2:00pm
Subject:bk commit into 5.1 tree (msvensson:1.2393)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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-11-27 15:00:08+01:00, msvensson@neptunus.(none) +1 -0
  Add mysys/my_getpagesize as source file foir mysql_upgrade
  Don't link mysql_upgrade with mysys

  client/CMakeLists.txt@stripped, 2006-11-27 15:00:05+01:00, msvensson@neptunus.(none) +2 -2
    Add mysys/my_getpagesize as source file foir mysql_upgrade
    Don't link mysql_upgrade with mysys

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint

--- 1.13/client/CMakeLists.txt	2006-11-27 15:00:16 +01:00
+++ 1.14/client/CMakeLists.txt	2006-11-27 15:00:16 +01:00
@@ -65,8 +65,8 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlcli
 ADD_EXECUTABLE(mysqlimport mysqlimport.c)
 TARGET_LINK_LIBRARIES(mysqlimport mysqlclient mysys dbug yassl taocrypt zlib wsock32)
 
-ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
-TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient mysys dbug yassl taocrypt zlib wsock32)
+ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c ../mysys/my_getpagesize.c)
+TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient dbug yassl taocrypt zlib wsock32)
 
 ADD_EXECUTABLE(mysqlshow mysqlshow.c)
 TARGET_LINK_LIBRARIES(mysqlshow mysqlclient mysys dbug yassl taocrypt zlib wsock32)
Thread
bk commit into 5.1 tree (msvensson:1.2393)msvensson27 Nov