Merge tfr@work.mysql.com:/home/bk/mysql-4.0

into sarvik.tfr.cafe.ee:/usr/home/tfr/BK/mysql-4.0


Docs/manual.texi:
  Auto merged

VC++Files/libmysql/libmySQL.dsp

@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /G6 /MT /W3 /O2 /I "." /I "..\include" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /D "USE_TLS" /D "USE_OLD_FUNCTIONS" /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /O2 /I "." /I "..\include" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /D "USE_TLS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -76,7 +76,7 @@ PostBuild_Cmds=copy release\libmysql.lib ..\lib_release
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /ZI /Od /I "." /I "..\include" /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "USE_OLD_FUNCTIONS" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /ZI /Od /I "." /I "..\include" /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -215,10 +215,6 @@ SOURCE=..\strings\longlong2str.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\manager.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\mysys\mf_casecnv.c
 # End Source File
 # Begin Source File

libmysql/libmysql.def

@@ -73,12 +73,4 @@ EXPORTS
 	mysql_odbc_escape_string
 	myodbc_remove_escape
 	mysql_thread_safe
-	mysql_manager_init
-	mysql_manager_connect
-	mysql_manager_close
-	mysql_manager_command
-	mysql_manager_fetch_line
-	mysql_connect
-	mysql_create_db
-	mysql_drop_db