diff options
author | monty@narttu.mysql.fi <> | 2003-02-28 22:24:00 +0200 |
---|---|---|
committer | monty@narttu.mysql.fi <> | 2003-02-28 22:24:00 +0200 |
commit | e8aa21c8d30c11b5dabd31cc90c59f49049a04a1 (patch) | |
tree | d537e0166ddcfafa848c4a7753e9554d268108c7 /VC++Files/merge | |
parent | c908b0ed16fc689854bd3c8216596d064ee96fdb (diff) | |
download | mariadb-git-e8aa21c8d30c11b5dabd31cc90c59f49049a04a1.tar.gz |
LOAD DATA INFILE is not replicated if replicate_*_table is set
LOAD DATA LOCAL INFILE was not replicated correctly
Diffstat (limited to 'VC++Files/merge')
-rw-r--r-- | VC++Files/merge/merge.dsp | 14 | ||||
-rw-r--r-- | VC++Files/merge/merge.dsw | 1 |
2 files changed, 7 insertions, 8 deletions
diff --git a/VC++Files/merge/merge.dsp b/VC++Files/merge/merge.dsp index 70c0ce87d6b..8a8173fd606 100644 --- a/VC++Files/merge/merge.dsp +++ b/VC++Files/merge/merge.dsp @@ -7,19 +7,19 @@ CFG=merge - 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 !MESSAGE NMAKE /f "merge.mak". -!MESSAGE +!MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE +!MESSAGE !MESSAGE NMAKE /f "merge.mak" CFG="merge - Win32 Debug" -!MESSAGE +!MESSAGE !MESSAGE Possible choices for configuration are: -!MESSAGE +!MESSAGE !MESSAGE "merge - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "merge - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE +!MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 @@ -76,7 +76,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"..\lib_debug\merge.lib" -!ENDIF +!ENDIF # Begin Target diff --git a/VC++Files/merge/merge.dsw b/VC++Files/merge/merge.dsw index a2d5ccb2ff2..26d3bb5200c 100644 --- a/VC++Files/merge/merge.dsw +++ b/VC++Files/merge/merge.dsw @@ -26,4 +26,3 @@ Package=<3> }}} ############################################################################### - |