Commit 05099790 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-new 

into  mysql.com:/home/jimw/my/mysql-5.1-clean
parents 3b8b3c06 55b07343

include/config-win.h

+10 −0
Original line number Diff line number Diff line
@@ -22,6 +22,11 @@ functions */ 
#define _WIN32_WINNT     0x0500

#endif



#if defined(_MSC_VER) && _MSC_VER >= 1400

/* Avoid endless warnings about sprintf() etc. being unsafe. */

#define _CRT_SECURE_NO_DEPRECATE 1

#endif



#include <sys/locking.h>

#include <windows.h>

#include <math.h>			/* Because of rint() */
@@ -341,6 +346,11 @@ inline double ulonglong2double(ulonglong value) 
#define HAVE_SETFILEPOINTER

#define HAVE_VIO_READ_BUFF



#if defined(_WIN64) && defined(_M_X64)

/* Avoid type conflicts with built-in functions. */

#define HAVE_STRNLEN

#endif



#ifndef __NT__

#undef FILE_SHARE_DELETE

#define FILE_SHARE_DELETE 0     /* Not implemented on Win 98/ME */

mysql-test/t/rpl_stm_loaddata_m.test

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
# See if the master logs LOAD DATA INFILE correctly when binlog_*_db rules

# exist.

# This is for BUG#1100 (LOAD DATA INFILE was half-logged).



# Requires statement logging

-- source include/have_binlog_format_statement.inc

-- source extra/rpl_tests/rpl_loaddata_m.test



# End of 4.1 tests

# Adding comment for force manual merge 5.0 -> wl1012: Delete me