diff options
| author | unknown <jimw@mysql.com> | 2005-03-21 21:51:31 +0100 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-03-21 21:51:31 +0100 |
| commit | 95098bd7e267bd825526b396ba6af5100dcbebf3 (patch) | |
| tree | 8e5ed2afbf82da97506c11cb40aec9f933978365 | |
| parent | 3557a52ad959b916021c6abdf95726409999f89d (diff) | |
| download | mariadb-git-95098bd7e267bd825526b396ba6af5100dcbebf3.tar.gz | |
Fix test_libmysqld link problem on Windows.
libmysqld/libmysqld.def:
Bump version number, add two symbols
VC++Files/libmysqld/examples/test_libmysqld.dsp:
Fix target name
Remove unwanted dependency
| -rw-r--r-- | VC++Files/libmysqld/examples/test_libmysqld.dsp | 6 | ||||
| -rw-r--r-- | libmysqld/libmysqld.def | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/VC++Files/libmysqld/examples/test_libmysqld.dsp b/VC++Files/libmysqld/examples/test_libmysqld.dsp index 6707b8cd8ee..013bc41409d 100644 --- a/VC++Files/libmysqld/examples/test_libmysqld.dsp +++ b/VC++Files/libmysqld/examples/test_libmysqld.dsp @@ -47,7 +47,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=xilink6.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"LIBCMTD" /out:"Release/mysql-server.exe"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\test_libmysqld.exe" # Begin Target
# Name "test_libmysqld - Win32 Release"
@@ -71,9 +71,5 @@ SOURCE=..\..\client\readline.cpp SOURCE=..\..\client\sql_string.cpp # End Source File
# End Group
-# Begin Source File
-
-SOURCE=..\..\lib_release\libmysqld.lib
-# End Source File
# End Target
# End Project
diff --git a/libmysqld/libmysqld.def b/libmysqld/libmysqld.def index ea3133594f5..0612141a60d 100644 --- a/libmysqld/libmysqld.def +++ b/libmysqld/libmysqld.def @@ -1,6 +1,6 @@ LIBRARY LIBMYSQLD -DESCRIPTION 'MySQL 4.1 Embedded Server Library' -VERSION 4.1 +DESCRIPTION 'MySQL 5.0 Embedded Server Library' +VERSION 5.0 EXPORTS _dig_vec_upper _dig_vec_lower @@ -158,3 +158,5 @@ EXPORTS mysql_stmt_attr_set mysql_stmt_field_count get_defaults_files + my_charset_bin + my_charset_same |