Commit 0fa77764 authored by unknown's avatar unknown
Browse files

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

into  ibmlab.site:/home/my/bk/mysql-5.1-new
parents eb5824d6 74866578

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

+0 −0

File moved.

View file

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)