Commit 07fc9729 authored by unknown's avatar unknown
Browse files

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
parents 1be89333 647eefca

VC++Files/storage/example/example.vcproj

+4 −4
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../../include,../../regex,../../sql"

				AdditionalIncludeDirectories="../../include,../../regex,../../sql,../../extra/yassl/include"

				PreprocessorDefinitions="DBUG_OFF;_WINDOWS;NDEBUG;WITH_PARTITION_STORAGE_ENGINE"

				StringPooling="TRUE"

				RuntimeLibrary="0"
@@ -72,7 +72,7 @@ 
				Name="VCCLCompilerTool"

				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../../include,../../regex,../../sql"

				AdditionalIncludeDirectories="../../include,../../regex,../../sql,../../extra/yassl/include"

				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_TLS;WITH_PARTITION_STORAGE_ENGINE"

				StringPooling="TRUE"

				RuntimeLibrary="1"
@@ -122,7 +122,7 @@ 
				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../../include,../../regex,../../sql"

				AdditionalIncludeDirectories="../../include,../../regex,../../sql,../../extra/yassl/include"

				PreprocessorDefinitions="DBUG_OFF;_WINDOWS;NDEBUG;USE_TLS;WITH_PARTITION_STORAGE_ENGINE"

				StringPooling="TRUE"

				RuntimeLibrary="0"
@@ -171,7 +171,7 @@ 
				Name="VCCLCompilerTool"

				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../../include,../../regex,../../sql"

				AdditionalIncludeDirectories="../../include,../../regex,../../sql,../../extra/yassl/include"

				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;WITH_PARTITION_STORAGE_ENGINE"

				StringPooling="TRUE"

				RuntimeLibrary="1"

win/cmakefiles/client→client/cmakelists.txt

+9 −9
Original line number Diff line number Diff line
@@ -51,30 +51,30 @@ ADD_LIBRARY(mysqlclient ../mysys/array.c ../strings/bchange.c ../strings/bmove.c 
ADD_DEPENDENCIES(mysqlclient GenError)

ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)

LINK_DIRECTORIES(${MYSQL_BINARY_DIR}/mysys ${MYSQL_BINARY_DIR}/zlib)

TARGET_LINK_LIBRARIES(mysql mysqlclient mysys yassl zlib dbug yassl  taocrypt wsock32)

TARGET_LINK_LIBRARIES(mysql mysqlclient mysys yassl taocrypt zlib dbug wsock32)



ADD_EXECUTABLE(mysqltest mysqltest.c)

TARGET_LINK_LIBRARIES(mysqltest mysqlclient mysys yassl zlib dbug regex wsock32)

TARGET_LINK_LIBRARIES(mysqltest mysqlclient mysys yassl taocrypt zlib dbug regex wsock32)



ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)

TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient dbug yassl zlib wsock32)

TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient dbug yassl taocrypt zlib wsock32)



ADD_EXECUTABLE(mysqldump mysqldump.c ../sql-common/my_user.c)

TARGET_LINK_LIBRARIES(mysqldump mysqlclient mysys dbug yassl zlib wsock32)

TARGET_LINK_LIBRARIES(mysqldump mysqlclient mysys dbug yassl taocrypt zlib wsock32)



ADD_EXECUTABLE(mysqlimport mysqlimport.c)

TARGET_LINK_LIBRARIES(mysqlimport mysqlclient mysys dbug yassl zlib wsock32)

TARGET_LINK_LIBRARIES(mysqlimport mysqlclient mysys dbug yassl taocrypt zlib wsock32)



ADD_EXECUTABLE(mysqlshow mysqlshow.c)

TARGET_LINK_LIBRARIES(mysqlshow mysqlclient mysys dbug yassl zlib wsock32)

TARGET_LINK_LIBRARIES(mysqlshow mysqlclient mysys dbug yassl taocrypt zlib wsock32)



ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc ../mysys/mf_tempdir.c ../mysys/my_new.cc

                           ../mysys/my_bit.c ../mysys/my_bitmap.c ../mysys/my_vle.c

                           ../mysys/base64.c)

TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient dbug yassl zlib wsock32)

TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient dbug yassl taocrypt zlib wsock32)



ADD_EXECUTABLE(mysqladmin mysqladmin.cc)

TARGET_LINK_LIBRARIES(mysqladmin mysqlclient mysys dbug yassl zlib wsock32)

TARGET_LINK_LIBRARIES(mysqladmin mysqlclient mysys dbug yassl taocrypt zlib wsock32)



ADD_EXECUTABLE(mysqlslap mysqlslap.c)

TARGET_LINK_LIBRARIES(mysqlslap mysqlclient mysys zlib wsock32 dbug)
 
TARGET_LINK_LIBRARIES(mysqlslap mysqlclient mysys yassl taocrypt zlib wsock32 dbug)

win/cmakefiles/base→cmakelists.txt

+0 −0

File moved.

View file

win/cmakefiles/dbug→dbug/cmakelists.txt

+0 −0

File moved.

View file

win/cmakefiles/extra→extra/cmakelists.txt

+32 −0
Original line number Diff line number Diff line
@@ -8,8 +8,9 @@ TARGET_LINK_LIBRARIES(comp_err dbug mysys strings wsock32) 


GET_TARGET_PROPERTY(COMP_ERR_EXE comp_err LOCATION)



ADD_CUSTOM_TARGET(GenError

                  ${COMP_ERR_EXE} --charset=${PROJECT_SOURCE_DIR}/sql/share/charsets 

ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_SOURCE_DIR}/include/mysqld_error.h

                   COMMAND ${COMP_ERR_EXE}

                    --charset=${PROJECT_SOURCE_DIR}/sql/share/charsets 

                    --out-dir=${PROJECT_SOURCE_DIR}/sql/share/

                    --header_file=${PROJECT_SOURCE_DIR}/include/mysqld_error.h 

                    --name_file=${PROJECT_SOURCE_DIR}/include/mysqld_ername.h
@@ -17,7 +18,9 @@ ADD_CUSTOM_TARGET(GenError 
                    --in_file=${PROJECT_SOURCE_DIR}/sql/share/errmsg.txt

                   DEPENDS comp_err ${PROJECT_SOURCE_DIR}/sql/share/errmsg.txt)



         

ADD_CUSTOM_TARGET(GenError

                  ALL

                  DEPENDS ${PROJECT_SOURCE_DIR}/include/mysqld_error.h)



ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)

TARGET_LINK_LIBRARIES(my_print_defaults strings mysys dbug taocrypt odbc32 odbccp32 wsock32)