Skip to content

M
MariaDB
Commit 77d7fd80 authored by unknown's avatar unknown
Browse files
Options

Merge 


client/Makefile.am:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
client/mysqlimport.c:
  SCCS merged
parents 1c16fb14 4bc61ff9
Show whitespace changes
Inline Side-by-side
Showing with 793 additions and 797 deletions
VC++Files/client/mysqlclient.vcproj
View file @ 77d7fd80
......@@ -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
View file @ 77d7fd80
......@@ -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
View file @ 77d7fd80
......@@ -22,7 +22,7 @@
Optimization="0"
OptimizeForProcessor="2"
AdditionalIncludeDirectories=".,..\include,../zlib,../extra/yassl/include"
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT"
PreprocessorDefinitions="_DEBUG;__WIN__;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT"
RuntimeLibrary="1"
PrecompiledHeaderFile=".\debug/libmysql.pch"
AssemblerListingLocation=".\debug/"
......@@ -95,7 +95,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
InlineFunctionExpansion="1"
OptimizeForProcessor="2"
AdditionalIncludeDirectories=".,..\include,../zlib,../extra/yassl/include"
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT"
PreprocessorDefinitions="NDEBUG;DBUG_OFF;__WIN__;_WINDOWS;USE_TLS;MYSQL_CLIENT"
StringPooling="TRUE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE"
......@@ -163,7 +163,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -171,7 +171,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -182,7 +182,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -190,7 +190,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -201,7 +201,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -209,7 +209,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -220,7 +220,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -228,7 +228,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -239,7 +239,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -247,7 +247,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -258,7 +258,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -266,7 +266,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -277,7 +277,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -285,7 +285,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -296,7 +296,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -304,7 +304,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -315,7 +315,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -323,7 +323,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -334,7 +334,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -342,7 +342,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -353,7 +353,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -361,7 +361,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -372,7 +372,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -380,7 +380,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -391,7 +391,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -399,7 +399,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -410,7 +410,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -418,7 +418,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -429,7 +429,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -437,7 +437,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -448,7 +448,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -456,7 +456,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -467,7 +467,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -475,7 +475,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -486,7 +486,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -494,7 +494,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -505,7 +505,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -513,7 +513,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -524,7 +524,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -532,7 +532,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -543,7 +543,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -551,7 +551,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -562,7 +562,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -570,7 +570,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -581,7 +581,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -589,7 +589,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -600,7 +600,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -608,7 +608,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -619,7 +619,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -627,7 +627,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -638,7 +638,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -646,7 +646,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -657,7 +657,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -665,7 +665,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -676,7 +676,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -684,7 +684,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -695,7 +695,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -703,7 +703,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -714,7 +714,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -722,7 +722,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -733,7 +733,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -741,7 +741,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -752,7 +752,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -760,7 +760,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -771,7 +771,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -779,7 +779,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -790,7 +790,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -798,7 +798,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -809,7 +809,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -817,7 +817,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -828,7 +828,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -836,7 +836,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -847,7 +847,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -855,7 +855,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -869,7 +869,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -877,7 +877,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -888,7 +888,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -896,7 +896,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -907,7 +907,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -915,7 +915,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -926,7 +926,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -934,7 +934,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -945,7 +945,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -953,7 +953,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -964,7 +964,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -972,7 +972,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -983,7 +983,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -991,7 +991,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1002,7 +1002,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1010,7 +1010,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1021,7 +1021,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1029,7 +1029,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1040,7 +1040,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1048,7 +1048,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1059,7 +1059,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1067,7 +1067,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1078,7 +1078,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1086,7 +1086,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1097,7 +1097,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1105,7 +1105,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1116,7 +1116,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1124,7 +1124,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1135,7 +1135,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1143,7 +1143,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1154,7 +1154,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1162,7 +1162,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1173,7 +1173,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1181,7 +1181,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1192,7 +1192,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1200,7 +1200,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1211,7 +1211,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1219,7 +1219,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1230,7 +1230,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1238,7 +1238,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1249,7 +1249,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1257,7 +1257,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1268,7 +1268,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1276,7 +1276,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1287,7 +1287,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1295,7 +1295,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1306,7 +1306,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1314,7 +1314,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1325,7 +1325,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1333,7 +1333,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1344,7 +1344,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1352,7 +1352,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1363,7 +1363,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1371,7 +1371,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1382,7 +1382,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1390,7 +1390,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1401,7 +1401,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1409,7 +1409,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1420,7 +1420,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1428,7 +1428,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1439,7 +1439,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1447,7 +1447,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1458,7 +1458,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1466,7 +1466,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1477,7 +1477,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1485,7 +1485,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1496,7 +1496,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1504,7 +1504,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1515,7 +1515,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1523,7 +1523,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1534,7 +1534,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1542,7 +1542,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1553,7 +1553,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1561,7 +1561,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1572,7 +1572,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1580,7 +1580,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1591,7 +1591,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1599,7 +1599,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1610,7 +1610,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1618,7 +1618,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1629,7 +1629,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1637,7 +1637,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1648,7 +1648,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1656,7 +1656,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1667,7 +1667,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1675,7 +1675,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1686,7 +1686,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1694,7 +1694,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1705,7 +1705,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1713,7 +1713,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1724,7 +1724,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1732,7 +1732,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1743,7 +1743,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1751,7 +1751,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1765,7 +1765,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1773,7 +1773,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1784,7 +1784,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1792,7 +1792,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1803,7 +1803,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1811,7 +1811,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1822,7 +1822,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1830,7 +1830,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1841,7 +1841,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1849,7 +1849,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1860,7 +1860,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1868,7 +1868,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1882,7 +1882,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1890,7 +1890,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1901,7 +1901,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1909,7 +1909,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1920,7 +1920,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1928,7 +1928,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1939,7 +1939,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1947,7 +1947,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1958,7 +1958,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1966,7 +1966,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1977,7 +1977,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -1985,7 +1985,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -1996,7 +1996,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -2004,7 +2004,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -2015,7 +2015,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -2023,7 +2023,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -2034,7 +2034,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -2042,7 +2042,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -2053,7 +2053,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -2061,7 +2061,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -2072,7 +2072,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -2080,7 +2080,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -2091,7 +2091,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -2099,7 +2099,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -2110,7 +2110,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -2118,7 +2118,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -2129,7 +2129,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -2137,7 +2137,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -2148,7 +2148,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -2156,7 +2156,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -2167,7 +2167,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -2175,7 +2175,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -2186,7 +2186,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -2194,7 +2194,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -2205,7 +2205,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -2213,7 +2213,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -2224,7 +2224,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -2232,7 +2232,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -2243,7 +2243,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -2251,7 +2251,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -2262,7 +2262,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -2270,7 +2270,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
......@@ -2281,7 +2281,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
......@@ -2289,7 +2289,7 @@ xcopy debug\libmysql.lib ..\lib_debug\ /y
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;NDEBUG;MYSQL_CLIENT;$(NoInherit)"/>
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
</Files>
......
VC++Files/libmysqld/libmysqld.vcproj
View file @ 77d7fd80
This source diff could not be displayed because it is too large. You can view the blob instead.
VC++Files/mysqlserver/mysqlserver.vcproj
View file @ 77d7fd80
......@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../include,../regex,../sql,../storage/bdb/build_win32,libmysqld"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_BERKELEY_DB;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;HAVE_INNOBASE_DB;USE_TLS;WITH_BERKELEY_STORAGE_ENGINE;WITH_INNOBASE_STORAGE_ENGINE"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;HAVE_INNOBASE_DB;USE_TLS;WITH_INNOBASE_STORAGE_ENGINE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="2"
......@@ -74,7 +74,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../include,../regex,../sql,../storage/bdb/build_win32,../libmysqld"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_BERKELEY_DB;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;HAVE_INNOBASE_DB;DBUG_OFF;USE_TLS;WITH_BERKELEY_STORAGE_ENGINE;WITH_INNOBASE_STORAGE_ENGINE"
PreprocessorDefinitions="WIN32;_LIB;NDEBUG;DBUG_OFF;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;HAVE_INNOBASE_DB;USE_TLS;WITH_INNOBASE_STORAGE_ENGINE"
StringPooling="TRUE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE"
......
VC++Files/sql/mysqld.vcproj
View file @ 77d7fd80
......@@ -148,7 +148,7 @@
InlineFunctionExpansion="1"
OptimizeForProcessor="2"
AdditionalIncludeDirectories="../storage/bdb/build_win32,../include,../regex,../extra/yassl/include,../zlib"
PreprocessorDefinitions="NDEBUG;__NT__;DBUG_OFF;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN;WITH_INNOBASE_STORAGE_ENGINE;WITH_BERKELEY_STORAGE_ENGINE;WITH_ARCHIVE_STORAGE_ENGINE;WITH_BLACKHOLE_STORAGE_ENGINE;WITH_EXAMPLE_STORAGE_ENGINE;WITH_FEDERATED_STORAGE_ENGINE;WITH_PARTITION_STORAGE_ENGINE;HAVE_ROW_BASED_REPLICATION"
PreprocessorDefinitions="__NT__;NDEBUG;DBUG_OFF;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN;WITH_INNOBASE_STORAGE_ENGINE;WITH_BERKELEY_STORAGE_ENGINE;WITH_ARCHIVE_STORAGE_ENGINE;WITH_BLACKHOLE_STORAGE_ENGINE;WITH_EXAMPLE_STORAGE_ENGINE;WITH_FEDERATED_STORAGE_ENGINE;WITH_PARTITION_STORAGE_ENGINE;HAVE_ROW_BASED_REPLICATION"
StringPooling="TRUE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE"
......@@ -212,7 +212,7 @@
InlineFunctionExpansion="1"
OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../regex,../zlib,../extra/yassl/include"
PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_INNOBASE_DB;HAVE_ARCHIVE_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN;WITH_INNOBASE_STORAGE_ENGINE;WITH_ARCHIVE_STORAGE_ENGINE;HAVE_ROW_BASED_REPLICATION"
PreprocessorDefinitions="__NT__;NDEBUG;DBUG_OFF;HAVE_INNOBASE_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN;WITH_INNOBASE_STORAGE_ENGINE;WITH_ARCHIVE_STORAGE_ENGINE;WITH_BLACKHOLE_STORAGE_ENGINE;WITH_EXAMPLE_STORAGE_ENGINE;WITH_FEDERATED_STORAGE_ENGINE;WITH_PARTITION_STORAGE_ENGINE;HAVE_ROW_BASED_REPLICATION"
StringPooling="TRUE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE"
......@@ -336,7 +336,7 @@
Optimization="0"
OptimizeForProcessor="2"
AdditionalIncludeDirectories="../storage/bdb/build_win32,../include,../regex,../extra/yassl/include,../zlib"
PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN;WITH_INNOBASE_STORAGE_ENGINE;WITH_BERKELEY_STORAGE_ENGINE;WITH_ARCHIVE_STORAGE_ENGINE;WITH_BLACKHOLE_STORAGE_ENGINE;WITH_EXAMPLE_STORAGE_ENGINE;WITH_FEDERATED_STORAGE_ENGINE;WITH_PARTITION_STORAGE_ENGINE;HAVE_ROW_BASED_REPLICATION"
PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_INNOBASE_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN;WITH_INNOBASE_STORAGE_ENGINE;WITH_ARCHIVE_STORAGE_ENGINE;WITH_BLACKHOLE_STORAGE_ENGINE;WITH_EXAMPLE_STORAGE_ENGINE;WITH_FEDERATED_STORAGE_ENGINE;WITH_PARTITION_STORAGE_ENGINE;HAVE_ROW_BASED_REPLICATION"
RuntimeLibrary="1"
PrecompiledHeaderFile=".\debug/mysqld.pch"
AssemblerListingLocation=".\debug/"
......@@ -521,7 +521,7 @@
InlineFunctionExpansion="1"
OptimizeForProcessor="2"
AdditionalIncludeDirectories="../zlib,../include,../regex,../extra/yassl/include"
PreprocessorDefinitions="NDEBUG;DBUG_OFF;HAVE_INNOBASE_DB;HAVE_ARCHIVE_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN;WITH_INNOBASE_STORAGE_ENGINE;WITH_ARCHIVE_STORAGE_ENGINE;HAVE_ROW_BASED_REPLICATION"
PreprocessorDefinitions="NDEBUG;DBUG_OFF;HAVE_INNOBASE_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN;WITH_INNOBASE_STORAGE_ENGINE;WITH_ARCHIVE_STORAGE_ENGINE;WITH_BLACKHOLE_STORAGE_ENGINE;WITH_EXAMPLE_STORAGE_ENGINE;WITH_FEDERATED_STORAGE_ENGINE;WITH_PARTITION_STORAGE_ENGINE;HAVE_ROW_BASED_REPLICATION"
StringPooling="TRUE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE"
......@@ -1374,7 +1374,8 @@
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
......@@ -1437,8 +1438,7 @@
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="nt|Win32"
ExcludedFromBuild="TRUE">
Name="nt|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
......@@ -1481,8 +1481,7 @@
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="TRUE">
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
......@@ -1518,8 +1517,7 @@
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="nt|Win32"
ExcludedFromBuild="TRUE">
Name="nt|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
......@@ -1562,8 +1560,7 @@
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="TRUE">
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
......@@ -1901,8 +1898,7 @@
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="nt|Win32"
ExcludedFromBuild="TRUE">
Name="nt|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
......@@ -1945,8 +1941,7 @@
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="TRUE">
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
......
client/Makefile.am
View file @ 77d7fd80
......@@ -27,7 +27,7 @@ INCLUDES = -I$(top_builddir)/include \
-I$(top_srcdir)/regex \
$(openssl_includes) $(yassl_includes)
LIBS = @CLIENT_LIBS@
LDADD= @CLIENT_EXTRA_LDFLAGS@ \
LDADD= @CLIENT_EXTRA_LDFLAGS@ $(CLIENT_THREAD_LIBS) \
$(top_builddir)/libmysql/libmysqlclient.la
bin_PROGRAMS = mysql mysqladmin mysqlcheck mysqlshow \
mysqldump mysqlimport mysqltest mysqlbinlog \
......@@ -81,7 +81,7 @@ link_sources:
@LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \
done; \
rm -f $(srcdir)/my_user.c; \
@LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c;
@LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c
# Don't update the files from bitkeeper
......
client/mysqlimport.c
View file @ 77d7fd80
......@@ -145,11 +145,13 @@ static struct my_option my_long_options[] =
(gptr*) &opt_mysql_unix_port, (gptr*) &opt_mysql_unix_port, 0, GET_STR,
REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#include <sslopt-longopts.h>
#if 0
{"use-threads", OPT_USE_THREADS,
"Load files in parallel. The argument is the number "
"of threads to use for loading data.",
(gptr*) &opt_use_threads, (gptr*) &opt_use_threads, 0,
GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#endif
#ifndef DONT_ALLOW_USER_CHANGE
{"user", 'u', "User for login if not current user.", (gptr*) &current_user,
(gptr*) &current_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
......@@ -299,7 +301,11 @@ static int write_to_table(char *filename, MYSQL *mysql)
{
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(mysql, sql_statement))
{
db_error_with_table(mysql, tablename);
......
dbug/dbug.c
View file @ 77d7fd80
......@@ -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);
......
mysql-test/mysql-test-run.pl
View file @ 77d7fd80
......@@ -508,6 +508,8 @@ sub command_line_setup () {
# These are defaults for things that are set on the command line
$opt_suite= "main"; # Special default suite
my $opt_comment;
my $opt_master_myport= 9306;
my $opt_slave_myport= 9308;
$opt_ndbcluster_port= 9350;
......@@ -626,6 +628,7 @@ sub command_line_setup () {
'big-test' => \$opt_big_test,
'debug' => \$opt_debug,
'fast' => \$opt_fast,
'comment=s' => \$opt_comment,
'local' => \$opt_local,
'local-master' => \$opt_local_master,
'netware' => \$opt_netware,
......@@ -652,9 +655,14 @@ sub command_line_setup () {
'help|h' => \$opt_usage,
) or usage("Can't read options");
if ( $opt_usage )
usage("") if $opt_usage;
if ( $opt_comment )
{
usage("");
print "\n";
print '#' x 78, "\n";
print "# $opt_comment\n";
print '#' x 78, "\n\n";
}
foreach my $arg ( @ARGV )
......
mysql-test/mysql-test-run.sh
View file @ 77d7fd80
......@@ -257,6 +257,7 @@ if [ -n "$MTR_BUILD_THREAD" ] ; then
MYSQL_MANAGER_PORT=`expr $MASTER_MYPORT + 2`
SLAVE_MYPORT=`expr $MASTER_MYPORT + 3`
NDBCLUSTER_PORT=`expr $MASTER_MYPORT + 6`
NDBCLUSTER_PORT_SLAVE=`expr $MASTER_MYPORT + 7`
echo "Using MTR_BUILD_THREAD = $MTR_BUILD_THREAD"
echo "Using MASTER_MYPORT = $MASTER_MYPORT"
......
mysql-test/r/mysqldump.result
View file @ 77d7fd80
......@@ -2650,33 +2650,3 @@ DELIMITER ;
DROP TRIGGER tr1;
DROP TABLE t1;
create table t1 (a text , b text);
create table t2 (a text , b text);
insert t1 values ("Duck, Duck", "goose");
insert t1 values ("Duck, Duck", "pidgeon");
insert t2 values ("We the people", "in order to perform");
insert t2 values ("a more perfect", "union");
select * from t1;
a b
Duck, Duck goose
Duck, Duck pidgeon
select * from t2;
a b
We the people in order to perform
a more perfect union
test.t1: Records: 2 Deleted: 0 Skipped: 0 Warnings: 0
test.t2: Records: 2 Deleted: 0 Skipped: 0 Warnings: 0
select * from t1;
a b
Duck, Duck goose
Duck, Duck pidgeon
Duck, Duck goose
Duck, Duck pidgeon
select * from t2;
a b
We the people in order to perform
a more perfect union
We the people in order to perform
a more perfect union
drop table t1;
drop table t2;
mysql-test/t/disabled.def
View file @ 77d7fd80
......@@ -34,13 +34,14 @@ rpl_ndb_insert_ignore : Bugs: #17431: INSERT IGNORE INTO returns failed: 1296
#rpl_ndb_log : result not deterministic
rpl_ndb_relay_space : Bug#16993
rpl_ndb_multi_update3 : Bug#17400: delete & update of rows in table without pk fails
rpl_ndb_sp007 : Bug #17290
rpl_row_create_table : Bug #17385
rpl_row_basic_2myisam : Bug #17385
rpl_row_basic_3innodb : Bug #17385
rpl_ndb_sp007 : Bug#17290
rpl_row_create_table : Bug#17385
rpl_row_basic_2myisam : Bug#17385
rpl_row_basic_3innodb : Bug#17385
rpl_sp : Bug#16456
rpl_until : Unstable test case, bug#15886
sp-goto : GOTO is currently is disabled - will be fixed in the future
rpl_ndb_blob : Bug #17505
rpl_ndb_blob2 : Bug #17505
rpl_ndb_blob : Bug#17505
rpl_ndb_blob2 : Bug#17505
rpl_ndb_log : results are not deterministic
mysqldump : Bug#17443 mysqlimport --use-threads=5 gives crashes
mysql-test/t/mysqldump.test
View file @ 77d7fd80
......@@ -1049,6 +1049,7 @@ SET SQL_MODE = @old_sql_mode;
DROP TRIGGER tr1;
DROP TABLE t1;
--disable_parsing
#
# Added for use-thread option
#
......@@ -1072,3 +1073,4 @@ select * from t2;
drop table t1;
drop table t2;
--enable_parsing
scripts/make_win_src_distribution.sh
View file @ 77d7fd80
......@@ -250,7 +250,7 @@ copy_dir_dirs() {
#
for i in client dbug extra storage/heap include storage/archive storage/example \
libmysql libmysqld storage/myisam storage/example \
include/mysql libmysql libmysqld storage/myisam storage/example \
storage/myisammrg mysys regex sql strings sql-common sql/examples \
tools vio zlib
do
......@@ -266,7 +266,7 @@ make -C $SOURCE/storage/ndb windoze
# Input directories to be copied recursively
#
for i in storage/bdb storage/innobase storage/ndb extra/yassl server-tools
for i in storage/bdb storage/innobase storage/ndb extra/yassl server-tools plugin
do
copy_dir_dirs $i
done
......
support-files/mysql.spec.sh
View file @ 77d7fd80
......@@ -629,7 +629,8 @@ fi
%files shared
%defattr(-, root, root, 0755)
# Shared libraries (omit for architectures that don't support them)
%{_libdir}/*.so*
%{_libdir}/libmysql*.so*
%{_libdir}/libndb*.so*
%files bench
%defattr(-, root, root, 0755)
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7