Commit 4bc61ff9 authored by unknown's avatar unknown
Browse files

mysqlimport.c: 

  Handle case where there is no snprintf()
libmysql.vcproj, mysqlclient.vcproj:
  Added __WIN__ symbol, needed when compiling dbug.c
dbug.vcproj:
  Changed __WIN32__ to __WIN__
dbug.c:
  Added Windows specific code to handle TIMESTAMP_ON log line format
make_win_src_distribution.sh:
  Copy plugin directory recursively
dbug.vcproj:
  Define __WIN__ for all targets


scripts/make_win_src_distribution.sh:
  Copy plugin directory recursively
dbug/dbug.c:
  Added Windows specific code to handle TIMESTAMP_ON log line format
VC++Files/client/mysqlclient.vcproj:
  Added __WIN__ symbol, needed when compiling dbug.c
VC++Files/dbug/dbug.vcproj:
  Changed __WIN32__ to __WIN__
VC++Files/libmysql/libmysql.vcproj:
  Added __WIN__ symbol, needed when compiling dbug.c
client/mysqlimport.c:
  Handle case where there is no snprintf()
parent 3470647a

VC++Files/client/mysqlclient.vcproj

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../,../extra/yassl/include"

				PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;MYSQL_CLIENT;NDEBUG"

				PreprocessorDefinitions="NDEBUG;DBUG_OFF;__WIN__;_WINDOWS;USE_TLS;MYSQL_CLIENT"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"
@@ -73,7 +73,7 @@ 
				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../,../extra/yassl/include"

				PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;MYSQL_CLIENT;NDEBUG;CHECK_LICENSE;LICENSE=Commercial"

				PreprocessorDefinitions="NDEBUG;DBUG_OFF;__WIN__;_WINDOWS;USE_TLS;MYSQL_CLIENT;CHECK_LICENSE;LICENSE=Commercial"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"
@@ -122,7 +122,7 @@ 
				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../,../extra/yassl/include"

				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_TLS;MYSQL_CLIENT"

				PreprocessorDefinitions="_DEBUG;__WIN__;_WINDOWS;SAFEMALLOC;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT"

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\debug/mysqlclient.pch"

				AssemblerListingLocation=".\debug/"

VC++Files/dbug/dbug.vcproj

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include"

				PreprocessorDefinitions="__WIN32__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_TLS"

				PreprocessorDefinitions="__WIN__;_WINDOWS;_DEBUG;SAFEMALLOC;SAFE_MUTEX;USE_TLS"

				StringPooling="TRUE"

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\dbug___Win32_TLS_DEBUG/dbug.pch"
@@ -72,7 +72,7 @@ 
				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include"

				PreprocessorDefinitions="DBUG_OFF;_WINDOWS;NDEBUG"

				PreprocessorDefinitions="__WIN__;_WINDOWS;NDEBUG;DBUG_OFF"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"
@@ -121,7 +121,7 @@ 
				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include"

				PreprocessorDefinitions="__WIN32__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS"

				PreprocessorDefinitions="__WIN__;_WINDOWS;_DEBUG;SAFEMALLOC;SAFE_MUTEX"

				StringPooling="TRUE"

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\debug/dbug.pch"

VC++Files/libmysql/libmysql.vcproj

+226 −226

File changed.

Preview size limit exceeded, changes collapsed.

client/mysqlimport.c

+4 −0
Original line number Diff line number Diff line
@@ -302,7 +302,11 @@ static int write_to_table(char *filename, MYSQL *sock) 
  {

    if (verbose)

      fprintf(stdout, "Deleting the old data from table %s\n", tablename);

#ifdef HAVE_SNPRINTF

    snprintf(sql_statement, FN_REFLEN*16+256, "DELETE FROM %s", tablename);

#else

    sprintf(sql_statement, "DELETE FROM %s", tablename);

#endif

    if (mysql_query(sock, sql_statement))

    {

      db_error_with_table(sock, tablename);

dbug/dbug.c

+12 −0
Original line number Diff line number Diff line
@@ -1655,6 +1655,17 @@ static void DoPrefix(CODE_STATE *cs, uint _line_) 
    (void) fprintf(cs->stack->out_file, "%5d: ", cs->lineno);

  if (cs->stack->flags & TIMESTAMP_ON)

  {

#ifdef __WIN__

    /* FIXME This doesn't give microseconds as in Unix case, and the resolution is

       in system ticks, 10 ms intervals. See my_getsystime.c for high res */

    SYSTEMTIME loc_t;

    GetLocalTime(&loc_t);

    (void) fprintf (cs->stack->out_file,

                    /* "%04d-%02d-%02d " */

                    "%02d:%02d:%02d.%06d ",

                    /*tm_p->tm_year + 1900, tm_p->tm_mon + 1, tm_p->tm_mday,*/

                    loc_t.wHour, loc_t.wMinute, loc_t.wSecond, loc_t.wMilliseconds);

#else

    struct timeval tv;

    struct tm *tm_p;

    if (gettimeofday(&tv, NULL) != -1)
@@ -1669,6 +1680,7 @@ static void DoPrefix(CODE_STATE *cs, uint _line_) 
                        (int) (tv.tv_usec));

      }

    }

#endif

  }

  if (cs->stack->flags & PROCESS_ON)

    (void) fprintf(cs->stack->out_file, "%s: ", cs->process);