1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
LOAD DATA LOCAL INFILE was not replicated correctly
This commit is contained in:
monty@narttu.mysql.fi 2003-02-28 22:24:00 +02:00
parent c908b0ed16
commit e8aa21c8d3
105 changed files with 804 additions and 804 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
VC++Files/bdb/build_win32/Berkeley_DB.dsw
View File

@ -566,4 +566,3 @@ Package=<3>
}}} }}}
############################################################################### ###############################################################################

1
VC++Files/client/mysqlclient.dsw
View File

@ -26,4 +26,3 @@ Package=<3>
}}} }}}
############################################################################### ###############################################################################

1
VC++Files/contrib/asm386/zlibvc.dsw
View File

@ -38,4 +38,3 @@ Package=<3>
}}} }}}
############################################################################### ###############################################################################

1
VC++Files/contrib/minizip/zlibvc.dsw
View File

@ -38,4 +38,3 @@ Package=<3>
}}} }}}
############################################################################### ###############################################################################

1
VC++Files/dbug/dbug.dsw
View File

@ -26,4 +26,3 @@ Package=<3>
}}} }}}
############################################################################### ###############################################################################

1
VC++Files/isam/isam.dsw
View File

@ -26,4 +26,3 @@ Package=<3>
}}} }}}
############################################################################### ###############################################################################

40
VC++Files/libmysql/libmysql.dsp
View File

@ -1,24 +1,24 @@
# 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 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 # 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 This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run !MESSAGE use the Export Makefile command and run
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "libmySQL.mak". !MESSAGE NMAKE /f "libmysql.mak".
!MESSAGE !MESSAGE
!MESSAGE You can specify a configuration when running NMAKE !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "libmySQL.mak" CFG="libmySQL - Win32 Debug" !MESSAGE NMAKE /f "libmysql.mak" CFG="libmysql - Win32 Debug"
!MESSAGE !MESSAGE
!MESSAGE Possible choices for configuration are: !MESSAGE Possible choices for configuration are:
!MESSAGE !MESSAGE
!MESSAGE "libmySQL - Win32 Release" (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 "libmysql - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE !MESSAGE
# Begin Project # Begin Project
@ -29,7 +29,7 @@ CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "libmySQL - Win32 Release" !IF "$(CFG)" == "libmysql - Win32 Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0 # PROP BASE Use_Debug_Libraries 0
@ -54,15 +54,15 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe 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 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 # SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool # Begin Special Build Tool
SOURCE="$(InputPath)" SOURCE="$(InputPath)"
PostBuild_Desc=Move DLL export lib PostBuild_Desc=Copy .lib file
PostBuild_Cmds=xcopy release\libmysql.lib ..\lib_release /y PostBuild_Cmds=xcopy release\libmysql.lib ..\lib_release\
# End Special Build Tool # End Special Build Tool
!ELSEIF "$(CFG)" == "libmySQL - Win32 Debug" !ELSEIF "$(CFG)" == "libmysql - Win32 Debug"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
@ -87,20 +87,20 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe 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 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 # SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool # Begin Special Build Tool
SOURCE="$(InputPath)" SOURCE="$(InputPath)"
PostBuild_Desc=Move DLL export lib PostBuild_Desc=Copy .lib file
PostBuild_Cmds=xcopy ..\lib_debug\libmysql.dll C:\winnt\system32\ /y xcopy debug\libmysql.lib ..\lib_debug\ /y PostBuild_Cmds=xcopy ..\lib_debug\libmysql.dll C:\winnt\system32\ xcopy debug\libmysql.lib ..\lib_debug\
# End Special Build Tool # End Special Build Tool
!ENDIF !ENDIF
# Begin Target # Begin Target
# Name "libmySQL - Win32 Release" # Name "libmysql - Win32 Release"
# Name "libmySQL - Win32 Debug" # Name "libmysql - Win32 Debug"
# Begin Source File # Begin Source File
SOURCE=..\mysys\array.c SOURCE=..\mysys\array.c
@ -287,6 +287,10 @@ SOURCE=..\mysys\my_gethostbyname.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\mysys\my_getopt.c
# End Source File
# Begin Source File
SOURCE=..\mysys\my_getwd.c SOURCE=..\mysys\my_getwd.c
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -443,6 +447,10 @@ SOURCE=..\strings\strnmov.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\strings\strtoll.c
# End Source File
# Begin Source File
SOURCE=..\strings\strxmov.c SOURCE=..\strings\strxmov.c
# End Source File # End Source File
# Begin Source File # Begin Source File

3
VC++Files/libmysql/libmysql.dsw
View 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> Package=<5>
{{{ {{{
@ -26,4 +26,3 @@ Package=<3>
}}} }}}
############################################################################### ###############################################################################

1
VC++Files/libmysqltest/mytest.dsw
View File

@ -26,4 +26,3 @@ Package=<3>
}}} }}}
############################################################################### ###############################################################################

1
VC++Files/merge/merge.dsw
View File

@ -26,4 +26,3 @@ Package=<3>
}}} }}}
############################################################################### ###############################################################################

7
VC++Files/mysql.dsw
View File

@ -114,7 +114,7 @@ Package=<4>
############################################################################### ###############################################################################
Project: "libmySQL"=".\libmysql\libmySQL.dsp" - Package Owner=<4> Project: "libmysql"=".\libmysql\libmysql.dsp" - Package Owner=<4>
Package=<5> Package=<5>
{{{ {{{
@ -192,7 +192,7 @@ Package=<5>
Package=<4> Package=<4>
{{{ {{{
Begin Project Dependency Begin Project Dependency
Project_Dep_Name libmySQL Project_Dep_Name libmysql
End Project Dependency End Project Dependency
}}} }}}
@ -708,7 +708,7 @@ Package=<5>
Package=<4> Package=<4>
{{{ {{{
Begin Project Dependency Begin Project Dependency
Project_Dep_Name libmySQL Project_Dep_Name libmysql
End Project Dependency End Project Dependency
}}} }}}
@ -797,4 +797,3 @@ Package=<3>
}}} }}}
############################################################################### ###############################################################################

2
VC++Files/mysqlmanager/MySqlManager.dsp
View File

@ -71,7 +71,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # 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 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 # SUBTRACT CPP /Fr /YX /Yc /Yu
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /o "NUL" /win32

1
VC++Files/mysqlmanager/mysqlmanager.dsw
View File

@ -26,4 +26,3 @@ Package=<3>
}}} }}}
############################################################################### ###############################################################################

4
VC++Files/mysys/mysys.dsp
View File

@ -406,6 +406,10 @@ SOURCE=.\my_seek.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\my_sleep.c
# End Source File
# Begin Source File
SOURCE=.\my_static.c SOURCE=.\my_static.c
# End Source File # End Source File
# Begin Source File # Begin Source File

1
VC++Files/mysys/mysys.dsw
View File

@ -26,4 +26,3 @@ Package=<3>
}}} }}}
############################################################################### ###############################################################################

1
VC++Files/regex/regex.dsw
View File

@ -26,4 +26,3 @@ Package=<3>
}}} }}}
############################################################################### ###############################################################################

1
VC++Files/sql/mysqld.dsw
View File

@ -26,4 +26,3 @@ Package=<3>
}}} }}}
############################################################################### ###############################################################################

1
VC++Files/sql/old/mysqld.dsw
View File

@ -26,4 +26,3 @@ Package=<3>
}}} }}}
############################################################################### ###############################################################################

1
VC++Files/strings/MASM6x/strings.dsw
View File

@ -26,4 +26,3 @@ Package=<3>
}}} }}}
############################################################################### ###############################################################################

1
VC++Files/strings/backup/strings.dsw
View File

@ -26,4 +26,3 @@ Package=<3>
}}} }}}
############################################################################### ###############################################################################

1
VC++Files/strings/noMASM/strings.dsw
View File

@ -26,4 +26,3 @@ Package=<3>
}}} }}}
############################################################################### ###############################################################################

1
VC++Files/strings/strings.dsw
View File

@ -26,4 +26,3 @@ Package=<3>
}}} }}}
############################################################################### ###############################################################################

1
include/my_global.h
View File

@ -261,6 +261,7 @@ C_MODE_END
#define CONFIG_SMP #define CONFIG_SMP
#include <asm/atomic.h> #include <asm/atomic.h>
#endif #endif
#include <errno.h> /* Recommended by debian */
/* Go around some bugs in different OS and compilers */ /* Go around some bugs in different OS and compilers */
#if defined(_HPUX_SOURCE) && defined(HAVE_SYS_STREAM_H) #if defined(_HPUX_SOURCE) && defined(HAVE_SYS_STREAM_H)

0
mysql-test/r/rpl_loaddatalocal.result Normal file
View File

0
mysql-test/t/rpl_loaddatalocal.test Normal file
View File

1
sql/log_event.cc
View File

@ -1838,6 +1838,7 @@ int Load_log_event::exec_event(NET* net, struct st_relay_log_info* rli,
tables.db = thd->db; tables.db = thd->db;
tables.alias = tables.real_name = (char*)table_name; tables.alias = tables.real_name = (char*)table_name;
tables.lock_type = TL_WRITE; tables.lock_type = TL_WRITE;
tables.updating= 1;
// the table will be opened in mysql_load // the table will be opened in mysql_load
if (table_rules_on && !tables_ok(thd, &tables)) if (table_rules_on && !tables_ok(thd, &tables))
{ {

9
sql/mf_iocache.cc
View File

@ -70,12 +70,17 @@ int _my_b_net_read(register IO_CACHE *info, byte *Buffer,
/* to set up stuff for my_b_get (no _) */ /* to set up stuff for my_b_get (no _) */
info->read_end = (info->read_pos = (byte*) net->read_pos) + read_length; info->read_end = (info->read_pos = (byte*) net->read_pos) + read_length;
Buffer[0] = info->read_pos[0]; /* length is always 1 */ Buffer[0] = info->read_pos[0]; /* length is always 1 */
info->read_pos++;
/* /*
info->request_pos is used by log_loaded_block() to know the size info->request_pos is used by log_loaded_block() to know the size
of the current block of the current block.
info->pos_in_file is used by log_loaded_block() too.
*/ */
info->pos_in_file+= read_length;
info->request_pos=info->read_pos;
info->read_pos++;
info->request_pos=info->read_pos; info->request_pos=info->read_pos;
DBUG_RETURN(0); DBUG_RETURN(0);
} }