Commit 95098bd7 authored by unknown's avatar unknown
Browse files

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
parent 3557a52a

VC++Files/libmysqld/examples/test_libmysqld.dsp

+1 −5
Original line number Diff line number Diff line
@@ -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

libmysqld/libmysqld.def

+4 −2
Original line number Diff line number Diff line 
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