Commit e8aa21c8 authored by monty@narttu.mysql.fi's avatar monty@narttu.mysql.fi

LOAD DATA INFILE is not replicated if replicate_*_table is set

LOAD DATA LOCAL INFILE was not replicated correctly
parent c908b0ed
......@@ -566,4 +566,3 @@ Package=<3>
}}}
###############################################################################
......@@ -26,4 +26,3 @@ Package=<3>
}}}
###############################################################################
......@@ -38,4 +38,3 @@ Package=<3>
}}}
###############################################################################
......@@ -38,4 +38,3 @@ Package=<3>
}}}
###############################################################################
......@@ -26,4 +26,3 @@ Package=<3>
}}}
###############################################################################
......@@ -26,4 +26,3 @@ Package=<3>
}}}
###############################################################################
# Microsoft Developer Studio Project File - Name="libmySQL" - Package Owner=<4>
# Microsoft Developer Studio Project File - Name="libmysql" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=libmySQL - Win32 Debug
CFG=libmysql - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "libmySQL.mak".
!MESSAGE NMAKE /f "libmysql.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "libmySQL.mak" CFG="libmySQL - Win32 Debug"
!MESSAGE NMAKE /f "libmysql.mak" CFG="libmysql - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "libmySQL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "libmySQL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "libmysql - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "libmysql - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
......@@ -29,7 +29,7 @@ CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "libmySQL - Win32 Release"
!IF "$(CFG)" == "libmysql - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
......@@ -54,15 +54,15 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.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 /nologo /subsystem:windows /dll /machine:I386
# ADD LINK32 wsock32.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:windows /dll /machine:I386 /def:"libmysql.def" /out:"../lib_release/libmySQL.dll" /libpath:"." /libpath:"..\lib_release"
# ADD LINK32 wsock32.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:windows /dll /machine:I386 /def:"libmysql.def" /out:"..\lib_release\libmysql.dll" /libpath:"." /libpath:"..\lib_release"
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
PostBuild_Desc=Move DLL export lib
PostBuild_Cmds=xcopy release\libmysql.lib ..\lib_release /y
PostBuild_Desc=Copy .lib file
PostBuild_Cmds=xcopy release\libmysql.lib ..\lib_release\
# End Special Build Tool
!ELSEIF "$(CFG)" == "libmySQL - Win32 Debug"
!ELSEIF "$(CFG)" == "libmysql - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
......@@ -87,20 +87,20 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 zlib.lib wsock32.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:windows /dll /incremental:no /map /debug /machine:I386 /def:"libmysql.def" /out:"../lib_debug/libmySQL.dll" /pdbtype:sept /libpath:"." /libpath:"..\lib_debug"
# ADD LINK32 zlib.lib wsock32.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:windows /dll /incremental:no /map /debug /machine:I386 /def:"libmysql.def" /out:"..\lib_debug\libmysql.dll" /pdbtype:sept /libpath:"." /libpath:"..\lib_debug"
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
PostBuild_Desc=Move DLL export lib
PostBuild_Cmds=xcopy ..\lib_debug\libmysql.dll C:\winnt\system32\ /y xcopy debug\libmysql.lib ..\lib_debug\ /y
PostBuild_Desc=Copy .lib file
PostBuild_Cmds=xcopy ..\lib_debug\libmysql.dll C:\winnt\system32\ xcopy debug\libmysql.lib ..\lib_debug\
# End Special Build Tool
!ENDIF
# Begin Target
# Name "libmySQL - Win32 Release"
# Name "libmySQL - Win32 Debug"
# Name "libmysql - Win32 Release"
# Name "libmysql - Win32 Debug"
# Begin Source File
SOURCE=..\mysys\array.c
......@@ -287,6 +287,10 @@ SOURCE=..\mysys\my_gethostbyname.c
# End Source File
# Begin Source File
SOURCE=..\mysys\my_getopt.c
# End Source File
# Begin Source File
SOURCE=..\mysys\my_getwd.c
# End Source File
# Begin Source File
......@@ -443,6 +447,10 @@ SOURCE=..\strings\strnmov.c
# End Source File
# Begin Source File
SOURCE=..\strings\strtoll.c
# End Source File
# Begin Source File
SOURCE=..\strings\strxmov.c
# End Source File
# Begin Source File
......
......@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 5.00
###############################################################################
Project: "libmySQL"=".\libmySQL.dsp" - Package Owner=<4>
Project: "libmysql"=".\libmysql.dsp" - Package Owner=<4>
Package=<5>
{{{
......@@ -26,4 +26,3 @@ Package=<3>
}}}
###############################################################################
......@@ -26,4 +26,3 @@ Package=<3>
}}}
###############################################################################
......@@ -26,4 +26,3 @@ Package=<3>
}}}
###############################################################################
......@@ -114,7 +114,7 @@ Package=<4>
###############################################################################
Project: "libmySQL"=".\libmysql\libmySQL.dsp" - Package Owner=<4>
Project: "libmysql"=".\libmysql\libmysql.dsp" - Package Owner=<4>
Package=<5>
{{{
......@@ -192,7 +192,7 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name libmySQL
Project_Dep_Name libmysql
End Project Dependency
}}}
......@@ -708,7 +708,7 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name libmySQL
Project_Dep_Name libmysql
End Project Dependency
}}}
......@@ -797,4 +797,3 @@ Package=<3>
}}}
###############################################################################
......@@ -71,7 +71,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../include" /D "_DEBUG" /D "_WINDOWS" /FD /c
# ADD CPP /nologo /G6 /MTd /W3 /Gm /GR /GX /Zi /Od /I "../include" /D "_DEBUG" /D "_WINDOWS" /FD /c
# SUBTRACT CPP /Fr /YX /Yc /Yu
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /o "NUL" /win32
......
......@@ -26,4 +26,3 @@ Package=<3>
}}}
###############################################################################
......@@ -406,6 +406,10 @@ SOURCE=.\my_seek.c
# End Source File
# Begin Source File
SOURCE=.\my_sleep.c
# End Source File
# Begin Source File
SOURCE=.\my_static.c
# End Source File
# Begin Source File
......
......@@ -26,4 +26,3 @@ Package=<3>
}}}
###############################################################################
......@@ -26,4 +26,3 @@ Package=<3>
}}}
###############################################################################
......@@ -26,4 +26,3 @@ Package=<3>
}}}
###############################################################################
......@@ -26,4 +26,3 @@ Package=<3>
}}}
###############################################################################
......@@ -26,4 +26,3 @@ Package=<3>
}}}
###############################################################################
......@@ -26,4 +26,3 @@ Package=<3>
}}}
###############################################################################
......@@ -26,4 +26,3 @@ Package=<3>
}}}
###############################################################################
......@@ -26,4 +26,3 @@ Package=<3>
}}}
###############################################################################
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment