database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge polly.(none):/home/kaa/src/opt/bug32221/my50-bug31445

Browse Source 
into  polly.(none):/home/kaa/src/opt/bug32221/my51-bug31445


BitKeeper/deleted/.del-myTest.dsp~4a8c480769193952:
  Auto merged
BitKeeper/deleted/.del-mytest.c~9a99338689e5de8:
  Auto merged
BitKeeper/deleted/.del-mytest.dsw~2324698861155335:
  Auto merged
libmysql/Makefile.am:
  Auto merged
tests/bug25714.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
BitKeeper/deleted/.del-copy_mysql_files.bat~f6878eeb80173de9:
  Auto merged
BitKeeper/deleted/.del-mytest_1.c:
  Merge rename: BitKeeper/deleted/.del-mytest.c -> BitKeeper/deleted/.del-mytest_1.c
BitKeeper/deleted/.del-myTest-package.dsp~ec9faf3287cbe2b9:
  Auto merged
BitKeeper/deleted/.del-myTest-package_ia64.dsp~e423b69f2c624850:
  Auto merged
BitKeeper/deleted/.del-myTest.vcproj~dba5adc4fad3c06:
  Auto merged
BitKeeper/deleted/.del-myTest_ia64.dsp~b17572b217d092e6:
  Auto merged
libmysql/CMakeLists.txt:
  Manual merge.
This commit is contained in:
unknown
2007-11-22 14:39:07 +03:00
parent 0280133ac0 c4d0901d00
commit 0515b14020
5 changed files with 7 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libmysql/CMakeLists.txt
View File

@ -126,9 +126,6 @@ ENDIF(WIN32)
ADD_DEPENDENCIES(libmysql GenError)
TARGET_LINK_LIBRARIES(libmysql wsock32)
ADD_EXECUTABLE(myTest mytest.c)
TARGET_LINK_LIBRARIES(myTest libmysql)
IF(EMBED_MANIFESTS)
MYSQL_EMBED_MANIFEST("myTest" "asInvoker")
ENDIF(EMBED_MANIFESTS)