mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 03:17:20 +02:00
Merge mysql.com:/usr/home/bar/mysql-5.0.b12547
into mysql.com:/usr/home/bar/mysql-5.0.char1
This commit is contained in:
bar@mysql.com
commit
7f734c168a
108 changed files with 3771 additions and 497 deletions
1283
VC++Files/isam/isam.vcproj
Normal file
1283
VC++Files/isam/isam.vcproj
Normal file
File diff suppressed because it is too large
Load diff
272
VC++Files/isamchk/isamchk.vcproj
Normal file
272
VC++Files/isamchk/isamchk.vcproj
Normal file
|
|
@ -0,0 +1,272 @@
|
|||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="7.10"
|
||||
Name="isamchk"
|
||||
SccProjectName=""
|
||||
SccLocalPath="">
|
||||
<Platforms>
|
||||
<Platform
|
||||
Name="Win32"/>
|
||||
</Platforms>
|
||||
<Configurations>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory=".\release"
|
||||
IntermediateDirectory=".\release"
|
||||
ConfigurationType="1"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="FALSE"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
OptimizeForProcessor="2"
|
||||
AdditionalIncludeDirectories="../include,../myisam"
|
||||
PreprocessorDefinitions="NDEBUG;DBUG_OFF;_CONSOLE;_WINDOWS;_MBCS"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="TRUE"
|
||||
PrecompiledHeaderFile=".\release/isamchk.pch"
|
||||
AssemblerListingLocation=".\release/"
|
||||
ObjectFile=".\release/"
|
||||
ProgramDataBaseFileName=".\release/"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="TRUE"
|
||||
CompileAs="0"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="wsock32.lib setargv.obj"
|
||||
OutputFile="../client_release/isamchk.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
ProgramDatabaseFile=".\release/isamchk.pdb"
|
||||
SubSystem="1"
|
||||
TargetMachine="1"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
TypeLibraryName=".\release/isamchk.tlb"
|
||||
HeaderFileName=""/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
Culture="1033"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="classic|Win32"
|
||||
OutputDirectory=".\classic"
|
||||
IntermediateDirectory=".\classic"
|
||||
ConfigurationType="1"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="FALSE"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
OptimizeForProcessor="2"
|
||||
AdditionalIncludeDirectories="../include,../myisam"
|
||||
PreprocessorDefinitions="_CONSOLE;_WINDOWS;LICENSE=Commercial;DBUG_OFF;NDEBUG;_MBCS"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="TRUE"
|
||||
PrecompiledHeaderFile=".\classic/isamchk.pch"
|
||||
AssemblerListingLocation=".\classic/"
|
||||
ObjectFile=".\classic/"
|
||||
ProgramDataBaseFileName=".\classic/"
|
||||
BrowseInformation="1"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="TRUE"
|
||||
CompileAs="0"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="wsock32.lib setargv.obj"
|
||||
OutputFile="../client_classic/isamchk.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories="..\lib_release\"
|
||||
ProgramDatabaseFile=".\classic/isamchk.pdb"
|
||||
SubSystem="1"
|
||||
TargetMachine="1"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
TypeLibraryName=".\classic/isamchk.tlb"
|
||||
HeaderFileName=""/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
Culture="1033"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
OutputDirectory=".\debug"
|
||||
IntermediateDirectory=".\debug"
|
||||
ConfigurationType="1"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="FALSE"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
OptimizeForProcessor="2"
|
||||
AdditionalIncludeDirectories="../include,../myisam"
|
||||
PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS;_MBCS"
|
||||
RuntimeLibrary="1"
|
||||
PrecompiledHeaderFile=".\debug/isamchk.pch"
|
||||
AssemblerListingLocation=".\debug/"
|
||||
ObjectFile=".\debug/"
|
||||
ProgramDataBaseFileName=".\debug/"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="TRUE"
|
||||
DebugInformationFormat="1"
|
||||
CompileAs="0"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib setargv.obj"
|
||||
OutputFile="../client_debug/isamchk.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile=".\debug/isamchk.pdb"
|
||||
SubSystem="1"
|
||||
TargetMachine="1"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
TypeLibraryName=".\debug/isamchk.tlb"
|
||||
HeaderFileName=""/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
Culture="1033"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="Source Files"
|
||||
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
|
||||
<File
|
||||
RelativePath="..\isam\isamchk.c">
|
||||
<FileConfiguration
|
||||
Name="Release|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="classic|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""
|
||||
BrowseInformation="1"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\isam\sort.c">
|
||||
<FileConfiguration
|
||||
Name="Release|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="classic|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""
|
||||
BrowseInformation="1"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Header Files"
|
||||
Filter="h;hpp;hxx;hm;inl">
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Resource Files"
|
||||
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
|
||||
</Filter>
|
||||
</Files>
|
||||
<Globals>
|
||||
</Globals>
|
||||
</VisualStudioProject>
|
||||
|
|
@ -58,6 +58,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "my_print_defaults", "my_pri
|
|||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isam", "isam\isam.vcproj", "{262280A8-37D5-4037-BDFB-242468DFB3D3}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "myisam", "myisam\myisam.vcproj", "{262280A8-37D5-4037-BDFB-242468DFB3D2}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
|
|
@ -70,6 +74,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "myisam_ftdump", "myisam_ftd
|
|||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isamchk", "isamchk\isamchk.vcproj", "{87CD9881-D234-4306-BBC6-0668C6168C0E}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859} = {EEC1300B-85A5-497C-B3E1-F708021DF859}
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3} = {262280A8-37D5-4037-BDFB-242468DFB3D3}
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF} = {8762A9B8-72A9-462E-A9A2-F3265081F8AF}
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "myisamchk", "myisamchk\myisamchk.vcproj", "{87CD9881-D234-4306-BBC6-0668C6168C0F}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859} = {EEC1300B-85A5-497C-B3E1-F708021DF859}
|
||||
|
|
@ -92,6 +105,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "myisammrg", "myisammrg\myis
|
|||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pack_isam", "pack_isam\pack_isam.vcproj", "{EF833A1E-E358-4B6C-9C27-9489E85041CD}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859} = {EEC1300B-85A5-497C-B3E1-F708021DF859}
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3} = {262280A8-37D5-4037-BDFB-242468DFB3D3}
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF} = {8762A9B8-72A9-462E-A9A2-F3265081F8AF}
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "myisampack", "myisampack\myisampack.vcproj", "{EF833A1E-E358-4B6C-9C27-9489E85041CC}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859} = {EEC1300B-85A5-497C-B3E1-F708021DF859}
|
||||
|
|
@ -158,6 +180,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqldemb", "mysqldemb\mysq
|
|||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlshutdown", "mysqlshutdown\mysqlshutdown.vcproj", "{89F24ECE-9953-40EF-BDF4-B41F5631E92D}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB} = {26383276-4843-494B-8BE0-8936ED3EBAAB}
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF} = {8762A9B8-72A9-462E-A9A2-F3265081F8AF}
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlwatch", "mysqlwatch\mysqlwatch.vcproj", "{89F24ECE-9953-40EF-BDF4-B41F5631E92C}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB} = {26383276-4843-494B-8BE0-8936ED3EBAAB}
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF} = {8762A9B8-72A9-462E-A9A2-F3265081F8AF}
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqldump", "client\mysqldump.vcproj", "{89F24ECE-9953-40EF-BDF4-B41F5631E92B}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB} = {BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}
|
||||
|
|
@ -299,26 +335,27 @@ Global
|
|||
Embedded_Debug = Embedded_Debug
|
||||
Embedded_Pro = Embedded_Pro
|
||||
Embedded_Release = Embedded_Release
|
||||
Embedded_ProGPL = Embedded_ProGPL
|
||||
Max = Max
|
||||
Max nt = Max nt
|
||||
nt = nt
|
||||
pro = pro
|
||||
pro nt = pro nt
|
||||
pro gpl = pro gpl
|
||||
pro gpl nt = pro gpl nt
|
||||
Release = Release
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfiguration) = postSolution
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.classic.ActiveCfg = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.classic.Build.0 = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.classic nt.ActiveCfg = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.classic nt.Build.0 = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Debug.ActiveCfg = Debug|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Debug.Build.0 = Debug|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Embedded_Classic.ActiveCfg = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Embedded_Classic.Build.0 = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Embedded_Debug.Build.0 = Debug|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Embedded_Pro.ActiveCfg = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Embedded_Pro.Build.0 = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Embedded_ProGPL.ActiveCfg = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Embedded_ProGPL.Build.0 = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Embedded_Release.ActiveCfg = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Embedded_Release.Build.0 = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Max.ActiveCfg = Max|Win32
|
||||
|
|
@ -328,9 +365,11 @@ Global
|
|||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.nt.ActiveCfg = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.nt.Build.0 = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.pro.ActiveCfg = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.pro.Build.0 = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.pro nt.ActiveCfg = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.pro nt.Build.0 = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.pro gpl.ActiveCfg = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.pro gpl.Build.0 = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.pro gpl nt.ActiveCfg = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.pro gpl nt.Build.0 = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Release.ActiveCfg = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Release.Build.0 = Max|Win32
|
||||
{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.classic.ActiveCfg = Release|Win32
|
||||
|
|
@ -340,6 +379,7 @@ Global
|
|||
{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.Embedded_Classic.ActiveCfg = Release|Win32
|
||||
{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.Embedded_Debug.ActiveCfg = Release|Win32
|
||||
{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.Max.ActiveCfg = Release|Win32
|
||||
{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.Max.Build.0 = Release|Win32
|
||||
|
|
@ -351,6 +391,10 @@ Global
|
|||
{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.pro.Build.0 = Release|Win32
|
||||
{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.pro nt.ActiveCfg = Release|Win32
|
||||
{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.pro nt.Build.0 = Release|Win32
|
||||
{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.pro gpl.ActiveCfg = Release|Win32
|
||||
{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.pro gpl.Build.0 = Release|Win32
|
||||
{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.pro gpl nt.Build.0 = Release|Win32
|
||||
{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.Release.ActiveCfg = Release|Win32
|
||||
{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.Release.Build.0 = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.classic.ActiveCfg = Release|Win32
|
||||
|
|
@ -365,6 +409,8 @@ Global
|
|||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.Embedded_Debug.Build.0 = TLS_DEBUG|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.Embedded_Pro.Build.0 = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.Embedded_ProGPL.Build.0 = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.Embedded_Release.Build.0 = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.Max.ActiveCfg = Release|Win32
|
||||
|
|
@ -377,6 +423,10 @@ Global
|
|||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.pro.Build.0 = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.pro nt.ActiveCfg = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.pro nt.Build.0 = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.pro gpl.ActiveCfg = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.pro gpl.Build.0 = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.pro gpl nt.Build.0 = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.Release.ActiveCfg = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.Release.Build.0 = Release|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.classic.ActiveCfg = Release|Win32
|
||||
|
|
@ -391,6 +441,8 @@ Global
|
|||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Embedded_Debug.Build.0 = TLS_DEBUG|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Embedded_Pro.ActiveCfg = TLS|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Embedded_Pro.Build.0 = TLS|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Embedded_ProGPL.ActiveCfg = TLS|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Embedded_ProGPL.Build.0 = TLS|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Embedded_Release.ActiveCfg = TLS|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Embedded_Release.Build.0 = TLS|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Max.ActiveCfg = Release|Win32
|
||||
|
|
@ -403,6 +455,10 @@ Global
|
|||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.pro.Build.0 = Release|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.pro nt.ActiveCfg = Release|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.pro nt.Build.0 = Release|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.pro gpl.ActiveCfg = Release|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.pro gpl.Build.0 = Release|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.pro gpl nt.Build.0 = Release|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Release.ActiveCfg = Release|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Release.Build.0 = Release|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.classic.ActiveCfg = Release|Win32
|
||||
|
|
@ -417,6 +473,8 @@ Global
|
|||
{13D37150-54D0-46C5-9519-03923243C7C7}.Embedded_Debug.Build.0 = Debug|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.Embedded_Pro.Build.0 = Release|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.Embedded_ProGPL.Build.0 = Release|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.Embedded_Release.Build.0 = Release|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.Max.ActiveCfg = Release|Win32
|
||||
|
|
@ -429,6 +487,10 @@ Global
|
|||
{13D37150-54D0-46C5-9519-03923243C7C7}.pro.Build.0 = Release|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.pro nt.ActiveCfg = nt|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.pro nt.Build.0 = nt|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.pro gpl.ActiveCfg = Release|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.pro gpl.Build.0 = Release|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.pro gpl nt.ActiveCfg = nt|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.pro gpl nt.Build.0 = nt|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.Release.ActiveCfg = Release|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.Release.Build.0 = Release|Win32
|
||||
{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.classic.ActiveCfg = Release|Win32
|
||||
|
|
@ -440,6 +502,8 @@ Global
|
|||
{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.Embedded_Classic.ActiveCfg = Release|Win32
|
||||
{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.Max.ActiveCfg = Release|Win32
|
||||
{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.Max.Build.0 = Release|Win32
|
||||
|
|
@ -451,6 +515,10 @@ Global
|
|||
{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.pro.Build.0 = Release|Win32
|
||||
{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.pro nt.ActiveCfg = Release|Win32
|
||||
{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.pro nt.Build.0 = Release|Win32
|
||||
{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.pro gpl.ActiveCfg = Release|Win32
|
||||
{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.pro gpl.Build.0 = Release|Win32
|
||||
{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.pro gpl nt.Build.0 = Release|Win32
|
||||
{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.Release.ActiveCfg = Release|Win32
|
||||
{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.Release.Build.0 = Release|Win32
|
||||
{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.classic.ActiveCfg = classic|Win32
|
||||
|
|
@ -462,6 +530,8 @@ Global
|
|||
{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.Embedded_Debug.Build.0 = Debug|Win32
|
||||
{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.Embedded_Pro.ActiveCfg = pro|Win32
|
||||
{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.Embedded_Pro.Build.0 = pro|Win32
|
||||
{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.Embedded_ProGPL.Build.0 = Release|Win32
|
||||
{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.Embedded_Release.Build.0 = Release|Win32
|
||||
{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.Max.ActiveCfg = classic|Win32
|
||||
|
|
@ -469,6 +539,8 @@ Global
|
|||
{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.nt.ActiveCfg = classic|Win32
|
||||
{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.pro.ActiveCfg = pro|Win32
|
||||
{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.pro nt.ActiveCfg = pro|Win32
|
||||
{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.pro gpl.ActiveCfg = Release|Win32
|
||||
{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.Release.ActiveCfg = Release|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.classic.ActiveCfg = Release|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.classic.Build.0 = Release|Win32
|
||||
|
|
@ -476,9 +548,10 @@ Global
|
|||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.classic nt.Build.0 = Release|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.Debug.ActiveCfg = Debug|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.Debug.Build.0 = Debug|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.Embedded_Classic.ActiveCfg = Debug|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.Embedded_Classic.ActiveCfg = Release|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.Embedded_Pro.ActiveCfg = Debug|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.Max.ActiveCfg = Release|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.Max.Build.0 = Release|Win32
|
||||
|
|
@ -490,6 +563,10 @@ Global
|
|||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.pro.Build.0 = Release|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.pro nt.ActiveCfg = Release|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.pro nt.Build.0 = Release|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.pro gpl.ActiveCfg = Release|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.pro gpl.Build.0 = Release|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.pro gpl nt.Build.0 = Release|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.Release.ActiveCfg = Release|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.Release.Build.0 = Release|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.classic.ActiveCfg = classic|Win32
|
||||
|
|
@ -498,9 +575,10 @@ Global
|
|||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.classic nt.Build.0 = Release|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.Debug.ActiveCfg = Debug|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.Debug.Build.0 = Debug|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.Embedded_Classic.ActiveCfg = Debug|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.Embedded_Classic.ActiveCfg = Release|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.Embedded_Pro.ActiveCfg = Debug|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.Max.ActiveCfg = Release|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.Max.Build.0 = Release|Win32
|
||||
|
|
@ -512,6 +590,10 @@ Global
|
|||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.pro.Build.0 = Release|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.pro nt.ActiveCfg = Release|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.pro nt.Build.0 = Release|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.pro gpl.ActiveCfg = Release|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.pro gpl.Build.0 = Release|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.pro gpl nt.Build.0 = Release|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.Release.ActiveCfg = Release|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.Release.Build.0 = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.classic.ActiveCfg = Release|Win32
|
||||
|
|
@ -526,6 +608,8 @@ Global
|
|||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.Embedded_Debug.Build.0 = Debug|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.Embedded_Pro.ActiveCfg = TLS|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.Embedded_Pro.Build.0 = TLS|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.Embedded_ProGPL.ActiveCfg = TLS|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.Embedded_ProGPL.Build.0 = TLS|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.Embedded_Release.ActiveCfg = TLS|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.Embedded_Release.Build.0 = TLS|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.Max.ActiveCfg = Release|Win32
|
||||
|
|
@ -538,8 +622,39 @@ Global
|
|||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.pro.Build.0 = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.pro nt.ActiveCfg = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.pro nt.Build.0 = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.pro gpl.ActiveCfg = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.pro gpl.Build.0 = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.pro gpl nt.Build.0 = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.Release.ActiveCfg = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.Release.Build.0 = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3}.classic.ActiveCfg = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3}.classic.Build.0 = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3}.classic nt.ActiveCfg = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3}.classic nt.Build.0 = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3}.Debug.ActiveCfg = Debug|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3}.Debug.Build.0 = Debug|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3}.Embedded_Classic.ActiveCfg = TLS|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3}.Embedded_Debug.ActiveCfg = TLS_DEBUG|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3}.Embedded_Pro.ActiveCfg = TLS|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3}.Embedded_ProGPL.ActiveCfg = TLS|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3}.Embedded_Release.ActiveCfg = TLS|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3}.Max.ActiveCfg = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3}.Max.Build.0 = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3}.Max nt.ActiveCfg = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3}.Max nt.Build.0 = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3}.nt.ActiveCfg = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3}.nt.Build.0 = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3}.pro.ActiveCfg = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3}.pro.Build.0 = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3}.pro nt.ActiveCfg = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3}.pro nt.Build.0 = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3}.pro gpl.ActiveCfg = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3}.pro gpl.Build.0 = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3}.pro gpl nt.Build.0 = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3}.Release.ActiveCfg = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D3}.Release.Build.0 = Release|Win32
|
||||
{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.classic.ActiveCfg = Release|Win32
|
||||
{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.classic.Build.0 = Release|Win32
|
||||
{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.classic nt.ActiveCfg = Release|Win32
|
||||
|
|
@ -549,6 +664,7 @@ Global
|
|||
{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.Embedded_Classic.ActiveCfg = Release|Win32
|
||||
{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.Max.ActiveCfg = Release|Win32
|
||||
{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.Max.Build.0 = Release|Win32
|
||||
|
|
@ -560,6 +676,10 @@ Global
|
|||
{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.pro.Build.0 = Release|Win32
|
||||
{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.pro nt.ActiveCfg = Release|Win32
|
||||
{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.pro nt.Build.0 = Release|Win32
|
||||
{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.pro gpl.ActiveCfg = Release|Win32
|
||||
{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.pro gpl.Build.0 = Release|Win32
|
||||
{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.pro gpl nt.Build.0 = Release|Win32
|
||||
{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.Release.ActiveCfg = Release|Win32
|
||||
{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.Release.Build.0 = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.classic.ActiveCfg = classic|Win32
|
||||
|
|
@ -568,9 +688,10 @@ Global
|
|||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.classic nt.Build.0 = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.Debug.ActiveCfg = Debug|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.Debug.Build.0 = Debug|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.Embedded_Classic.ActiveCfg = Debug|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.Embedded_Classic.ActiveCfg = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.Embedded_Pro.ActiveCfg = Debug|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.Max.ActiveCfg = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.Max.Build.0 = Release|Win32
|
||||
|
|
@ -582,8 +703,39 @@ Global
|
|||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.pro.Build.0 = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.pro nt.ActiveCfg = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.pro nt.Build.0 = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.pro gpl.ActiveCfg = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.pro gpl.Build.0 = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.pro gpl nt.Build.0 = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.Release.ActiveCfg = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.Release.Build.0 = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0E}.classic.ActiveCfg = classic|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0E}.classic.Build.0 = classic|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0E}.classic nt.ActiveCfg = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0E}.classic nt.Build.0 = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0E}.Debug.ActiveCfg = Debug|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0E}.Debug.Build.0 = Debug|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0E}.Embedded_Classic.ActiveCfg = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0E}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0E}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0E}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0E}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0E}.Max.ActiveCfg = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0E}.Max.Build.0 = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0E}.Max nt.ActiveCfg = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0E}.Max nt.Build.0 = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0E}.nt.ActiveCfg = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0E}.nt.Build.0 = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0E}.pro.ActiveCfg = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0E}.pro.Build.0 = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0E}.pro nt.ActiveCfg = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0E}.pro nt.Build.0 = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0E}.pro gpl.ActiveCfg = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0E}.pro gpl.Build.0 = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0E}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0E}.pro gpl nt.Build.0 = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0E}.Release.ActiveCfg = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0E}.Release.Build.0 = Release|Win32
|
||||
{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.classic.ActiveCfg = classic|Win32
|
||||
{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.classic.Build.0 = classic|Win32
|
||||
{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.classic nt.ActiveCfg = Release|Win32
|
||||
|
|
@ -593,6 +745,7 @@ Global
|
|||
{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.Embedded_Classic.ActiveCfg = Release|Win32
|
||||
{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.Max.ActiveCfg = Release|Win32
|
||||
{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.Max.Build.0 = Release|Win32
|
||||
|
|
@ -604,6 +757,10 @@ Global
|
|||
{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.pro.Build.0 = Release|Win32
|
||||
{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.pro nt.ActiveCfg = Release|Win32
|
||||
{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.pro nt.Build.0 = Release|Win32
|
||||
{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.pro gpl.ActiveCfg = Release|Win32
|
||||
{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.pro gpl.Build.0 = Release|Win32
|
||||
{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.pro gpl nt.Build.0 = Release|Win32
|
||||
{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.Release.ActiveCfg = Release|Win32
|
||||
{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.Release.Build.0 = Release|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.classic.ActiveCfg = Release|Win32
|
||||
|
|
@ -618,6 +775,8 @@ Global
|
|||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Embedded_Debug.Build.0 = Debug|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Embedded_Pro.ActiveCfg = TLS|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Embedded_Pro.Build.0 = TLS|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Embedded_ProGPL.ActiveCfg = TLS|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Embedded_ProGPL.Build.0 = TLS|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Embedded_Release.ActiveCfg = TLS|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Embedded_Release.Build.0 = TLS|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Max.ActiveCfg = Release|Win32
|
||||
|
|
@ -630,6 +789,10 @@ Global
|
|||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.pro.Build.0 = Release|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.pro nt.ActiveCfg = Release|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.pro nt.Build.0 = Release|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.pro gpl.ActiveCfg = Release|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.pro gpl.Build.0 = Release|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.pro gpl nt.Build.0 = Release|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Release.ActiveCfg = Release|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Release.Build.0 = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CC}.classic.ActiveCfg = classic|Win32
|
||||
|
|
@ -641,6 +804,7 @@ Global
|
|||
{EF833A1E-E358-4B6C-9C27-9489E85041CC}.Embedded_Classic.ActiveCfg = classic|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CC}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CC}.Embedded_Pro.ActiveCfg = classic|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CC}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CC}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CC}.Max.ActiveCfg = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CC}.Max.Build.0 = Release|Win32
|
||||
|
|
@ -652,8 +816,39 @@ Global
|
|||
{EF833A1E-E358-4B6C-9C27-9489E85041CC}.pro.Build.0 = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CC}.pro nt.ActiveCfg = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CC}.pro nt.Build.0 = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CC}.pro gpl.ActiveCfg = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CC}.pro gpl.Build.0 = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CC}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CC}.pro gpl nt.Build.0 = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CC}.Release.ActiveCfg = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CC}.Release.Build.0 = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CD}.classic.ActiveCfg = classic|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CD}.classic.Build.0 = classic|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CD}.classic nt.ActiveCfg = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CD}.classic nt.Build.0 = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CD}.Debug.ActiveCfg = Debug|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CD}.Debug.Build.0 = Debug|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CD}.Embedded_Classic.ActiveCfg = classic|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CD}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CD}.Embedded_Pro.ActiveCfg = classic|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CD}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CD}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CD}.Max.ActiveCfg = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CD}.Max.Build.0 = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CD}.Max nt.ActiveCfg = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CD}.Max nt.Build.0 = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CD}.nt.ActiveCfg = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CD}.nt.Build.0 = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CD}.pro.ActiveCfg = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CD}.pro.Build.0 = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CD}.pro nt.ActiveCfg = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CD}.pro nt.Build.0 = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CD}.pro gpl.ActiveCfg = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CD}.pro gpl.Build.0 = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CD}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CD}.pro gpl nt.Build.0 = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CD}.Release.ActiveCfg = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CD}.Release.Build.0 = Release|Win32
|
||||
{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.classic.ActiveCfg = classic|Win32
|
||||
{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.classic.Build.0 = classic|Win32
|
||||
{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.classic nt.ActiveCfg = Release|Win32
|
||||
|
|
@ -662,7 +857,8 @@ Global
|
|||
{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.Debug.Build.0 = Debug|Win32
|
||||
{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.Embedded_Classic.ActiveCfg = Debug|Win32
|
||||
{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.Embedded_Pro.ActiveCfg = Debug|Win32
|
||||
{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.Max.ActiveCfg = Release|Win32
|
||||
{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.Max.Build.0 = Release|Win32
|
||||
|
|
@ -674,6 +870,10 @@ Global
|
|||
{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.pro.Build.0 = Release|Win32
|
||||
{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.pro nt.ActiveCfg = Release|Win32
|
||||
{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.pro nt.Build.0 = Release|Win32
|
||||
{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.pro gpl.ActiveCfg = Release|Win32
|
||||
{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.pro gpl.Build.0 = Release|Win32
|
||||
{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.pro gpl nt.Build.0 = Release|Win32
|
||||
{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.Release.ActiveCfg = Release|Win32
|
||||
{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.Release.Build.0 = Release|Win32
|
||||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.classic.ActiveCfg = classic|Win32
|
||||
|
|
@ -684,7 +884,8 @@ Global
|
|||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.Debug.Build.0 = Debug|Win32
|
||||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.Embedded_Classic.ActiveCfg = Debug|Win32
|
||||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.Embedded_Pro.ActiveCfg = Debug|Win32
|
||||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.Max.ActiveCfg = Release|Win32
|
||||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.Max.Build.0 = Release|Win32
|
||||
|
|
@ -696,6 +897,10 @@ Global
|
|||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.pro.Build.0 = Release|Win32
|
||||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.pro nt.ActiveCfg = Release|Win32
|
||||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.pro nt.Build.0 = Release|Win32
|
||||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.pro gpl.ActiveCfg = Release|Win32
|
||||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.pro gpl.Build.0 = Release|Win32
|
||||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.pro gpl nt.Build.0 = Release|Win32
|
||||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.Release.ActiveCfg = Release|Win32
|
||||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.Release.Build.0 = Release|Win32
|
||||
{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.classic.ActiveCfg = classic|Win32
|
||||
|
|
@ -707,6 +912,7 @@ Global
|
|||
{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.Embedded_Classic.ActiveCfg = Release|Win32
|
||||
{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.Max.ActiveCfg = Release|Win32
|
||||
{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.Max.Build.0 = Release|Win32
|
||||
|
|
@ -718,6 +924,10 @@ Global
|
|||
{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.pro.Build.0 = Release|Win32
|
||||
{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.pro nt.ActiveCfg = Release|Win32
|
||||
{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.pro nt.Build.0 = Release|Win32
|
||||
{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.pro gpl.ActiveCfg = Release|Win32
|
||||
{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.pro gpl.Build.0 = Release|Win32
|
||||
{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.pro gpl nt.Build.0 = Release|Win32
|
||||
{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.Release.ActiveCfg = Release|Win32
|
||||
{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.Release.Build.0 = Release|Win32
|
||||
{67154F28-D076-419E-B149-819EF548E670}.classic.ActiveCfg = classic|Win32
|
||||
|
|
@ -728,7 +938,8 @@ Global
|
|||
{67154F28-D076-419E-B149-819EF548E670}.Debug.Build.0 = Debug|Win32
|
||||
{67154F28-D076-419E-B149-819EF548E670}.Embedded_Classic.ActiveCfg = Debug|Win32
|
||||
{67154F28-D076-419E-B149-819EF548E670}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{67154F28-D076-419E-B149-819EF548E670}.Embedded_Pro.ActiveCfg = Debug|Win32
|
||||
{67154F28-D076-419E-B149-819EF548E670}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{67154F28-D076-419E-B149-819EF548E670}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{67154F28-D076-419E-B149-819EF548E670}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{67154F28-D076-419E-B149-819EF548E670}.Max.ActiveCfg = Release|Win32
|
||||
{67154F28-D076-419E-B149-819EF548E670}.Max.Build.0 = Release|Win32
|
||||
|
|
@ -740,6 +951,10 @@ Global
|
|||
{67154F28-D076-419E-B149-819EF548E670}.pro.Build.0 = Release|Win32
|
||||
{67154F28-D076-419E-B149-819EF548E670}.pro nt.ActiveCfg = Release|Win32
|
||||
{67154F28-D076-419E-B149-819EF548E670}.pro nt.Build.0 = Release|Win32
|
||||
{67154F28-D076-419E-B149-819EF548E670}.pro gpl.ActiveCfg = Release|Win32
|
||||
{67154F28-D076-419E-B149-819EF548E670}.pro gpl.Build.0 = Release|Win32
|
||||
{67154F28-D076-419E-B149-819EF548E670}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{67154F28-D076-419E-B149-819EF548E670}.pro gpl nt.Build.0 = Release|Win32
|
||||
{67154F28-D076-419E-B149-819EF548E670}.Release.ActiveCfg = Release|Win32
|
||||
{67154F28-D076-419E-B149-819EF548E670}.Release.Build.0 = Release|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.classic.ActiveCfg = Release|Win32
|
||||
|
|
@ -750,7 +965,8 @@ Global
|
|||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.Debug.Build.0 = Debug|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.Embedded_Classic.ActiveCfg = Debug|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.Embedded_Pro.ActiveCfg = Debug|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.Max.ActiveCfg = Release|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.Max.Build.0 = Release|Win32
|
||||
|
|
@ -762,6 +978,10 @@ Global
|
|||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.pro.Build.0 = Release|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.pro nt.ActiveCfg = Release|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.pro nt.Build.0 = Release|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.pro gpl.ActiveCfg = Release|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.pro gpl.Build.0 = Release|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.pro gpl nt.Build.0 = Release|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.Release.ActiveCfg = Release|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.Release.Build.0 = Release|Win32
|
||||
{62E85884-3ACF-4F4C-873B-60B878147890}.classic.ActiveCfg = classic|Win32
|
||||
|
|
@ -773,6 +993,7 @@ Global
|
|||
{62E85884-3ACF-4F4C-873B-60B878147890}.Embedded_Classic.ActiveCfg = Release|Win32
|
||||
{62E85884-3ACF-4F4C-873B-60B878147890}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{62E85884-3ACF-4F4C-873B-60B878147890}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{62E85884-3ACF-4F4C-873B-60B878147890}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{62E85884-3ACF-4F4C-873B-60B878147890}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{62E85884-3ACF-4F4C-873B-60B878147890}.Max.ActiveCfg = Max|Win32
|
||||
{62E85884-3ACF-4F4C-873B-60B878147890}.Max.Build.0 = Max|Win32
|
||||
|
|
@ -784,6 +1005,10 @@ Global
|
|||
{62E85884-3ACF-4F4C-873B-60B878147890}.pro.Build.0 = pro|Win32
|
||||
{62E85884-3ACF-4F4C-873B-60B878147890}.pro nt.ActiveCfg = pro nt|Win32
|
||||
{62E85884-3ACF-4F4C-873B-60B878147890}.pro nt.Build.0 = pro nt|Win32
|
||||
{62E85884-3ACF-4F4C-873B-60B878147890}.pro gpl.ActiveCfg = Release|Win32
|
||||
{62E85884-3ACF-4F4C-873B-60B878147890}.pro gpl.Build.0 = Release|Win32
|
||||
{62E85884-3ACF-4F4C-873B-60B878147890}.pro gpl nt.ActiveCfg = nt|Win32
|
||||
{62E85884-3ACF-4F4C-873B-60B878147890}.pro gpl nt.Build.0 = nt|Win32
|
||||
{62E85884-3ACF-4F4C-873B-60B878147890}.Release.ActiveCfg = Release|Win32
|
||||
{62E85884-3ACF-4F4C-873B-60B878147890}.Release.Build.0 = Release|Win32
|
||||
{37D9BA79-302E-4582-A545-CB5FF7982EA3}.classic.ActiveCfg = classic|Win32
|
||||
|
|
@ -795,6 +1020,7 @@ Global
|
|||
{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Embedded_Classic.ActiveCfg = Release|Win32
|
||||
{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Max.ActiveCfg = Release|Win32
|
||||
{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Max.Build.0 = Release|Win32
|
||||
|
|
@ -806,6 +1032,10 @@ Global
|
|||
{37D9BA79-302E-4582-A545-CB5FF7982EA3}.pro.Build.0 = pro|Win32
|
||||
{37D9BA79-302E-4582-A545-CB5FF7982EA3}.pro nt.ActiveCfg = pro|Win32
|
||||
{37D9BA79-302E-4582-A545-CB5FF7982EA3}.pro nt.Build.0 = pro|Win32
|
||||
{37D9BA79-302E-4582-A545-CB5FF7982EA3}.pro gpl.ActiveCfg = Release|Win32
|
||||
{37D9BA79-302E-4582-A545-CB5FF7982EA3}.pro gpl.Build.0 = Release|Win32
|
||||
{37D9BA79-302E-4582-A545-CB5FF7982EA3}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{37D9BA79-302E-4582-A545-CB5FF7982EA3}.pro gpl nt.Build.0 = Release|Win32
|
||||
{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Release.ActiveCfg = Release|Win32
|
||||
{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Release.Build.0 = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.classic.ActiveCfg = classic|Win32
|
||||
|
|
@ -817,6 +1047,7 @@ Global
|
|||
{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.Embedded_Classic.ActiveCfg = classic|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.Embedded_Pro.ActiveCfg = classic|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.Max.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.Max.Build.0 = Release|Win32
|
||||
|
|
@ -828,8 +1059,66 @@ Global
|
|||
{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.pro.Build.0 = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.pro nt.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.pro nt.Build.0 = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.pro gpl.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.pro gpl.Build.0 = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.pro gpl nt.Build.0 = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.Release.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.Release.Build.0 = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92C}.classic.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92C}.classic.Build.0 = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92C}.classic nt.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92C}.classic nt.Build.0 = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92C}.Debug.ActiveCfg = Debug|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92C}.Debug.Build.0 = Debug|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92C}.Embedded_Classic.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92C}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92C}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92C}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92C}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92C}.Max.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92C}.Max.Build.0 = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92C}.Max nt.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92C}.Max nt.Build.0 = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92C}.nt.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92C}.nt.Build.0 = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92C}.pro.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92C}.pro.Build.0 = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92C}.pro nt.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92C}.pro nt.Build.0 = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92C}.pro gpl.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92C}.pro gpl.Build.0 = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92C}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92C}.pro gpl nt.Build.0 = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92C}.Release.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92C}.Release.Build.0 = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92D}.classic.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92D}.classic.Build.0 = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92D}.classic nt.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92D}.classic nt.Build.0 = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92D}.Debug.ActiveCfg = Debug|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92D}.Debug.Build.0 = Debug|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92D}.Embedded_Classic.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92D}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92D}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92D}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92D}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92D}.Max.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92D}.Max.Build.0 = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92D}.Max nt.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92D}.Max nt.Build.0 = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92D}.nt.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92D}.nt.Build.0 = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92D}.pro.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92D}.pro.Build.0 = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92D}.pro nt.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92D}.pro nt.Build.0 = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92D}.pro gpl.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92D}.pro gpl.Build.0 = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92D}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92D}.pro gpl nt.Build.0 = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92D}.Release.ActiveCfg = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92D}.Release.Build.0 = Release|Win32
|
||||
{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.classic.ActiveCfg = classic|Win32
|
||||
{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.classic.Build.0 = classic|Win32
|
||||
{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.classic nt.ActiveCfg = classic|Win32
|
||||
|
|
@ -839,6 +1128,7 @@ Global
|
|||
{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.Embedded_Classic.ActiveCfg = classic|Win32
|
||||
{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.Embedded_Pro.ActiveCfg = classic|Win32
|
||||
{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.Max.ActiveCfg = Release|Win32
|
||||
{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.Max.Build.0 = Release|Win32
|
||||
|
|
@ -850,6 +1140,10 @@ Global
|
|||
{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.pro.Build.0 = Release|Win32
|
||||
{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.pro nt.ActiveCfg = Release|Win32
|
||||
{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.pro nt.Build.0 = Release|Win32
|
||||
{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.pro gpl.ActiveCfg = Release|Win32
|
||||
{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.pro gpl.Build.0 = Release|Win32
|
||||
{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.pro gpl nt.Build.0 = Release|Win32
|
||||
{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.Release.ActiveCfg = Release|Win32
|
||||
{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.Release.Build.0 = Release|Win32
|
||||
{94B86159-C581-42CD-825D-C69CBC237E5C}.classic.ActiveCfg = Release|Win32
|
||||
|
|
@ -861,6 +1155,7 @@ Global
|
|||
{94B86159-C581-42CD-825D-C69CBC237E5C}.Embedded_Classic.ActiveCfg = Release|Win32
|
||||
{94B86159-C581-42CD-825D-C69CBC237E5C}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{94B86159-C581-42CD-825D-C69CBC237E5C}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{94B86159-C581-42CD-825D-C69CBC237E5C}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{94B86159-C581-42CD-825D-C69CBC237E5C}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{94B86159-C581-42CD-825D-C69CBC237E5C}.Max.ActiveCfg = Release|Win32
|
||||
{94B86159-C581-42CD-825D-C69CBC237E5C}.Max.Build.0 = Release|Win32
|
||||
|
|
@ -872,6 +1167,10 @@ Global
|
|||
{94B86159-C581-42CD-825D-C69CBC237E5C}.pro.Build.0 = Release|Win32
|
||||
{94B86159-C581-42CD-825D-C69CBC237E5C}.pro nt.ActiveCfg = Release|Win32
|
||||
{94B86159-C581-42CD-825D-C69CBC237E5C}.pro nt.Build.0 = Release|Win32
|
||||
{94B86159-C581-42CD-825D-C69CBC237E5C}.pro gpl.ActiveCfg = Release|Win32
|
||||
{94B86159-C581-42CD-825D-C69CBC237E5C}.pro gpl.Build.0 = Release|Win32
|
||||
{94B86159-C581-42CD-825D-C69CBC237E5C}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{94B86159-C581-42CD-825D-C69CBC237E5C}.pro gpl nt.Build.0 = Release|Win32
|
||||
{94B86159-C581-42CD-825D-C69CBC237E5C}.Release.ActiveCfg = Release|Win32
|
||||
{94B86159-C581-42CD-825D-C69CBC237E5C}.Release.Build.0 = Release|Win32
|
||||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.classic.ActiveCfg = classic|Win32
|
||||
|
|
@ -882,7 +1181,8 @@ Global
|
|||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.Debug.Build.0 = Debug|Win32
|
||||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.Embedded_Classic.ActiveCfg = Debug|Win32
|
||||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.Embedded_Pro.ActiveCfg = Debug|Win32
|
||||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.Max.ActiveCfg = Release|Win32
|
||||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.Max.Build.0 = Release|Win32
|
||||
|
|
@ -894,6 +1194,10 @@ Global
|
|||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.pro.Build.0 = Release|Win32
|
||||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.pro nt.ActiveCfg = Release|Win32
|
||||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.pro nt.Build.0 = Release|Win32
|
||||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.pro gpl.ActiveCfg = Release|Win32
|
||||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.pro gpl.Build.0 = Release|Win32
|
||||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.pro gpl nt.Build.0 = Release|Win32
|
||||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.Release.ActiveCfg = Release|Win32
|
||||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.Release.Build.0 = Release|Win32
|
||||
{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.classic.ActiveCfg = Release|Win32
|
||||
|
|
@ -960,6 +1264,8 @@ Global
|
|||
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Embedded_Debug.Build.0 = TLS_DEBUG|Win32
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Embedded_Pro.ActiveCfg = TLS|Win32
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Embedded_Pro.Build.0 = TLS|Win32
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Embedded_ProGPL.ActiveCfg = TLS|Win32
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Embedded_ProGPL.Build.0 = TLS|Win32
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Embedded_Release.ActiveCfg = TLS|Win32
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Embedded_Release.Build.0 = TLS|Win32
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Max.ActiveCfg = Max|Win32
|
||||
|
|
@ -972,6 +1278,10 @@ Global
|
|||
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro.Build.0 = Release|Win32
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro nt.ActiveCfg = Release|Win32
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro nt.Build.0 = Release|Win32
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro gpl.ActiveCfg = Release|Win32
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro gpl.Build.0 = Release|Win32
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro gpl nt.Build.0 = Release|Win32
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Release.ActiveCfg = Release|Win32
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Release.Build.0 = Release|Win32
|
||||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.classic.ActiveCfg = classic|Win32
|
||||
|
|
@ -982,7 +1292,8 @@ Global
|
|||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.Debug.Build.0 = Debug|Win32
|
||||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.Embedded_Classic.ActiveCfg = Debug|Win32
|
||||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.Embedded_Pro.ActiveCfg = Debug|Win32
|
||||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.Max.ActiveCfg = Release|Win32
|
||||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.Max.Build.0 = Release|Win32
|
||||
|
|
@ -994,6 +1305,10 @@ Global
|
|||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.pro.Build.0 = Release|Win32
|
||||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.pro nt.ActiveCfg = Release|Win32
|
||||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.pro nt.Build.0 = Release|Win32
|
||||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.pro gpl.ActiveCfg = Release|Win32
|
||||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.pro gpl.Build.0 = Release|Win32
|
||||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.pro gpl nt.Build.0 = Release|Win32
|
||||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.Release.ActiveCfg = Release|Win32
|
||||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.Release.Build.0 = Release|Win32
|
||||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.classic.ActiveCfg = Release|Win32
|
||||
|
|
@ -1008,6 +1323,8 @@ Global
|
|||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.Embedded_Debug.Build.0 = Debug|Win32
|
||||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.Embedded_Pro.Build.0 = Release|Win32
|
||||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.Embedded_ProGPL.Build.0 = Release|Win32
|
||||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.Embedded_Release.Build.0 = Release|Win32
|
||||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.Max.ActiveCfg = Release|Win32
|
||||
|
|
@ -1020,6 +1337,10 @@ Global
|
|||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.pro.Build.0 = Release|Win32
|
||||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.pro nt.ActiveCfg = Release|Win32
|
||||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.pro nt.Build.0 = Release|Win32
|
||||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.pro gpl.ActiveCfg = Release|Win32
|
||||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.pro gpl.Build.0 = Release|Win32
|
||||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.pro gpl nt.Build.0 = Release|Win32
|
||||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.Release.ActiveCfg = Release|Win32
|
||||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.Release.Build.0 = Release|Win32
|
||||
{16699B52-ECC6-4A96-A99F-A043059BA2E7}.classic.ActiveCfg = classic|Win32
|
||||
|
|
@ -1031,6 +1352,7 @@ Global
|
|||
{16699B52-ECC6-4A96-A99F-A043059BA2E7}.Embedded_Classic.ActiveCfg = classic|Win32
|
||||
{16699B52-ECC6-4A96-A99F-A043059BA2E7}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{16699B52-ECC6-4A96-A99F-A043059BA2E7}.Embedded_Pro.ActiveCfg = classic|Win32
|
||||
{16699B52-ECC6-4A96-A99F-A043059BA2E7}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{16699B52-ECC6-4A96-A99F-A043059BA2E7}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{16699B52-ECC6-4A96-A99F-A043059BA2E7}.Max.ActiveCfg = Release|Win32
|
||||
{16699B52-ECC6-4A96-A99F-A043059BA2E7}.Max.Build.0 = Release|Win32
|
||||
|
|
@ -1042,6 +1364,10 @@ Global
|
|||
{16699B52-ECC6-4A96-A99F-A043059BA2E7}.pro.Build.0 = Release|Win32
|
||||
{16699B52-ECC6-4A96-A99F-A043059BA2E7}.pro nt.ActiveCfg = Release|Win32
|
||||
{16699B52-ECC6-4A96-A99F-A043059BA2E7}.pro nt.Build.0 = Release|Win32
|
||||
{16699B52-ECC6-4A96-A99F-A043059BA2E7}.pro gpl.ActiveCfg = Release|Win32
|
||||
{16699B52-ECC6-4A96-A99F-A043059BA2E7}.pro gpl.Build.0 = Release|Win32
|
||||
{16699B52-ECC6-4A96-A99F-A043059BA2E7}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{16699B52-ECC6-4A96-A99F-A043059BA2E7}.pro gpl nt.Build.0 = Release|Win32
|
||||
{16699B52-ECC6-4A96-A99F-A043059BA2E7}.Release.ActiveCfg = Release|Win32
|
||||
{16699B52-ECC6-4A96-A99F-A043059BA2E7}.Release.Build.0 = Release|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.classic.ActiveCfg = Release|Win32
|
||||
|
|
@ -1056,6 +1382,8 @@ Global
|
|||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.Embedded_Debug.Build.0 = Debug|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.Embedded_Pro.Build.0 = Release|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.Embedded_ProGPL.Build.0 = Release|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.Embedded_Release.Build.0 = Release|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.Max.ActiveCfg = Release|Win32
|
||||
|
|
@ -1068,22 +1396,31 @@ Global
|
|||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.pro.Build.0 = Release|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.pro nt.ActiveCfg = Release|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.pro nt.Build.0 = Release|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.pro gpl.ActiveCfg = Release|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.pro gpl.Build.0 = Release|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.pro gpl nt.Build.0 = Release|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.Release.ActiveCfg = Release|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.Release.Build.0 = Release|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.classic.ActiveCfg = Release|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.classic.Build.0 = Release|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.classic nt.ActiveCfg = Debug|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.classic nt.ActiveCfg = Release|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.Debug.ActiveCfg = Debug|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.Debug.Build.0 = Debug|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.Embedded_Classic.ActiveCfg = Debug|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.Embedded_Pro.ActiveCfg = Debug|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.Max.ActiveCfg = Release|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.Max nt.ActiveCfg = Debug|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.nt.ActiveCfg = Debug|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.pro.ActiveCfg = Debug|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.pro nt.ActiveCfg = Debug|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.Max nt.ActiveCfg = Release|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.nt.ActiveCfg = Release|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.pro.ActiveCfg = Release|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.pro nt.ActiveCfg = Release|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.pro gpl.ActiveCfg = Release|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.pro gpl.Build.0 = Release|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.pro gpl nt.Build.0 = Release|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.Release.ActiveCfg = Release|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.Release.Build.0 = Release|Win32
|
||||
{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.classic.ActiveCfg = Release|Win32
|
||||
|
|
@ -1092,12 +1429,15 @@ Global
|
|||
{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.Embedded_Classic.ActiveCfg = Release|Win32
|
||||
{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.Embedded_Debug.ActiveCfg = Release|Win32
|
||||
{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.Max.ActiveCfg = Release|Win32
|
||||
{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.Max nt.ActiveCfg = Release|Win32
|
||||
{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.nt.ActiveCfg = Release|Win32
|
||||
{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.pro.ActiveCfg = Release|Win32
|
||||
{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.pro nt.ActiveCfg = Release|Win32
|
||||
{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.pro gpl.ActiveCfg = Release|Win32
|
||||
{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.Release.ActiveCfg = Release|Win32
|
||||
{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.classic.ActiveCfg = Release|Win32
|
||||
{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.classic.Build.0 = Release|Win32
|
||||
|
|
@ -1108,6 +1448,7 @@ Global
|
|||
{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.Embedded_Classic.ActiveCfg = Release|Win32
|
||||
{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.Max.ActiveCfg = Release|Win32
|
||||
{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.Max.Build.0 = Release|Win32
|
||||
|
|
@ -1119,6 +1460,10 @@ Global
|
|||
{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.pro.Build.0 = Release|Win32
|
||||
{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.pro nt.ActiveCfg = Release|Win32
|
||||
{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.pro nt.Build.0 = Release|Win32
|
||||
{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.pro gpl.ActiveCfg = Release|Win32
|
||||
{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.pro gpl.Build.0 = Release|Win32
|
||||
{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.pro gpl nt.Build.0 = Release|Win32
|
||||
{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.Release.ActiveCfg = Release|Win32
|
||||
{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.Release.Build.0 = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.classic.ActiveCfg = Release|Win32
|
||||
|
|
@ -1133,6 +1478,8 @@ Global
|
|||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.Embedded_Debug.Build.0 = Debug|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.Embedded_Pro.Build.0 = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.Embedded_ProGPL.Build.0 = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.Embedded_Release.Build.0 = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.Max.ActiveCfg = Release|Win32
|
||||
|
|
@ -1145,6 +1492,10 @@ Global
|
|||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.pro.Build.0 = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.pro nt.ActiveCfg = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.pro nt.Build.0 = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.pro gpl.ActiveCfg = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.pro gpl.Build.0 = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.pro gpl nt.Build.0 = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.Release.ActiveCfg = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.Release.Build.0 = Release|Win32
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.classic.ActiveCfg = Release|Win32
|
||||
|
|
@ -1159,6 +1510,8 @@ Global
|
|||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.Embedded_Debug.Build.0 = Debug|Win32
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.Embedded_Pro.Build.0 = Release|Win32
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.Embedded_ProGPL.Build.0 = Release|Win32
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.Embedded_Release.Build.0 = Release|Win32
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.Max.ActiveCfg = Release|Win32
|
||||
|
|
@ -1171,6 +1524,10 @@ Global
|
|||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.pro.Build.0 = Release|Win32
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.pro nt.ActiveCfg = Release|Win32
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.pro nt.Build.0 = Release|Win32
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.pro gpl.ActiveCfg = Release|Win32
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.pro gpl.Build.0 = Release|Win32
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.pro gpl nt.Build.0 = Release|Win32
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.Release.ActiveCfg = Release|Win32
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.Release.Build.0 = Release|Win32
|
||||
{8961F149-C68A-4154-A499-A2AB39E607E8}.classic.ActiveCfg = classic|Win32
|
||||
|
|
@ -1181,7 +1538,8 @@ Global
|
|||
{8961F149-C68A-4154-A499-A2AB39E607E8}.Debug.Build.0 = Debug|Win32
|
||||
{8961F149-C68A-4154-A499-A2AB39E607E8}.Embedded_Classic.ActiveCfg = Debug|Win32
|
||||
{8961F149-C68A-4154-A499-A2AB39E607E8}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{8961F149-C68A-4154-A499-A2AB39E607E8}.Embedded_Pro.ActiveCfg = Debug|Win32
|
||||
{8961F149-C68A-4154-A499-A2AB39E607E8}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{8961F149-C68A-4154-A499-A2AB39E607E8}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{8961F149-C68A-4154-A499-A2AB39E607E8}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{8961F149-C68A-4154-A499-A2AB39E607E8}.Max.ActiveCfg = Release|Win32
|
||||
{8961F149-C68A-4154-A499-A2AB39E607E8}.Max.Build.0 = Release|Win32
|
||||
|
|
@ -1193,6 +1551,10 @@ Global
|
|||
{8961F149-C68A-4154-A499-A2AB39E607E8}.pro.Build.0 = Release|Win32
|
||||
{8961F149-C68A-4154-A499-A2AB39E607E8}.pro nt.ActiveCfg = Release|Win32
|
||||
{8961F149-C68A-4154-A499-A2AB39E607E8}.pro nt.Build.0 = Release|Win32
|
||||
{8961F149-C68A-4154-A499-A2AB39E607E8}.pro gpl.ActiveCfg = Release|Win32
|
||||
{8961F149-C68A-4154-A499-A2AB39E607E8}.pro gpl.Build.0 = Release|Win32
|
||||
{8961F149-C68A-4154-A499-A2AB39E607E8}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{8961F149-C68A-4154-A499-A2AB39E607E8}.pro gpl nt.Build.0 = Release|Win32
|
||||
{8961F149-C68A-4154-A499-A2AB39E607E8}.Release.ActiveCfg = Release|Win32
|
||||
{8961F149-C68A-4154-A499-A2AB39E607E8}.Release.Build.0 = Release|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.classic.ActiveCfg = Release|Win32
|
||||
|
|
@ -1201,9 +1563,10 @@ Global
|
|||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.classic nt.Build.0 = Release|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.Debug.ActiveCfg = Debug|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.Debug.Build.0 = Debug|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.Embedded_Classic.ActiveCfg = Debug|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.Embedded_Classic.ActiveCfg = Release|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.Embedded_Pro.ActiveCfg = Debug|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.Max.ActiveCfg = Release|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.Max.Build.0 = Release|Win32
|
||||
|
|
@ -1214,6 +1577,10 @@ Global
|
|||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.pro.Build.0 = Release|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.pro nt.ActiveCfg = Release|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.pro nt.Build.0 = Release|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.pro gpl.ActiveCfg = Release|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.pro gpl.Build.0 = Release|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.pro gpl nt.Build.0 = Release|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.Release.ActiveCfg = Release|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.Release.Build.0 = Release|Win32
|
||||
{6189F838-21C6-42A1-B2D0-9146316573F7}.classic.ActiveCfg = Release|Win32
|
||||
|
|
@ -1225,6 +1592,7 @@ Global
|
|||
{6189F838-21C6-42A1-B2D0-9146316573F7}.Embedded_Classic.ActiveCfg = Release|Win32
|
||||
{6189F838-21C6-42A1-B2D0-9146316573F7}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{6189F838-21C6-42A1-B2D0-9146316573F7}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{6189F838-21C6-42A1-B2D0-9146316573F7}.Embedded_ProGPL.ActiveCfg = Release|Win32
|
||||
{6189F838-21C6-42A1-B2D0-9146316573F7}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{6189F838-21C6-42A1-B2D0-9146316573F7}.Max.ActiveCfg = Release|Win32
|
||||
{6189F838-21C6-42A1-B2D0-9146316573F7}.Max.Build.0 = Release|Win32
|
||||
|
|
@ -1236,6 +1604,10 @@ Global
|
|||
{6189F838-21C6-42A1-B2D0-9146316573F7}.pro.Build.0 = Release|Win32
|
||||
{6189F838-21C6-42A1-B2D0-9146316573F7}.pro nt.ActiveCfg = Release|Win32
|
||||
{6189F838-21C6-42A1-B2D0-9146316573F7}.pro nt.Build.0 = Release|Win32
|
||||
{6189F838-21C6-42A1-B2D0-9146316573F7}.pro gpl.ActiveCfg = Release|Win32
|
||||
{6189F838-21C6-42A1-B2D0-9146316573F7}.pro gpl.Build.0 = Release|Win32
|
||||
{6189F838-21C6-42A1-B2D0-9146316573F7}.pro gpl nt.ActiveCfg = Release|Win32
|
||||
{6189F838-21C6-42A1-B2D0-9146316573F7}.pro gpl nt.Build.0 = Release|Win32
|
||||
{6189F838-21C6-42A1-B2D0-9146316573F7}.Release.ActiveCfg = Release|Win32
|
||||
{6189F838-21C6-42A1-B2D0-9146316573F7}.Release.Build.0 = Release|Win32
|
||||
{6D524B3E-210A-4FCD-8D41-FEC0D21E83AC}.classic.ActiveCfg = Release|Win32
|
||||
|
|
|
|||
162
VC++Files/mysqlshutdown/mysqlshutdown.vcproj
Normal file
162
VC++Files/mysqlshutdown/mysqlshutdown.vcproj
Normal file
|
|
@ -0,0 +1,162 @@
|
|||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="7.10"
|
||||
Name="mysqlshutdown"
|
||||
SccProjectName=""
|
||||
SccLocalPath="">
|
||||
<Platforms>
|
||||
<Platform
|
||||
Name="Win32"/>
|
||||
</Platforms>
|
||||
<Configurations>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
OutputDirectory=".\debug"
|
||||
IntermediateDirectory=".\debug"
|
||||
ConfigurationType="1"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="FALSE"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
OptimizeForProcessor="2"
|
||||
AdditionalIncludeDirectories="../include,../"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS"
|
||||
RuntimeLibrary="1"
|
||||
PrecompiledHeaderFile=".\debug/mysqlshutdown.pch"
|
||||
AssemblerListingLocation=".\debug/"
|
||||
ObjectFile=".\debug/"
|
||||
ProgramDataBaseFileName=".\debug/"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="TRUE"
|
||||
DebugInformationFormat="1"
|
||||
CompileAs="0"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
|
||||
OutputFile="../client_debug/mysqlshutdown.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories=""
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile=".\debug/mysqlshutdown.pdb"
|
||||
SubSystem="2"
|
||||
TargetMachine="1"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
TypeLibraryName=".\debug/mysqlshutdown.tlb"
|
||||
HeaderFileName=""/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
Culture="1033"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory=".\release"
|
||||
IntermediateDirectory=".\release"
|
||||
ConfigurationType="1"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="FALSE"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
OptimizeForProcessor="2"
|
||||
AdditionalIncludeDirectories="../include,../"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="TRUE"
|
||||
PrecompiledHeaderFile=".\release/mysqlshutdown.pch"
|
||||
AssemblerListingLocation=".\release/"
|
||||
ObjectFile=".\release/"
|
||||
ProgramDataBaseFileName=".\release/"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="TRUE"
|
||||
CompileAs="0"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
|
||||
OutputFile="../client_release/mysqlshutdown.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories=""
|
||||
ProgramDatabaseFile=".\release/mysqlshutdown.pdb"
|
||||
SubSystem="2"
|
||||
TargetMachine="1"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
TypeLibraryName=".\release/mysqlshutdown.tlb"
|
||||
HeaderFileName=""/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
Culture="1033"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
<Files>
|
||||
<File
|
||||
RelativePath="mysqlshutdown.c">
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
</Files>
|
||||
<Globals>
|
||||
</Globals>
|
||||
</VisualStudioProject>
|
||||
93
VC++Files/mysqlwatch/mysqlwatch.vcproj
Normal file
93
VC++Files/mysqlwatch/mysqlwatch.vcproj
Normal file
|
|
@ -0,0 +1,93 @@
|
|||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="7.10"
|
||||
Name="mysqlwatch"
|
||||
SccProjectName=""
|
||||
SccLocalPath="">
|
||||
<Platforms>
|
||||
<Platform
|
||||
Name="Win32"/>
|
||||
</Platforms>
|
||||
<Configurations>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory=".\release"
|
||||
IntermediateDirectory=".\release"
|
||||
ConfigurationType="1"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="FALSE"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
OptimizeForProcessor="2"
|
||||
AdditionalIncludeDirectories="../include,../"
|
||||
PreprocessorDefinitions="DBUG_OFF;_CONSOLE;_WINDOWS;NDEBUG"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="TRUE"
|
||||
PrecompiledHeaderFile=".\release/mysqlwatch.pch"
|
||||
AssemblerListingLocation=".\release/"
|
||||
ObjectFile=".\release/"
|
||||
ProgramDataBaseFileName=".\release/"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="TRUE"
|
||||
CompileAs="0"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
|
||||
OutputFile="../client_release/mysqlwatch.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories=""
|
||||
ProgramDatabaseFile=".\release/mysqlwatch.pdb"
|
||||
SubSystem="1"
|
||||
TargetMachine="1"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
TypeLibraryName=".\release/mysqlwatch.tlb"
|
||||
HeaderFileName=""/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
Culture="1033"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
<Files>
|
||||
<File
|
||||
RelativePath="mysqlwatch.c">
|
||||
<FileConfiguration
|
||||
Name="Release|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
</Files>
|
||||
<Globals>
|
||||
</Globals>
|
||||
</VisualStudioProject>
|
||||
244
VC++Files/pack_isam/pack_isam.vcproj
Normal file
244
VC++Files/pack_isam/pack_isam.vcproj
Normal file
|
|
@ -0,0 +1,244 @@
|
|||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="7.10"
|
||||
Name="pack_isam"
|
||||
SccProjectName=""
|
||||
SccLocalPath="">
|
||||
<Platforms>
|
||||
<Platform
|
||||
Name="Win32"/>
|
||||
</Platforms>
|
||||
<Configurations>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
OutputDirectory=".\debug"
|
||||
IntermediateDirectory=".\debug"
|
||||
ConfigurationType="1"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="FALSE"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
OptimizeForProcessor="2"
|
||||
AdditionalIncludeDirectories="../include,../isam"
|
||||
PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS"
|
||||
RuntimeLibrary="1"
|
||||
PrecompiledHeaderFile=".\debug/pack_isam.pch"
|
||||
AssemblerListingLocation=".\debug/"
|
||||
ObjectFile=".\debug/"
|
||||
ProgramDataBaseFileName=".\debug/"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="TRUE"
|
||||
DebugInformationFormat="1"
|
||||
CompileAs="0"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib setargv.obj"
|
||||
OutputFile="../client_debug/pack_isam.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile=".\debug/pack_isam.pdb"
|
||||
SubSystem="1"
|
||||
TargetMachine="1"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
TypeLibraryName=".\debug/pack_isam.tlb"
|
||||
HeaderFileName=""/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
Culture="1033"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory=".\release"
|
||||
IntermediateDirectory=".\release"
|
||||
ConfigurationType="1"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="FALSE"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
OptimizeForProcessor="2"
|
||||
AdditionalIncludeDirectories="../include,../isam"
|
||||
PreprocessorDefinitions="NDEBUG;DBUG_OFF;_CONSOLE;_WINDOWS"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="TRUE"
|
||||
PrecompiledHeaderFile=".\release/pack_isam.pch"
|
||||
AssemblerListingLocation=".\release/"
|
||||
ObjectFile=".\release/"
|
||||
ProgramDataBaseFileName=".\release/"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="TRUE"
|
||||
CompileAs="0"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="wsock32.lib setargv.obj"
|
||||
OutputFile="../client_release/pack_isam.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
ProgramDatabaseFile=".\release/pack_isam.pdb"
|
||||
SubSystem="1"
|
||||
TargetMachine="1"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
TypeLibraryName=".\release/pack_isam.tlb"
|
||||
HeaderFileName=""/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
Culture="1033"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="classic|Win32"
|
||||
OutputDirectory=".\classic"
|
||||
IntermediateDirectory=".\classic"
|
||||
ConfigurationType="1"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="FALSE"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
OptimizeForProcessor="2"
|
||||
AdditionalIncludeDirectories="../include,../isam"
|
||||
PreprocessorDefinitions="_CONSOLE;_WINDOWS;LICENSE=Commercial;DBUG_OFF;NDEBUG"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="TRUE"
|
||||
PrecompiledHeaderFile=".\classic/pack_isam.pch"
|
||||
AssemblerListingLocation=".\classic/"
|
||||
ObjectFile=".\classic/"
|
||||
ProgramDataBaseFileName=".\classic/"
|
||||
BrowseInformation="1"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="TRUE"
|
||||
CompileAs="0"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="wsock32.lib setargv.obj"
|
||||
OutputFile="../client_classic/pack_isam.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories=""
|
||||
ProgramDatabaseFile=".\classic/pack_isam.pdb"
|
||||
SubSystem="1"
|
||||
TargetMachine="1"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
TypeLibraryName=".\classic/pack_isam.tlb"
|
||||
HeaderFileName=""/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
Culture="1033"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="Source Files"
|
||||
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
|
||||
<File
|
||||
RelativePath="..\isam\pack_isam.c">
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="classic|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""
|
||||
BrowseInformation="1"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Header Files"
|
||||
Filter="h;hpp;hxx;hm;inl">
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Resource Files"
|
||||
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
|
||||
</Filter>
|
||||
</Files>
|
||||
<Globals>
|
||||
</Globals>
|
||||
</VisualStudioProject>
|
||||
|
|
@ -975,6 +975,22 @@ static my_bool test_if_special_chars(const char *str)
|
|||
|
||||
|
||||
|
||||
/*
|
||||
quote_name(name, buff, force)
|
||||
|
||||
Quotes char string, taking into account compatible mode
|
||||
|
||||
Args
|
||||
|
||||
name Unquoted string containing that which will be quoted
|
||||
buff The buffer that contains the quoted value, also returned
|
||||
force Flag to make it ignore 'test_if_special_chars'
|
||||
|
||||
Returns
|
||||
|
||||
buff quoted string
|
||||
|
||||
*/
|
||||
static char *quote_name(const char *name, char *buff, my_bool force)
|
||||
{
|
||||
char *to= buff;
|
||||
|
|
@ -1782,14 +1798,19 @@ continue_xml:
|
|||
|
||||
static void dump_triggers_for_table (char *table, char *db)
|
||||
{
|
||||
MYSQL_RES *result;
|
||||
MYSQL_ROW row;
|
||||
char *result_table;
|
||||
char name_buff[NAME_LEN*4+3], table_buff[NAME_LEN*2+3];
|
||||
char query_buff[512];
|
||||
uint old_opt_compatible_mode=opt_compatible_mode;
|
||||
FILE *sql_file = md_result_file;
|
||||
MYSQL_RES *result;
|
||||
MYSQL_ROW row;
|
||||
|
||||
DBUG_ENTER("dump_triggers_for_table");
|
||||
DBUG_PRINT("enter", ("db: %s, table: %s", db, table));
|
||||
|
||||
/* Do not use ANSI_QUOTES on triggers in dump */
|
||||
opt_compatible_mode&= ~MASK_ANSI_QUOTES;
|
||||
result_table= quote_name(table, table_buff, 1);
|
||||
|
||||
my_snprintf(query_buff, sizeof(query_buff),
|
||||
|
|
@ -1822,6 +1843,11 @@ DELIMITER ;;\n");
|
|||
"DELIMITER ;\n"
|
||||
"/*!50003 SET SESSION SQL_MODE=@OLD_SQL_MODE */;\n");
|
||||
mysql_free_result(result);
|
||||
/*
|
||||
make sure to set back opt_compatible mode to
|
||||
original value
|
||||
*/
|
||||
opt_compatible_mode=old_opt_compatible_mode;
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
||||
|
|
|
|||
22
configure.in
22
configure.in
|
|
@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
|
|||
AC_CANONICAL_SYSTEM
|
||||
# The Docs Makefile.am parses this line!
|
||||
# remember to also change ndb version below and update version.c in ndb
|
||||
AM_INIT_AUTOMAKE(mysql, 5.0.15-rc)
|
||||
AM_INIT_AUTOMAKE(mysql, 5.0.16)
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
|
||||
PROTOCOL_VERSION=10
|
||||
|
|
@ -18,8 +18,8 @@ SHARED_LIB_VERSION=15:0:0
|
|||
# ndb version
|
||||
NDB_VERSION_MAJOR=5
|
||||
NDB_VERSION_MINOR=0
|
||||
NDB_VERSION_BUILD=15
|
||||
NDB_VERSION_STATUS="rc"
|
||||
NDB_VERSION_BUILD=16
|
||||
NDB_VERSION_STATUS=""
|
||||
|
||||
# Set all version vars based on $VERSION. How do we do this more elegant ?
|
||||
# Remember that regexps needs to quote [ and ] since this is run through m4
|
||||
|
|
@ -1021,7 +1021,7 @@ case $SYSTEM_TYPE in
|
|||
*darwin5*)
|
||||
if test "$ac_cv_prog_gcc" = "yes"
|
||||
then
|
||||
FLAGS="-traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH"
|
||||
FLAGS="-traditional-cpp -DHAVE_DARWIN5_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH"
|
||||
CFLAGS="$CFLAGS $FLAGS"
|
||||
CXXFLAGS="$CXXFLAGS $FLAGS"
|
||||
MAX_C_OPTIMIZE="-O"
|
||||
|
|
@ -1031,23 +1031,13 @@ case $SYSTEM_TYPE in
|
|||
*darwin6*)
|
||||
if test "$ac_cv_prog_gcc" = "yes"
|
||||
then
|
||||
FLAGS="-DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH"
|
||||
FLAGS="-D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH"
|
||||
CFLAGS="$CFLAGS $FLAGS"
|
||||
CXXFLAGS="$CXXFLAGS $FLAGS"
|
||||
MAX_C_OPTIMIZE="-O"
|
||||
fi
|
||||
;;
|
||||
*darwin[[7-8]]*)
|
||||
# don't forget to escape [] like above
|
||||
if test "$ac_cv_prog_gcc" = "yes"
|
||||
then
|
||||
FLAGS="-DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DIGNORE_SIGHUP_SIGQUIT"
|
||||
CFLAGS="$CFLAGS $FLAGS"
|
||||
CXXFLAGS="$CXXFLAGS $FLAGS"
|
||||
MAX_C_OPTIMIZE="-O"
|
||||
fi
|
||||
;;
|
||||
*darwin9*)
|
||||
*darwin*)
|
||||
if test "$ac_cv_prog_gcc" = "yes"
|
||||
then
|
||||
FLAGS="-D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DIGNORE_SIGHUP_SIGQUIT"
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ CLEANFILES = $(BUILT_SOURCES)
|
|||
DIST_SUBDIRS= yassl
|
||||
|
||||
# This will build mysqld_error.h and sql_state.h
|
||||
$(top_builddir)/include/mysqld_error.h: comp_err$(EXEEXT)
|
||||
$(top_builddir)/include/mysqld_error.h: comp_err
|
||||
$(top_builddir)/extra/comp_err \
|
||||
--charset=$(top_srcdir)/sql/share/charsets \
|
||||
--out-dir=$(top_builddir)/sql/share/ \
|
||||
|
|
|
|||
|
|
@ -193,7 +193,7 @@ typedef uint rf_SetTimer;
|
|||
|
||||
/* Convert some simple functions to Posix */
|
||||
|
||||
#define sigset(A,B) signal((A),(B))
|
||||
#define my_sigset(A,B) signal((A),(B))
|
||||
#define finite(A) _finite(A)
|
||||
#define sleep(A) Sleep((A)*1000)
|
||||
#define popen(A) popen(A,B) _popen((A),(B))
|
||||
|
|
|
|||
|
|
@ -231,6 +231,7 @@ typedef struct charset_info_st
|
|||
uint mbmaxlen;
|
||||
uint16 min_sort_char;
|
||||
uint16 max_sort_char; /* For LIKE optimization */
|
||||
uchar pad_char;
|
||||
my_bool escape_with_backslash_is_dangerous;
|
||||
|
||||
MY_CHARSET_HANDLER *cset;
|
||||
|
|
|
|||
|
|
@ -129,15 +129,6 @@ extern void bmove_align(gptr dst,const gptr src,uint len);
|
|||
#define bmove512(A,B,C) memcpy(A,B,C)
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_purify
|
||||
#define memcpy_overlap(A,B,C) \
|
||||
DBUG_ASSERT((A) <= (B) || ((B)+(C)) <= (A)); \
|
||||
bmove((byte*) (A),(byte*) (B),(size_t) (C));
|
||||
#else
|
||||
#define memcpy_overlap(A,B,C) memcpy((A), (B), (C))
|
||||
#endif /* HAVE_purify */
|
||||
|
||||
|
||||
/* Prototypes for string functions */
|
||||
|
||||
#if !defined(bfill) && !defined(HAVE_BFILL)
|
||||
|
|
|
|||
|
|
@ -292,8 +292,6 @@ extern int my_pthread_create_detached;
|
|||
#undef HAVE_PTHREAD_RWLOCK_RDLOCK
|
||||
#undef HAVE_SNPRINTF
|
||||
|
||||
#define sigset(A,B) pthread_signal((A),(void (*)(int)) (B))
|
||||
#define signal(A,B) pthread_signal((A),(void (*)(int)) (B))
|
||||
#define my_pthread_attr_setprio(A,B)
|
||||
#endif /* defined(PTHREAD_SCOPE_GLOBAL) && !defined(PTHREAD_SCOPE_SYSTEM) */
|
||||
|
||||
|
|
@ -325,14 +323,26 @@ extern int my_pthread_cond_init(pthread_cond_t *mp,
|
|||
#if !defined(HAVE_SIGWAIT) && !defined(HAVE_mit_thread) && !defined(HAVE_rts_threads) && !defined(sigwait) && !defined(alpha_linux_port) && !defined(HAVE_NONPOSIX_SIGWAIT) && !defined(HAVE_DEC_3_2_THREADS) && !defined(_AIX)
|
||||
int sigwait(sigset_t *setp, int *sigp); /* Use our implemention */
|
||||
#endif
|
||||
#if !defined(HAVE_SIGSET) && !defined(HAVE_mit_thread) && !defined(sigset)
|
||||
#define sigset(A,B) do { struct sigaction s; sigset_t set; \
|
||||
sigemptyset(&set); \
|
||||
s.sa_handler = (B); \
|
||||
s.sa_mask = set; \
|
||||
s.sa_flags = 0; \
|
||||
sigaction((A), &s, (struct sigaction *) NULL); \
|
||||
} while (0)
|
||||
|
||||
|
||||
/*
|
||||
We define my_sigset() and use that instead of the system sigset() so that
|
||||
we can favor an implementation based on sigaction(). On some systems, such
|
||||
as Mac OS X, sigset() results in flags such as SA_RESTART being set, and
|
||||
we want to make sure that no such flags are set.
|
||||
*/
|
||||
#if defined(HAVE_SIGACTION) && !defined(my_sigset)
|
||||
#define my_sigset(A,B) do { struct sigaction s; sigset_t set; \
|
||||
sigemptyset(&set); \
|
||||
s.sa_handler = (B); \
|
||||
s.sa_mask = set; \
|
||||
s.sa_flags = 0; \
|
||||
sigaction((A), &s, (struct sigaction *) NULL); \
|
||||
} while (0)
|
||||
#elif defined(HAVE_SIGSET) && !defined(my_sigset)
|
||||
#define my_sigset(A,B) sigset((A),(B))
|
||||
#elif !defined(my_sigset)
|
||||
#define my_sigset(A,B) signal((A),(B))
|
||||
#endif
|
||||
|
||||
#ifndef my_pthread_setprio
|
||||
|
|
@ -412,16 +422,13 @@ struct tm *gmtime_r(const time_t *clock, struct tm *res);
|
|||
#define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(&tmp); }
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_DARWIN_THREADS
|
||||
#ifdef HAVE_DARWIN5_THREADS
|
||||
#define pthread_sigmask(A,B,C) sigprocmask((A),(B),(C))
|
||||
#define pthread_kill(A,B) pthread_dummy(0)
|
||||
#define pthread_condattr_init(A) pthread_dummy(0)
|
||||
#define pthread_condattr_destroy(A) pthread_dummy(0)
|
||||
#define pthread_signal(A,B) pthread_dummy(0)
|
||||
#undef pthread_detach_this_thread
|
||||
#define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(tmp); }
|
||||
#undef sigset
|
||||
#define sigset(A,B) pthread_signal((A),(void (*)(int)) (B))
|
||||
#endif
|
||||
|
||||
#if ((defined(HAVE_PTHREAD_ATTR_CREATE) && !defined(HAVE_SIGWAIT)) || defined(HAVE_DEC_3_2_THREADS)) && !defined(HAVE_CTHREADS_WRAPPER)
|
||||
|
|
|
|||
|
|
@ -986,7 +986,7 @@ uint _mi_get_binary_pack_key(register MI_KEYDEF *keyinfo, uint nod_flag,
|
|||
}
|
||||
DBUG_PRINT("info",("key: %lx from: %lx length: %u",
|
||||
(long) key, (long) from, length));
|
||||
memcpy_overlap((byte*) key, (byte*) from, (size_t) length);
|
||||
memmove((byte*) key, (byte*) from, (size_t) length);
|
||||
key+=length;
|
||||
from+=length;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -436,7 +436,7 @@ alter table t1 change a a char(10) character set cp1251;
|
|||
select a,hex(a) from t1;
|
||||
a hex(a)
|
||||
ÔĹÓÔ F2E5F1F2
|
||||
alter table t1 change a a binary(10);
|
||||
alter table t1 change a a binary(4);
|
||||
select a,hex(a) from t1;
|
||||
a hex(a)
|
||||
ňĺńň F2E5F1F2
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ NULL
|
|||
select b from t1 having binary b like '';
|
||||
b
|
||||
drop table t1;
|
||||
create table t1 (a char(15) binary, b binary(15));
|
||||
create table t1 (a char(3) binary, b binary(3));
|
||||
insert into t1 values ('aaa','bbb'),('AAA','BBB');
|
||||
select upper(a),upper(b) from t1;
|
||||
upper(a) upper(b)
|
||||
|
|
|
|||
|
|
@ -231,7 +231,7 @@ t1 CREATE TABLE `t1` (
|
|||
`c5` varchar(2) character set utf8 NOT NULL default ''
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||
drop table t1;
|
||||
create table t1 (a binary(10), b char(10) character set koi8r);
|
||||
create table t1 (a binary(4), b char(4) character set koi8r);
|
||||
insert into t1 values (_binary'ÔÅÓÔ',_binary'ÔÅÓÔ');
|
||||
select a,b,cast(a as char character set cp1251),cast(b as binary) from t1;
|
||||
a b cast(a as char character set cp1251) cast(b as binary)
|
||||
|
|
@ -334,6 +334,9 @@ cast(repeat('1',20) as signed)
|
|||
-7335632962598440505
|
||||
Warnings:
|
||||
Warning 1105 Cast to signed converted positive out-of-range integer to it's negative complement
|
||||
select cast(1.0e+300 as signed int);
|
||||
cast(1.0e+300 as signed int)
|
||||
9223372036854775807
|
||||
select cast('1.2' as decimal(3,2));
|
||||
cast('1.2' as decimal(3,2))
|
||||
1.20
|
||||
|
|
@ -367,6 +370,3 @@ DROP TABLE t1;
|
|||
select cast(NULL as decimal(6)) as t1;
|
||||
t1
|
||||
NULL
|
||||
select cast(1.0e+300 as signed int);
|
||||
cast(1.0e+300 as signed int)
|
||||
9223372036854775807
|
||||
|
|
|
|||
|
|
@ -170,3 +170,22 @@ SELECT HEX(a) FROM t1 WHERE MATCH(a) AGAINST (0xA741ADCCA66EB6DC IN BOOLEAN MODE
|
|||
HEX(a)
|
||||
A741ADCCA66EB6DC20A7DAADCCABDCA66E
|
||||
DROP TABLE t1;
|
||||
set names big5;
|
||||
create table t1 (a char character set big5);
|
||||
insert into t1 values (0xF9D6),(0xF9D7),(0xF9D8),(0xF9D9);
|
||||
insert into t1 values (0xF9DA),(0xF9DB),(0xF9DC);
|
||||
select hex(a) a, hex(@u:=convert(a using utf8)) b,
|
||||
hex(convert(@u using big5)) c from t1 order by a;
|
||||
a b c
|
||||
F9D6 E7A281 F9D6
|
||||
F9D7 E98AB9 F9D7
|
||||
F9D8 E8A38F F9D8
|
||||
F9D9 E5A2BB F9D9
|
||||
F9DA E68192 F9DA
|
||||
F9DB E7B2A7 F9DB
|
||||
F9DC E5ABBA F9DC
|
||||
alter table t1 convert to character set utf8;
|
||||
select hex(a) from t1 where a = _big5 0xF9DC;
|
||||
hex(a)
|
||||
E5ABBA
|
||||
drop table t1;
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ a
|
|||
b
|
||||
c
|
||||
drop table t1;
|
||||
create table t1 (a char(15) binary, b binary(15)) character set cp1251;
|
||||
create table t1 (a char(3) binary, b binary(3)) character set cp1251;
|
||||
insert into t1 values ('aaa','bbb'),('AAA','BBB');
|
||||
select upper(a),upper(b) from t1;
|
||||
upper(a) upper(b)
|
||||
|
|
|
|||
|
|
@ -340,7 +340,7 @@ CYR CAPIT SOFT SIGN
|
|||
CYR CAPIT E ü ü
|
||||
CYR CAPIT YU à à
|
||||
CYR CAPIT YA ñ ñ
|
||||
ALTER TABLE t1 ADD bin_f CHAR(32) BYTE NOT NULL default '';
|
||||
ALTER TABLE t1 ADD bin_f CHAR(1) BYTE NOT NULL default '';
|
||||
UPDATE t1 SET bin_f=koi8_ru_f;
|
||||
SELECT COUNT(DISTINCT bin_f),COUNT(DISTINCT koi8_ru_f),COUNT(DISTINCT utf8_f) FROM t1;
|
||||
COUNT(DISTINCT bin_f) COUNT(DISTINCT koi8_ru_f) COUNT(DISTINCT utf8_f)
|
||||
|
|
@ -1331,146 +1331,146 @@ UPDATE t1 SET greek_f=CONVERT(ucs2_f USING greek) WHERE comment LIKE _latin2'GRE
|
|||
UPDATE t1 SET armscii8_f=CONVERT(ucs2_f USING armscii8) WHERE comment LIKE _latin2'ARM%';
|
||||
UPDATE t1 SET utf8_f=CONVERT(ucs2_f USING utf8) WHERE utf8_f=_utf8'';
|
||||
UPDATE t1 SET ucs2_f=CONVERT(utf8_f USING ucs2) WHERE ucs2_f=_ucs2'';
|
||||
SELECT * FROM t1;
|
||||
comment koi8_ru_f utf8_f bin_f ucs2_f armscii8_f greek_f
|
||||
LAT SMALL A a a a a
|
||||
LAT SMALL B b b b b
|
||||
LAT SMALL C c c c c
|
||||
LAT SMALL D d d d d
|
||||
LAT SMALL E e e e e
|
||||
LAT SMALL F f f f f
|
||||
LAT SMALL G g g g g
|
||||
LAT SMALL H h h h h
|
||||
LAT SMALL I i i i i
|
||||
LAT SMALL J j j j j
|
||||
LAT SMALL K k k k k
|
||||
LAT SMALL L l l l l
|
||||
LAT SMALL M m m m m
|
||||
LAT SMALL N n n n n
|
||||
LAT SMALL O o o o o
|
||||
LAT SMALL P p p p p
|
||||
LAT SMALL Q q q q q
|
||||
LAT SMALL R r r r r
|
||||
LAT SMALL S s s s s
|
||||
LAT SMALL T t t t t
|
||||
LAT SMALL U u u u u
|
||||
LAT SMALL V v v v v
|
||||
LAT SMALL W w w w w
|
||||
LAT SMALL X x x x x
|
||||
LAT SMALL Y y y y y
|
||||
LAT SMALL Z z z z z
|
||||
LAT CAPIT A A A A A
|
||||
LAT CAPIT B B B B B
|
||||
LAT CAPIT C C C C C
|
||||
LAT CAPIT D D D D D
|
||||
LAT CAPIT E E E E E
|
||||
LAT CAPIT F F F F F
|
||||
LAT CAPIT G G G G G
|
||||
LAT CAPIT H H H H H
|
||||
LAT CAPIT I I I I I
|
||||
LAT CAPIT J J J J J
|
||||
LAT CAPIT K K K K K
|
||||
LAT CAPIT L L L L L
|
||||
LAT CAPIT M M M M M
|
||||
LAT CAPIT N N N N N
|
||||
LAT CAPIT O O O O O
|
||||
LAT CAPIT P P P P P
|
||||
LAT CAPIT Q Q Q Q Q
|
||||
LAT CAPIT R R R R R
|
||||
LAT CAPIT S S S S S
|
||||
LAT CAPIT T T T T T
|
||||
LAT CAPIT U U U U U
|
||||
LAT CAPIT V V V V V
|
||||
LAT CAPIT W W W W W
|
||||
LAT CAPIT X X X X X
|
||||
LAT CAPIT Y Y Y Y Y
|
||||
LAT CAPIT Z Z Z Z Z
|
||||
CYR SMALL A а а Á а
|
||||
CYR SMALL BE б б  б
|
||||
CYR SMALL VE в в × Ð²
|
||||
CYR SMALL GE г г Ç Ð³
|
||||
CYR SMALL DE д д Ä Ð´
|
||||
CYR SMALL IE е е Šе
|
||||
CYR SMALL IO Ñ‘ Ñ‘ £ Ñ‘
|
||||
CYR SMALL ZHE ж ж Ö Ð¶
|
||||
CYR SMALL ZE з з Ú Ð·
|
||||
CYR SMALL I и и É Ð¸
|
||||
CYR SMALL KA к к Ë Ðº
|
||||
CYR SMALL EL л л Ì Ð»
|
||||
CYR SMALL EM м м Í Ð¼
|
||||
CYR SMALL EN н н Πн
|
||||
CYR SMALL O о о Ï Ð¾
|
||||
CYR SMALL PE п п Рп
|
||||
CYR SMALL ER Ñ€ Ñ€ Ò Ñ€
|
||||
CYR SMALL ES Ñ<EFBFBD> Ñ<> Ó Ñ<>
|
||||
CYR SMALL TE Ñ‚ Ñ‚ Ô Ñ‚
|
||||
CYR SMALL U у у Õ Ñƒ
|
||||
CYR SMALL EF Ñ„ Ñ„ Æ Ñ„
|
||||
CYR SMALL HA Ñ… Ñ… È Ñ…
|
||||
CYR SMALL TSE ц ц à ц
|
||||
CYR SMALL CHE ч ч Þ Ñ‡
|
||||
CYR SMALL SHA ш ш Û Ñˆ
|
||||
CYR SMALL SCHA щ щ Ý Ñ‰
|
||||
CYR SMALL HARD SIGN ÑŠ ÑŠ ß ÑŠ
|
||||
CYR SMALL YERU Ñ‹ Ñ‹ Ù Ñ‹
|
||||
CYR SMALL SOFT SIGN ÑŒ ÑŒ Ø ÑŒ
|
||||
CYR SMALL E Ñ<EFBFBD> Ñ<> Ü Ñ<>
|
||||
CYR SMALL YU ÑŽ ÑŽ À ÑŽ
|
||||
CYR SMALL YA Ñ<EFBFBD> Ñ<> Ñ Ñ<>
|
||||
CYR CAPIT A Ð<EFBFBD> Ð<> á Ð<>
|
||||
CYR CAPIT BE Б Б â Б
|
||||
CYR CAPIT VE Ð’ Ð’ ÷ Ð’
|
||||
CYR CAPIT GE Г Г ç Г
|
||||
CYR CAPIT DE Д Д ä Д
|
||||
CYR CAPIT IE Е Е å Е
|
||||
CYR CAPIT IO Ð<EFBFBD> Ð<> ³ Ð<>
|
||||
CYR CAPIT ZHE Ж Ж ö Ж
|
||||
CYR CAPIT ZE З З ú З
|
||||
CYR CAPIT I И И é И
|
||||
CYR CAPIT KA К К ë К
|
||||
CYR CAPIT EL Л Л ì Л
|
||||
CYR CAPIT EM Ðœ Ðœ í Ðœ
|
||||
CYR CAPIT EN Ð<EFBFBD> Ð<> î Ð<>
|
||||
CYR CAPIT O О О ï О
|
||||
CYR CAPIT PE П П ð П
|
||||
CYR CAPIT ER Ð Ð ò Ð
|
||||
CYR CAPIT ES С С ó С
|
||||
CYR CAPIT TE Т Т ô Т
|
||||
CYR CAPIT U У У õ У
|
||||
CYR CAPIT EF Ф Ф æ Ф
|
||||
CYR CAPIT HA Ð¥ Ð¥ è Ð¥
|
||||
CYR CAPIT TSE Ц Ц ã Ц
|
||||
CYR CAPIT CHE Ч Ч þ Ч
|
||||
CYR CAPIT SHA Ш Ш û Ш
|
||||
CYR CAPIT SCHA Щ Щ ý Щ
|
||||
CYR CAPIT HARD SIGN Ъ Ъ ÿ Ъ
|
||||
CYR CAPIT YERU Ы Ы ù Ы
|
||||
CYR CAPIT SOFT SIGN Ь Ь ø Ь
|
||||
CYR CAPIT E Ð Ð ü Ð
|
||||
CYR CAPIT YU Ю Ю à Ю
|
||||
CYR CAPIT YA Я Я ñ Я
|
||||
GREEK CAPIT ALPHA Α Α Α
|
||||
GREEK CAPIT BETA Î’ Î’ Î’
|
||||
GREEK CAPIT GAMMA Γ Γ Γ
|
||||
GREEK CAPIT DELTA Δ Δ Δ
|
||||
GREEK CAPIT EPSILON Ε Ε Ε
|
||||
GREEK SMALL ALPHA α α α
|
||||
GREEK SMALL BETA β β β
|
||||
GREEK SMALL GAMMA γ γ γ
|
||||
GREEK SMALL DELTA δ δ δ
|
||||
GREEK SMALL EPSILON ε ε ε
|
||||
ARMENIAN CAPIT AYB Ô± Ô± Ô±
|
||||
ARMENIAN CAPIT BEN Ô² Ô² Ô²
|
||||
ARMENIAN CAPIT GIM Ô³ Ô³ Ô³
|
||||
ARMENIAN CAPIT DA Ô´ Ô´ Ô´
|
||||
ARMENIAN CAPIT ECH Ôµ Ôµ Ôµ
|
||||
ARMENIAN CAPIT ZA Ô¶ Ô¶ Ô¶
|
||||
ARMENIAN SMALL YAB Õ¡ Õ¡ Õ¡
|
||||
ARMENIAN SMALL BEN Õ¢ Õ¢ Õ¢
|
||||
ARMENIAN SMALL GIM Õ£ Õ£ Õ£
|
||||
ARMENIAN SMALL DA Õ¤ Õ¤ Õ¤
|
||||
ARMENIAN SMALL ECH Õ¥ Õ¥ Õ¥
|
||||
ARMENIAN SMALL ZA Õ¦ Õ¦ Õ¦
|
||||
SELECT comment, koi8_ru_f, utf8_f, hex(bin_f), ucs2_f, armscii8_f, greek_f FROM t1;
|
||||
comment koi8_ru_f utf8_f hex(bin_f) ucs2_f armscii8_f greek_f
|
||||
LAT SMALL A a a 61 a
|
||||
LAT SMALL B b b 62 b
|
||||
LAT SMALL C c c 63 c
|
||||
LAT SMALL D d d 64 d
|
||||
LAT SMALL E e e 65 e
|
||||
LAT SMALL F f f 66 f
|
||||
LAT SMALL G g g 67 g
|
||||
LAT SMALL H h h 68 h
|
||||
LAT SMALL I i i 69 i
|
||||
LAT SMALL J j j 6A j
|
||||
LAT SMALL K k k 6B k
|
||||
LAT SMALL L l l 6C l
|
||||
LAT SMALL M m m 6D m
|
||||
LAT SMALL N n n 6E n
|
||||
LAT SMALL O o o 6F o
|
||||
LAT SMALL P p p 70 p
|
||||
LAT SMALL Q q q 71 q
|
||||
LAT SMALL R r r 72 r
|
||||
LAT SMALL S s s 73 s
|
||||
LAT SMALL T t t 74 t
|
||||
LAT SMALL U u u 75 u
|
||||
LAT SMALL V v v 76 v
|
||||
LAT SMALL W w w 77 w
|
||||
LAT SMALL X x x 78 x
|
||||
LAT SMALL Y y y 79 y
|
||||
LAT SMALL Z z z 7A z
|
||||
LAT CAPIT A A A 41 A
|
||||
LAT CAPIT B B B 42 B
|
||||
LAT CAPIT C C C 43 C
|
||||
LAT CAPIT D D D 44 D
|
||||
LAT CAPIT E E E 45 E
|
||||
LAT CAPIT F F F 46 F
|
||||
LAT CAPIT G G G 47 G
|
||||
LAT CAPIT H H H 48 H
|
||||
LAT CAPIT I I I 49 I
|
||||
LAT CAPIT J J J 4A J
|
||||
LAT CAPIT K K K 4B K
|
||||
LAT CAPIT L L L 4C L
|
||||
LAT CAPIT M M M 4D M
|
||||
LAT CAPIT N N N 4E N
|
||||
LAT CAPIT O O O 4F O
|
||||
LAT CAPIT P P P 50 P
|
||||
LAT CAPIT Q Q Q 51 Q
|
||||
LAT CAPIT R R R 52 R
|
||||
LAT CAPIT S S S 53 S
|
||||
LAT CAPIT T T T 54 T
|
||||
LAT CAPIT U U U 55 U
|
||||
LAT CAPIT V V V 56 V
|
||||
LAT CAPIT W W W 57 W
|
||||
LAT CAPIT X X X 58 X
|
||||
LAT CAPIT Y Y Y 59 Y
|
||||
LAT CAPIT Z Z Z 5A Z
|
||||
CYR SMALL A а а C1 а
|
||||
CYR SMALL BE б б C2 б
|
||||
CYR SMALL VE в в D7 в
|
||||
CYR SMALL GE г г C7 г
|
||||
CYR SMALL DE д д C4 д
|
||||
CYR SMALL IE е е C5 е
|
||||
CYR SMALL IO ё ё A3 ё
|
||||
CYR SMALL ZHE ж ж D6 ж
|
||||
CYR SMALL ZE з з DA з
|
||||
CYR SMALL I и и C9 и
|
||||
CYR SMALL KA к к CB к
|
||||
CYR SMALL EL л л CC л
|
||||
CYR SMALL EM м м CD м
|
||||
CYR SMALL EN н н CE н
|
||||
CYR SMALL O о о CF о
|
||||
CYR SMALL PE п п D0 п
|
||||
CYR SMALL ER р р D2 р
|
||||
CYR SMALL ES с с D3 с
|
||||
CYR SMALL TE т т D4 т
|
||||
CYR SMALL U у у D5 у
|
||||
CYR SMALL EF ф ф C6 ф
|
||||
CYR SMALL HA х х C8 х
|
||||
CYR SMALL TSE ц ц C3 ц
|
||||
CYR SMALL CHE ч ч DE ч
|
||||
CYR SMALL SHA ш ш DB ш
|
||||
CYR SMALL SCHA щ щ DD щ
|
||||
CYR SMALL HARD SIGN ъ ъ DF ъ
|
||||
CYR SMALL YERU ы ы D9 ы
|
||||
CYR SMALL SOFT SIGN ь ь D8 ь
|
||||
CYR SMALL E э э DC э
|
||||
CYR SMALL YU ю ю C0 ю
|
||||
CYR SMALL YA я я D1 я
|
||||
CYR CAPIT A А А E1 А
|
||||
CYR CAPIT BE Б Б E2 Б
|
||||
CYR CAPIT VE В В F7 В
|
||||
CYR CAPIT GE Г Г E7 Г
|
||||
CYR CAPIT DE Д Д E4 Д
|
||||
CYR CAPIT IE Е Е E5 Е
|
||||
CYR CAPIT IO Ё Ё B3 Ё
|
||||
CYR CAPIT ZHE Ж Ж F6 Ж
|
||||
CYR CAPIT ZE З З FA З
|
||||
CYR CAPIT I И И E9 И
|
||||
CYR CAPIT KA К К EB К
|
||||
CYR CAPIT EL Л Л EC Л
|
||||
CYR CAPIT EM М М ED М
|
||||
CYR CAPIT EN Н Н EE Н
|
||||
CYR CAPIT O О О EF О
|
||||
CYR CAPIT PE П П F0 П
|
||||
CYR CAPIT ER Р Р F2 Р
|
||||
CYR CAPIT ES С С F3 С
|
||||
CYR CAPIT TE Т Т F4 Т
|
||||
CYR CAPIT U У У F5 У
|
||||
CYR CAPIT EF Ф Ф E6 Ф
|
||||
CYR CAPIT HA Х Х E8 Х
|
||||
CYR CAPIT TSE Ц Ц E3 Ц
|
||||
CYR CAPIT CHE Ч Ч FE Ч
|
||||
CYR CAPIT SHA Ш Ш FB Ш
|
||||
CYR CAPIT SCHA Щ Щ FD Щ
|
||||
CYR CAPIT HARD SIGN Ъ Ъ FF Ъ
|
||||
CYR CAPIT YERU Ы Ы F9 Ы
|
||||
CYR CAPIT SOFT SIGN Ь Ь F8 Ь
|
||||
CYR CAPIT E Э Э FC Э
|
||||
CYR CAPIT YU Ю Ю E0 Ю
|
||||
CYR CAPIT YA Я Я F1 Я
|
||||
GREEK CAPIT ALPHA Α 00 Α Α
|
||||
GREEK CAPIT BETA Β 00 Β Β
|
||||
GREEK CAPIT GAMMA Γ 00 Γ Γ
|
||||
GREEK CAPIT DELTA Δ 00 Δ Δ
|
||||
GREEK CAPIT EPSILON Ε 00 Ε Ε
|
||||
GREEK SMALL ALPHA α 00 α α
|
||||
GREEK SMALL BETA β 00 β β
|
||||
GREEK SMALL GAMMA γ 00 γ γ
|
||||
GREEK SMALL DELTA δ 00 δ δ
|
||||
GREEK SMALL EPSILON ε 00 ε ε
|
||||
ARMENIAN CAPIT AYB Ա 00 Ա Ա
|
||||
ARMENIAN CAPIT BEN Բ 00 Բ Բ
|
||||
ARMENIAN CAPIT GIM Գ 00 Գ Գ
|
||||
ARMENIAN CAPIT DA Դ 00 Դ Դ
|
||||
ARMENIAN CAPIT ECH Ե 00 Ե Ե
|
||||
ARMENIAN CAPIT ZA Զ 00 Զ Զ
|
||||
ARMENIAN SMALL YAB ա 00 ա ա
|
||||
ARMENIAN SMALL BEN բ 00 բ բ
|
||||
ARMENIAN SMALL GIM գ 00 գ գ
|
||||
ARMENIAN SMALL DA դ 00 դ դ
|
||||
ARMENIAN SMALL ECH ե 00 ե ե
|
||||
ARMENIAN SMALL ZA զ 00 զ զ
|
||||
SET CHARACTER SET 'binary';
|
||||
SELECT * FROM t1;
|
||||
comment koi8_ru_f utf8_f bin_f ucs2_f armscii8_f greek_f
|
||||
|
|
@ -1590,28 +1590,28 @@ CYR CAPIT SOFT SIGN
|
|||
CYR CAPIT E ü Ð ü -
|
||||
CYR CAPIT YU à Ю à .
|
||||
CYR CAPIT YA ñ Я ñ /
|
||||
GREEK CAPIT ALPHA Α ‘ Á
|
||||
GREEK CAPIT BETA Î’ ’ Â
|
||||
GREEK CAPIT GAMMA Γ “ Ã
|
||||
GREEK CAPIT DELTA Δ ” Ä
|
||||
GREEK CAPIT EPSILON Ε • Å
|
||||
GREEK SMALL ALPHA α ± á
|
||||
GREEK SMALL BETA β ² â
|
||||
GREEK SMALL GAMMA γ ³ ã
|
||||
GREEK SMALL DELTA δ ´ ä
|
||||
GREEK SMALL EPSILON ε µ å
|
||||
ARMENIAN CAPIT AYB Ô± 1 ²
|
||||
ARMENIAN CAPIT BEN Ô² 2 ´
|
||||
ARMENIAN CAPIT GIM Ô³ 3 ¶
|
||||
ARMENIAN CAPIT DA Ô´ 4 ¸
|
||||
ARMENIAN CAPIT ECH Ôµ 5 º
|
||||
ARMENIAN CAPIT ZA Ô¶ 6 ¼
|
||||
ARMENIAN SMALL YAB Õ¡ a ³
|
||||
ARMENIAN SMALL BEN Õ¢ b µ
|
||||
ARMENIAN SMALL GIM Õ£ c ·
|
||||
ARMENIAN SMALL DA Õ¤ d ¹
|
||||
ARMENIAN SMALL ECH Õ¥ e »
|
||||
ARMENIAN SMALL ZA Õ¦ f ½
|
||||
GREEK CAPIT ALPHA Α <03> <09>
|
||||
GREEK CAPIT BETA Β <03> <09>
|
||||
GREEK CAPIT GAMMA Γ <03> <09>
|
||||
GREEK CAPIT DELTA Δ <03> <09>
|
||||
GREEK CAPIT EPSILON Ε <03> <09>
|
||||
GREEK SMALL ALPHA α <03> <09>
|
||||
GREEK SMALL BETA β <03> <09>
|
||||
GREEK SMALL GAMMA γ <03> <09>
|
||||
GREEK SMALL DELTA δ <03> <09>
|
||||
GREEK SMALL EPSILON ε <03> <09>
|
||||
ARMENIAN CAPIT AYB Ա 1 <09>
|
||||
ARMENIAN CAPIT BEN Բ 2 <09>
|
||||
ARMENIAN CAPIT GIM Գ 3 <09>
|
||||
ARMENIAN CAPIT DA Դ 4 <09>
|
||||
ARMENIAN CAPIT ECH Ե 5 <09>
|
||||
ARMENIAN CAPIT ZA Զ 6 <09>
|
||||
ARMENIAN SMALL YAB ա a <09>
|
||||
ARMENIAN SMALL BEN բ b <09>
|
||||
ARMENIAN SMALL GIM գ c <09>
|
||||
ARMENIAN SMALL DA դ d <09>
|
||||
ARMENIAN SMALL ECH ե e <09>
|
||||
ARMENIAN SMALL ZA զ f <09>
|
||||
SELECT min(comment),count(*) FROM t1 GROUP BY ucs2_f;
|
||||
min(comment) count(*)
|
||||
LAT CAPIT A 2
|
||||
|
|
|
|||
|
|
@ -1044,6 +1044,11 @@ hex(a)
|
|||
5B
|
||||
E880BD
|
||||
drop table t1;
|
||||
set names 'latin1';
|
||||
create table t1 (a varchar(255)) default charset=utf8;
|
||||
select * from t1 where find_in_set('-1', a);
|
||||
a
|
||||
drop table t1;
|
||||
CREATE TABLE t1(id varchar(20) NOT NULL) DEFAULT CHARSET=utf8;
|
||||
INSERT INTO t1 VALUES ('xxx'), ('aa'), ('yyy'), ('aa');
|
||||
SELECT id FROM t1;
|
||||
|
|
@ -1064,46 +1069,56 @@ xxx
|
|||
yyy
|
||||
DROP TABLE t1;
|
||||
set names utf8;
|
||||
select hex(char(1));
|
||||
hex(char(1))
|
||||
select hex(char(1 using utf8));
|
||||
hex(char(1 using utf8))
|
||||
01
|
||||
select char(0xd1,0x8f);
|
||||
char(0xd1,0x8f)
|
||||
select char(0xd1,0x8f using utf8);
|
||||
char(0xd1,0x8f using utf8)
|
||||
Ñ<EFBFBD>
|
||||
select char(0xd18f);
|
||||
char(0xd18f)
|
||||
select char(0xd18f using utf8);
|
||||
char(0xd18f using utf8)
|
||||
Ñ<EFBFBD>
|
||||
select char(53647);
|
||||
char(53647)
|
||||
select char(53647 using utf8);
|
||||
char(53647 using utf8)
|
||||
Ñ<EFBFBD>
|
||||
select char(0xff,0x8f);
|
||||
char(0xff,0x8f)
|
||||
select char(0xff,0x8f using utf8);
|
||||
char(0xff,0x8f using utf8)
|
||||
ÿ<EFBFBD>
|
||||
Warnings:
|
||||
Warning 1300 Invalid utf8 character string: 'FF8F'
|
||||
set sql_mode=traditional;
|
||||
select char(0xff,0x8f);
|
||||
char(0xff,0x8f)
|
||||
ÿ<EFBFBD>
|
||||
select convert(char(0xff,0x8f) using utf8);
|
||||
convert(char(0xff,0x8f) using utf8)
|
||||
ÿ<EFBFBD>
|
||||
select char(195);
|
||||
char(195)
|
||||
Ã
|
||||
select convert(char(195) using utf8);
|
||||
convert(char(195) using utf8)
|
||||
Ã
|
||||
select char(196);
|
||||
char(196)
|
||||
Ä
|
||||
select convert(char(196) using utf8);
|
||||
convert(char(196) using utf8)
|
||||
Ä
|
||||
select char(0xff,0x8f using utf8);
|
||||
char(0xff,0x8f using utf8)
|
||||
NULL
|
||||
Warnings:
|
||||
Error 1300 Invalid utf8 character string: 'FF8F'
|
||||
select char(195 using utf8);
|
||||
char(195 using utf8)
|
||||
NULL
|
||||
Warnings:
|
||||
Error 1300 Invalid utf8 character string: 'C3'
|
||||
select char(196 using utf8);
|
||||
char(196 using utf8)
|
||||
NULL
|
||||
Warnings:
|
||||
Error 1300 Invalid utf8 character string: 'C4'
|
||||
select char(2557 using utf8);
|
||||
char(2557 using utf8)
|
||||
NULL
|
||||
Warnings:
|
||||
Error 1300 Invalid utf8 character string: 'FD'
|
||||
select hex(convert(char(2557 using latin1) using utf8));
|
||||
hex(convert(char(2557 using latin1) using utf8))
|
||||
09C3BD
|
||||
select hex(char(195));
|
||||
hex(char(195))
|
||||
C3
|
||||
select hex(char(196));
|
||||
hex(char(196))
|
||||
C4
|
||||
select hex(char(2557));
|
||||
hex(char(2557))
|
||||
09FD
|
||||
select hex(convert(char(2557) using utf8));
|
||||
hex(convert(char(2557) using utf8))
|
||||
09FD
|
||||
set names utf8;
|
||||
create table t1 (a char(1)) default character set utf8;
|
||||
create table t2 (a char(1)) default character set utf8;
|
||||
|
|
|
|||
|
|
@ -510,7 +510,7 @@ DROP TABLE IF EXISTS federated.t1;
|
|||
CREATE TABLE federated.t1 (
|
||||
`id` int NOT NULL auto_increment,
|
||||
`name` char(32) NOT NULL DEFAULT '',
|
||||
`bincol` binary(4) NOT NULL,
|
||||
`bincol` binary(1) NOT NULL,
|
||||
`floatval` decimal(5,2) NOT NULL DEFAULT 0.0,
|
||||
`other` int NOT NULL DEFAULT 0,
|
||||
PRIMARY KEY (id),
|
||||
|
|
@ -521,7 +521,7 @@ DROP TABLE IF EXISTS federated.t1;
|
|||
CREATE TABLE federated.t1 (
|
||||
`id` int NOT NULL auto_increment,
|
||||
`name` char(32) NOT NULL DEFAULT '',
|
||||
`bincol` binary(4) NOT NULL,
|
||||
`bincol` binary(1) NOT NULL,
|
||||
`floatval` decimal(5,2) NOT NULL DEFAULT 0.0,
|
||||
`other` int NOT NULL DEFAULT 0,
|
||||
PRIMARY KEY (id),
|
||||
|
|
|
|||
|
|
@ -187,7 +187,7 @@ select 1 in ('1.1',2);
|
|||
select 1 in ('1.1',2.0);
|
||||
1 in ('1.1',2.0)
|
||||
0
|
||||
create table t1 (a char(20) character set binary);
|
||||
create table t1 (a char(2) character set binary);
|
||||
insert into t1 values ('aa'), ('bb');
|
||||
select * from t1 where a in (NULL, 'aa');
|
||||
a
|
||||
|
|
|
|||
|
|
@ -99,6 +99,8 @@ id name
|
|||
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
|
||||
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
|
||||
/*!40101 SET NAMES utf8 */;
|
||||
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
|
||||
/*!40103 SET TIME_ZONE='+00:00' */;
|
||||
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
|
||||
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
|
||||
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
|
||||
|
|
@ -167,6 +169,7 @@ CREATE TABLE `t6` (
|
|||
/*!40000 ALTER TABLE `t6` DISABLE KEYS */;
|
||||
INSERT IGNORE INTO `t6` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
|
||||
/*!40000 ALTER TABLE `t6` ENABLE KEYS */;
|
||||
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
|
||||
|
||||
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
|
||||
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
|
||||
|
|
@ -181,6 +184,8 @@ INSERT IGNORE INTO `t6` VALUES (1,'first value'),(2,'first value'),(3,'first va
|
|||
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
|
||||
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
|
||||
/*!40101 SET NAMES utf8 */;
|
||||
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
|
||||
/*!40103 SET TIME_ZONE='+00:00' */;
|
||||
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
|
||||
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
|
||||
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
|
||||
|
|
@ -249,6 +254,7 @@ CREATE TABLE `t6` (
|
|||
/*!40000 ALTER TABLE `t6` DISABLE KEYS */;
|
||||
INSERT INTO `t6` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
|
||||
/*!40000 ALTER TABLE `t6` ENABLE KEYS */;
|
||||
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
|
||||
|
||||
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
|
||||
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
|
||||
|
|
|
|||
|
|
@ -2309,3 +2309,68 @@ UNLOCK TABLES;
|
|||
drop table t1;
|
||||
set global time_zone=default;
|
||||
set time_zone=default;
|
||||
DROP TABLE IF EXISTS `t1 test`;
|
||||
CREATE TABLE `t1 test` (
|
||||
`a1` int(11) default NULL
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
|
||||
DROP TABLE IF EXISTS `t2 test`;
|
||||
CREATE TABLE `t2 test` (
|
||||
`a2` int(11) default NULL
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
|
||||
CREATE TRIGGER `test trig` BEFORE INSERT ON `t1 test` FOR EACH ROW BEGIN
|
||||
INSERT INTO `t2 test` SET a2 = NEW.a1; END //
|
||||
INSERT INTO `t1 test` VALUES (1);
|
||||
INSERT INTO `t1 test` VALUES (2);
|
||||
INSERT INTO `t1 test` VALUES (3);
|
||||
SELECT * FROM `t2 test`;
|
||||
a2
|
||||
1
|
||||
2
|
||||
3
|
||||
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
|
||||
/*!40103 SET TIME_ZONE='+00:00' */;
|
||||
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
|
||||
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
|
||||
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */;
|
||||
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
|
||||
DROP TABLE IF EXISTS "t1 test";
|
||||
CREATE TABLE "t1 test" (
|
||||
"a1" int(11) default NULL
|
||||
);
|
||||
|
||||
|
||||
/*!40000 ALTER TABLE "t1 test" DISABLE KEYS */;
|
||||
LOCK TABLES "t1 test" WRITE;
|
||||
INSERT INTO "t1 test" VALUES (1),(2),(3);
|
||||
UNLOCK TABLES;
|
||||
/*!40000 ALTER TABLE "t1 test" ENABLE KEYS */;
|
||||
|
||||
/*!50003 SET @OLD_SQL_MODE=@@SQL_MODE*/;
|
||||
DELIMITER ;;
|
||||
/*!50003 SET SESSION SQL_MODE="" */;;
|
||||
/*!50003 CREATE TRIGGER `test trig` BEFORE INSERT ON `t1 test` FOR EACH ROW BEGIN
|
||||
INSERT INTO `t2 test` SET a2 = NEW.a1; END */;;
|
||||
|
||||
DELIMITER ;
|
||||
/*!50003 SET SESSION SQL_MODE=@OLD_SQL_MODE */;
|
||||
DROP TABLE IF EXISTS "t2 test";
|
||||
CREATE TABLE "t2 test" (
|
||||
"a2" int(11) default NULL
|
||||
);
|
||||
|
||||
|
||||
/*!40000 ALTER TABLE "t2 test" DISABLE KEYS */;
|
||||
LOCK TABLES "t2 test" WRITE;
|
||||
INSERT INTO "t2 test" VALUES (1),(2),(3);
|
||||
UNLOCK TABLES;
|
||||
/*!40000 ALTER TABLE "t2 test" ENABLE KEYS */;
|
||||
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
|
||||
|
||||
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
|
||||
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
|
||||
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
|
||||
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
|
||||
|
||||
DROP TRIGGER `test trig`;
|
||||
DROP TABLE `t1 test`;
|
||||
DROP TABLE `t2 test`;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ CREATE TABLE t1 (
|
|||
auto int(5) unsigned NOT NULL auto_increment,
|
||||
string char(10),
|
||||
vstring varchar(10),
|
||||
bin binary(7),
|
||||
bin binary(2),
|
||||
vbin varbinary(7),
|
||||
tiny tinyint(4) DEFAULT '0' NOT NULL ,
|
||||
short smallint(6) DEFAULT '1' NOT NULL ,
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ CREATE TABLE t1 (
|
|||
auto int(5) unsigned NOT NULL auto_increment,
|
||||
string char(10) default "hello",
|
||||
vstring varchar(10) default "hello",
|
||||
bin binary(7),
|
||||
bin binary(2),
|
||||
vbin varbinary(7),
|
||||
tiny tinyint(4) DEFAULT '0' NOT NULL ,
|
||||
short smallint(6) DEFAULT '1' NOT NULL ,
|
||||
|
|
|
|||
|
|
@ -813,7 +813,7 @@ update t1 set a='b' where a<>'a';
|
|||
explain select * from t1 where a not between 'b' and 'b';
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 range a a 13 NULL # Using where
|
||||
select * from t1 where a not between 'b' and 'b';
|
||||
a filler
|
||||
a
|
||||
select a, hex(filler) from t1 where a not between 'b' and 'b';
|
||||
a hex(filler)
|
||||
a 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||
drop table t1,t2,t3;
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ reset master;
|
|||
reset slave;
|
||||
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
||||
start slave;
|
||||
drop table if exists t1,t2;
|
||||
CREATE TABLE t1 (
|
||||
a int unsigned not null auto_increment primary key,
|
||||
b int unsigned
|
||||
|
|
@ -40,3 +41,15 @@ SELECT * FROM t2 ORDER BY a;
|
|||
a b
|
||||
1 0
|
||||
2 1
|
||||
drop table t1,t2;
|
||||
reset master;
|
||||
CREATE TABLE t1 ( a INT );
|
||||
INSERT INTO t1 VALUES (0);
|
||||
UPDATE t1, (SELECT 3 as b) AS x SET t1.a = x.b;
|
||||
select * from t1;
|
||||
a
|
||||
3
|
||||
select * from t1;
|
||||
a
|
||||
3
|
||||
drop table t1;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
drop table if exists t1,t2,t3,t4;
|
||||
drop table if exists t1,t2,t3,t4,t11;
|
||||
drop table if exists t1_1,t1_2,t9_1,t9_2,t1aa,t2aa;
|
||||
drop view if exists v1;
|
||||
CREATE TABLE t1 (
|
||||
|
|
@ -2620,6 +2620,16 @@ select found_rows();
|
|||
found_rows()
|
||||
1
|
||||
DROP TABLE t1;
|
||||
CREATE TABLE t1 (a INT, b INT);
|
||||
(SELECT a, b AS c FROM t1) ORDER BY c+1;
|
||||
a c
|
||||
(SELECT a, b AS c FROM t1) ORDER BY b+1;
|
||||
a c
|
||||
SELECT a, b AS c FROM t1 ORDER BY c+1;
|
||||
a c
|
||||
SELECT a, b AS c FROM t1 ORDER BY b+1;
|
||||
a c
|
||||
drop table t1;
|
||||
create table t1(f1 int, f2 int);
|
||||
create table t2(f3 int);
|
||||
select f1 from t1,t2 where f1=f2 and (f1,f2) = ((1,1));
|
||||
|
|
@ -2636,6 +2646,60 @@ select * from t1,t2 where f1=f3 and (f1,f2) <=> (2,null);
|
|||
f1 f2 f3
|
||||
2 NULL 2
|
||||
drop table t1,t2;
|
||||
create table t1 (f1 int not null auto_increment primary key, f2 varchar(10));
|
||||
create table t11 like t1;
|
||||
insert into t1 values(1,""),(2,"");
|
||||
show table status like 't1%';
|
||||
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
|
||||
t1 MyISAM 10 Dynamic 2 20 X X X X X X X X latin1_swedish_ci NULL
|
||||
t11 MyISAM 10 Dynamic 0 0 X X X X X X X X latin1_swedish_ci NULL
|
||||
select 123 as a from t1 where f1 is null;
|
||||
a
|
||||
drop table t1,t11;
|
||||
CREATE TABLE t1 (a INT, b INT);
|
||||
(SELECT a, b AS c FROM t1) ORDER BY c+1;
|
||||
a c
|
||||
(SELECT a, b AS c FROM t1) ORDER BY b+1;
|
||||
a c
|
||||
SELECT a, b AS c FROM t1 ORDER BY c+1;
|
||||
a c
|
||||
SELECT a, b AS c FROM t1 ORDER BY b+1;
|
||||
a c
|
||||
drop table t1;
|
||||
CREATE TABLE t1 ( a INT NOT NULL, b INT NOT NULL, UNIQUE idx (a,b) );
|
||||
INSERT INTO t1 VALUES (1,1),(1,2),(1,3),(1,4);
|
||||
CREATE TABLE t2 ( a INT NOT NULL, b INT NOT NULL, e INT );
|
||||
INSERT INTO t2 VALUES ( 1,10,1), (1,10,2), (1,11,1), (1,11,2), (1,2,1), (1,2,2),(1,2,3);
|
||||
SELECT t2.a, t2.b, IF(t1.b IS NULL,'',e) AS c, COUNT(*) AS d FROM t2 LEFT JOIN
|
||||
t1 ON t2.a = t1.a AND t2.b = t1.b GROUP BY a, b, c;
|
||||
a b c d
|
||||
1 2 1 1
|
||||
1 2 2 1
|
||||
1 2 3 1
|
||||
1 10 2
|
||||
1 11 2
|
||||
SELECT t2.a, t2.b, IF(t1.b IS NULL,'',e) AS c, COUNT(*) AS d FROM t2 LEFT JOIN
|
||||
t1 ON t2.a = t1.a AND t2.b = t1.b GROUP BY t1.a, t1.b, c;
|
||||
a b c d
|
||||
1 10 4
|
||||
1 2 1 1
|
||||
1 2 2 1
|
||||
1 2 3 1
|
||||
SELECT t2.a, t2.b, IF(t1.b IS NULL,'',e) AS c, COUNT(*) AS d FROM t2 LEFT JOIN
|
||||
t1 ON t2.a = t1.a AND t2.b = t1.b GROUP BY t2.a, t2.b, c;
|
||||
a b c d
|
||||
1 2 1 1
|
||||
1 2 2 1
|
||||
1 2 3 1
|
||||
1 10 2
|
||||
1 11 2
|
||||
SELECT t2.a, t2.b, IF(t1.b IS NULL,'',e) AS c, COUNT(*) AS d FROM t2,t1
|
||||
WHERE t2.a = t1.a AND t2.b = t1.b GROUP BY a, b, c;
|
||||
a b c d
|
||||
1 2 1 1
|
||||
1 2 2 1
|
||||
1 2 3 1
|
||||
DROP TABLE IF EXISTS t1, t2;
|
||||
CREATE TABLE t1 ( city char(30) );
|
||||
INSERT INTO t1 VALUES ('London');
|
||||
INSERT INTO t1 VALUES ('Paris');
|
||||
|
|
@ -3045,26 +3109,18 @@ id
|
|||
102
|
||||
drop table t1, t2;
|
||||
drop view v1, v2, v3;
|
||||
create table a (
|
||||
id int(11) not null default '0'
|
||||
) engine=myisam default charset=latin1;
|
||||
insert into a values (123),(191),(192);
|
||||
create table b (
|
||||
id char(16) character set utf8 not null default ''
|
||||
) engine=myisam default charset=latin1;
|
||||
insert into b values ('58013'),('58014'),('58015'),('58016');
|
||||
create table c (
|
||||
a_id int(11) not null default '0',
|
||||
b_id char(16) character set utf8 default null
|
||||
) engine=myisam default charset=latin1;
|
||||
insert into c values
|
||||
(123,null),(123,null),(123,null),(123,null),(123,null),(123,'58013');
|
||||
create table t1 (id int(11) not null default '0');
|
||||
insert into t1 values (123),(191),(192);
|
||||
create table t2 (id char(16) character set utf8 not null);
|
||||
insert into t2 values ('58013'),('58014'),('58015'),('58016');
|
||||
create table t3 (a_id int(11) not null, b_id char(16) character set utf8);
|
||||
insert into t3 values (123,null),(123,null),(123,null),(123,null),(123,null),(123,'58013');
|
||||
select count(*)
|
||||
from a inner join (c left join b on b.id = c.b_id) on a.id = c.a_id;
|
||||
from t1 inner join (t3 left join t2 on t2.id = t3.b_id) on t1.id = t3.a_id;
|
||||
count(*)
|
||||
6
|
||||
select count(*)
|
||||
from a inner join (b right join c on b.id = c.b_id) on a.id = c.a_id;
|
||||
from t1 inner join (t2 right join t3 on t2.id = t3.b_id) on t1.id = t3.a_id;
|
||||
count(*)
|
||||
6
|
||||
drop table a, b, c;
|
||||
drop table t1,t2,t3;
|
||||
|
|
|
|||
|
|
@ -1916,7 +1916,7 @@ select bug3788()|
|
|||
bug3788()
|
||||
2005-03-04
|
||||
drop function bug3788|
|
||||
create function bug3788() returns binary(5) return 5|
|
||||
create function bug3788() returns binary(1) return 5|
|
||||
select bug3788()|
|
||||
bug3788()
|
||||
5
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ Table Create Table
|
|||
user CREATE TABLE `user` (
|
||||
`Host` char(60) collate utf8_bin NOT NULL default '',
|
||||
`User` char(16) collate utf8_bin NOT NULL default '',
|
||||
`Password` binary(41) NOT NULL default '',
|
||||
`Password` char(41) character set latin1 collate latin1_bin NOT NULL default '',
|
||||
`Select_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
|
||||
`Insert_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
|
||||
`Update_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
|
||||
|
|
|
|||
113
mysql-test/r/type_binary.result
Normal file
113
mysql-test/r/type_binary.result
Normal file
|
|
@ -0,0 +1,113 @@
|
|||
create table t1 (s1 binary(3));
|
||||
insert into t1 values (0x61), (0x6120), (0x612020);
|
||||
select hex(s1) from t1;
|
||||
hex(s1)
|
||||
610000
|
||||
612000
|
||||
612020
|
||||
drop table t1;
|
||||
create table t1 (s1 binary(2), s2 varbinary(2));
|
||||
insert into t1 values (0x4100,0x4100);
|
||||
select length(concat('*',s1,'*',s2,'*')) from t1;
|
||||
length(concat('*',s1,'*',s2,'*'))
|
||||
7
|
||||
delete from t1;
|
||||
insert into t1 values (0x4120,0x4120);
|
||||
select length(concat('*',s1,'*',s2,'*')) from t1;
|
||||
length(concat('*',s1,'*',s2,'*'))
|
||||
7
|
||||
drop table t1;
|
||||
create table t1 (s1 varbinary(20), s2 varbinary(20));
|
||||
show create table t1;
|
||||
Table Create Table
|
||||
t1 CREATE TABLE `t1` (
|
||||
`s1` varbinary(20) default NULL,
|
||||
`s2` varbinary(20) default NULL
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||
insert into t1 values (0x41,0x4100),(0x41,0x4120),(0x4100,0x4120);
|
||||
select hex(s1), hex(s2) from t1;
|
||||
hex(s1) hex(s2)
|
||||
41 4100
|
||||
41 4120
|
||||
4100 4120
|
||||
select count(*) from t1 where s1 < s2;
|
||||
count(*)
|
||||
3
|
||||
drop table t1;
|
||||
create table t1 (s1 varbinary(2), s2 varchar(1));
|
||||
insert into t1 values (0x41,'a'), (0x4100,'b'), (0x41,'c'), (0x4100,'d');
|
||||
select hex(s1),s2 from t1 order by s1,s2;
|
||||
hex(s1) s2
|
||||
41 a
|
||||
41 c
|
||||
4100 b
|
||||
4100 d
|
||||
drop table t1;
|
||||
create table t1 (s1 binary(2) primary key);
|
||||
insert into t1 values (0x01);
|
||||
insert into t1 values (0x0120);
|
||||
insert into t1 values (0x0100);
|
||||
ERROR 23000: Duplicate entry '' for key 1
|
||||
select hex(s1) from t1 order by s1;
|
||||
hex(s1)
|
||||
0100
|
||||
0120
|
||||
select hex(s1) from t1 where s1=0x01;
|
||||
hex(s1)
|
||||
select hex(s1) from t1 where s1=0x0120;
|
||||
hex(s1)
|
||||
0120
|
||||
select hex(s1) from t1 where s1=0x0100;
|
||||
hex(s1)
|
||||
0100
|
||||
select count(distinct s1) from t1;
|
||||
count(distinct s1)
|
||||
2
|
||||
alter table t1 drop primary key;
|
||||
select hex(s1) from t1 where s1=0x01;
|
||||
hex(s1)
|
||||
select hex(s1) from t1 where s1=0x0120;
|
||||
hex(s1)
|
||||
0120
|
||||
select hex(s1) from t1 where s1=0x0100;
|
||||
hex(s1)
|
||||
0100
|
||||
select count(distinct s1) from t1;
|
||||
count(distinct s1)
|
||||
2
|
||||
drop table t1;
|
||||
create table t1 (s1 varbinary(2) primary key);
|
||||
insert into t1 values (0x01);
|
||||
insert into t1 values (0x0120);
|
||||
insert into t1 values (0x0100);
|
||||
select hex(s1) from t1 order by s1;
|
||||
hex(s1)
|
||||
01
|
||||
0100
|
||||
0120
|
||||
select hex(s1) from t1 where s1=0x01;
|
||||
hex(s1)
|
||||
01
|
||||
select hex(s1) from t1 where s1=0x0120;
|
||||
hex(s1)
|
||||
0120
|
||||
select hex(s1) from t1 where s1=0x0100;
|
||||
hex(s1)
|
||||
0100
|
||||
select count(distinct s1) from t1;
|
||||
count(distinct s1)
|
||||
3
|
||||
alter table t1 drop primary key;
|
||||
select hex(s1) from t1 where s1=0x01;
|
||||
hex(s1)
|
||||
01
|
||||
select hex(s1) from t1 where s1=0x0120;
|
||||
hex(s1)
|
||||
0120
|
||||
select hex(s1) from t1 where s1=0x0100;
|
||||
hex(s1)
|
||||
0100
|
||||
select count(distinct s1) from t1;
|
||||
count(distinct s1)
|
||||
3
|
||||
drop table t1;
|
||||
|
|
@ -67,7 +67,7 @@ select * from t1;
|
|||
a
|
||||
Where
|
||||
drop table t1;
|
||||
create table t1 (t text,c char(10),b blob, d binary(10));
|
||||
create table t1 (t text,c char(10),b blob, d varbinary(10));
|
||||
insert into t1 values (NULL,NULL,NULL,NULL);
|
||||
insert into t1 values ("","","","");
|
||||
insert into t1 values ("hello","hello","hello","hello");
|
||||
|
|
@ -83,14 +83,14 @@ Field Type Collation Null Key Default Extra Privileges Comment
|
|||
t text latin1_swedish_ci YES NULL #
|
||||
c char(10) latin1_swedish_ci YES NULL #
|
||||
b blob NULL YES NULL #
|
||||
d binary(10) NULL YES NULL #
|
||||
d varbinary(10) NULL YES NULL #
|
||||
lock tables t1 WRITE;
|
||||
show full fields from t1;
|
||||
Field Type Collation Null Key Default Extra Privileges Comment
|
||||
t text latin1_swedish_ci YES NULL #
|
||||
c char(10) latin1_swedish_ci YES NULL #
|
||||
b blob NULL YES NULL #
|
||||
d binary(10) NULL YES NULL #
|
||||
d varbinary(10) NULL YES NULL #
|
||||
unlock tables;
|
||||
select t from t1 where t like "hello";
|
||||
t
|
||||
|
|
@ -718,3 +718,73 @@ t1 CREATE TABLE `t1` (
|
|||
KEY `a` (`a`,`b`,`d`,`e`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||
drop table t1;
|
||||
CREATE table t1 (a blob);
|
||||
insert into t1 values ('b'),('a\0'),('a'),('a '),('aa'),(NULL);
|
||||
select hex(a) from t1 order by a;
|
||||
hex(a)
|
||||
NULL
|
||||
61
|
||||
6100
|
||||
6120
|
||||
6161
|
||||
62
|
||||
select hex(concat(a,'\0')) as b from t1 order by concat(a,'\0');
|
||||
b
|
||||
NULL
|
||||
6100
|
||||
610000
|
||||
612000
|
||||
616100
|
||||
6200
|
||||
alter table t1 modify a varbinary(5);
|
||||
select hex(a) from t1 order by a;
|
||||
hex(a)
|
||||
NULL
|
||||
61
|
||||
6100
|
||||
6120
|
||||
6161
|
||||
62
|
||||
select hex(concat(a,'\0')) as b from t1 order by concat(a,'\0');
|
||||
b
|
||||
NULL
|
||||
6100
|
||||
610000
|
||||
612000
|
||||
616100
|
||||
6200
|
||||
alter table t1 modify a char(5);
|
||||
select hex(a) from t1 order by a;
|
||||
hex(a)
|
||||
NULL
|
||||
6100
|
||||
61
|
||||
61
|
||||
6161
|
||||
62
|
||||
select hex(concat(a,'\0')) as b from t1 order by concat(a,'\0');
|
||||
b
|
||||
NULL
|
||||
610000
|
||||
6100
|
||||
6100
|
||||
616100
|
||||
6200
|
||||
alter table t1 modify a binary(5);
|
||||
select hex(a) from t1 order by a;
|
||||
hex(a)
|
||||
NULL
|
||||
6100000000
|
||||
6100000000
|
||||
6100000000
|
||||
6161000000
|
||||
6200000000
|
||||
select hex(concat(a,'\0')) as b from t1 order by concat(a,'\0');
|
||||
b
|
||||
NULL
|
||||
610000000000
|
||||
610000000000
|
||||
610000000000
|
||||
616100000000
|
||||
620000000000
|
||||
drop table t1;
|
||||
|
|
|
|||
8
mysql-test/r/wait_timeout.result
Normal file
8
mysql-test/r/wait_timeout.result
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
select 1;
|
||||
1
|
||||
1
|
||||
select 2;
|
||||
ERROR HY000: MySQL server has gone away
|
||||
select 3;
|
||||
3
|
||||
3
|
||||
|
|
@ -278,7 +278,7 @@ insert into t1 values ('
|
|||
select a,hex(a) from t1;
|
||||
alter table t1 change a a char(10) character set cp1251;
|
||||
select a,hex(a) from t1;
|
||||
alter table t1 change a a binary(10);
|
||||
alter table t1 change a a binary(4);
|
||||
select a,hex(a) from t1;
|
||||
alter table t1 change a a char(10) character set cp1251;
|
||||
select a,hex(a) from t1;
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ drop table t1;
|
|||
#
|
||||
# Test of binary and upper/lower
|
||||
#
|
||||
create table t1 (a char(15) binary, b binary(15));
|
||||
create table t1 (a char(3) binary, b binary(3));
|
||||
insert into t1 values ('aaa','bbb'),('AAA','BBB');
|
||||
select upper(a),upper(b) from t1;
|
||||
select lower(a),lower(b) from t1;
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ drop table t1;
|
|||
# Bug 2202
|
||||
# CAST from BINARY to non-BINARY and from non-BINARY to BINARY
|
||||
#
|
||||
create table t1 (a binary(10), b char(10) character set koi8r);
|
||||
create table t1 (a binary(4), b char(4) character set koi8r);
|
||||
insert into t1 values (_binary'ÔÅÓÔ',_binary'ÔÅÓÔ');
|
||||
select a,b,cast(a as char character set cp1251),cast(b as binary) from t1;
|
||||
set names koi8r;
|
||||
|
|
|
|||
|
|
@ -38,4 +38,19 @@ INSERT INTO t1 VALUES(0xA741ADCCA66EB6DC20A7DAADCCABDCA66E);
|
|||
SELECT HEX(a) FROM t1 WHERE MATCH(a) AGAINST (0xA741ADCCA66EB6DC IN BOOLEAN MODE);
|
||||
DROP TABLE t1;
|
||||
|
||||
#
|
||||
# Bug#12476 Some big5 codes are still missing.
|
||||
#
|
||||
set names big5;
|
||||
create table t1 (a char character set big5);
|
||||
insert into t1 values (0xF9D6),(0xF9D7),(0xF9D8),(0xF9D9);
|
||||
insert into t1 values (0xF9DA),(0xF9DB),(0xF9DC);
|
||||
# Check round trip
|
||||
select hex(a) a, hex(@u:=convert(a using utf8)) b,
|
||||
hex(convert(@u using big5)) c from t1 order by a;
|
||||
# Check that there is no "illegal mix of collations" error with Unicode.
|
||||
alter table t1 convert to character set utf8;
|
||||
select hex(a) from t1 where a = _big5 0xF9DC;
|
||||
drop table t1;
|
||||
|
||||
# End of 4.1 tests
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ drop table t1;
|
|||
#
|
||||
# Test of binary and upper/lower
|
||||
#
|
||||
create table t1 (a char(15) binary, b binary(15)) character set cp1251;
|
||||
create table t1 (a char(3) binary, b binary(3)) character set cp1251;
|
||||
insert into t1 values ('aaa','bbb'),('AAA','BBB');
|
||||
select upper(a),upper(b) from t1;
|
||||
select lower(a),lower(b) from t1;
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ SET CHARACTER SET koi8r;
|
|||
SELECT * FROM t1;
|
||||
|
||||
|
||||
ALTER TABLE t1 ADD bin_f CHAR(32) BYTE NOT NULL default '';
|
||||
ALTER TABLE t1 ADD bin_f CHAR(1) BYTE NOT NULL default '';
|
||||
UPDATE t1 SET bin_f=koi8_ru_f;
|
||||
SELECT COUNT(DISTINCT bin_f),COUNT(DISTINCT koi8_ru_f),COUNT(DISTINCT utf8_f) FROM t1;
|
||||
|
||||
|
|
@ -204,7 +204,7 @@ UPDATE t1 SET greek_f=CONVERT(ucs2_f USING greek) WHERE comment LIKE _latin2'GRE
|
|||
UPDATE t1 SET armscii8_f=CONVERT(ucs2_f USING armscii8) WHERE comment LIKE _latin2'ARM%';
|
||||
UPDATE t1 SET utf8_f=CONVERT(ucs2_f USING utf8) WHERE utf8_f=_utf8'';
|
||||
UPDATE t1 SET ucs2_f=CONVERT(utf8_f USING ucs2) WHERE ucs2_f=_ucs2'';
|
||||
SELECT * FROM t1;
|
||||
SELECT comment, koi8_ru_f, utf8_f, hex(bin_f), ucs2_f, armscii8_f, greek_f FROM t1;
|
||||
SET CHARACTER SET 'binary';
|
||||
SELECT * FROM t1;
|
||||
SELECT min(comment),count(*) FROM t1 GROUP BY ucs2_f;
|
||||
|
|
|
|||
|
|
@ -851,6 +851,14 @@ insert into t1 values (_utf8 0x5b);
|
|||
select hex(a) from t1;
|
||||
drop table t1;
|
||||
|
||||
#
|
||||
# Bug#13751 find_in_set: Illegal mix of collations
|
||||
#
|
||||
set names 'latin1';
|
||||
create table t1 (a varchar(255)) default charset=utf8;
|
||||
select * from t1 where find_in_set('-1', a);
|
||||
drop table t1;
|
||||
|
||||
# End of 4.1 tests
|
||||
|
||||
#
|
||||
|
|
@ -871,22 +879,32 @@ DROP TABLE t1;
|
|||
#
|
||||
set names utf8;
|
||||
# correct value
|
||||
select hex(char(1));
|
||||
select char(0xd1,0x8f);
|
||||
select char(0xd18f);
|
||||
select char(53647);
|
||||
select hex(char(1 using utf8));
|
||||
select char(0xd1,0x8f using utf8);
|
||||
select char(0xd18f using utf8);
|
||||
select char(53647 using utf8);
|
||||
# incorrect value: return with warning
|
||||
select char(0xff,0x8f);
|
||||
select char(0xff,0x8f using utf8);
|
||||
# incorrect value in strict mode: return NULL with "Error" level warning
|
||||
set sql_mode=traditional;
|
||||
select char(0xff,0x8f);
|
||||
select convert(char(0xff,0x8f) using utf8);
|
||||
select char(195);
|
||||
select convert(char(195) using utf8);
|
||||
select char(196);
|
||||
select convert(char(196) using utf8);
|
||||
select char(0xff,0x8f using utf8);
|
||||
select char(195 using utf8);
|
||||
select char(196 using utf8);
|
||||
select char(2557 using utf8);
|
||||
|
||||
#
|
||||
# Check convert + char + using
|
||||
#
|
||||
select hex(convert(char(2557 using latin1) using utf8));
|
||||
|
||||
#
|
||||
# char() without USING returns "binary" by default, any argument is ok
|
||||
#
|
||||
select hex(char(195));
|
||||
select hex(char(196));
|
||||
select hex(char(2557));
|
||||
select hex(convert(char(2557) using utf8));
|
||||
|
||||
|
||||
|
||||
#
|
||||
# Bug#12891: UNION doesn't return DISTINCT result for multi-byte characters
|
||||
|
|
|
|||
|
|
@ -351,7 +351,7 @@ DROP TABLE IF EXISTS federated.t1;
|
|||
CREATE TABLE federated.t1 (
|
||||
`id` int NOT NULL auto_increment,
|
||||
`name` char(32) NOT NULL DEFAULT '',
|
||||
`bincol` binary(4) NOT NULL,
|
||||
`bincol` binary(1) NOT NULL,
|
||||
`floatval` decimal(5,2) NOT NULL DEFAULT 0.0,
|
||||
`other` int NOT NULL DEFAULT 0,
|
||||
PRIMARY KEY (id),
|
||||
|
|
@ -366,7 +366,7 @@ DROP TABLE IF EXISTS federated.t1;
|
|||
eval CREATE TABLE federated.t1 (
|
||||
`id` int NOT NULL auto_increment,
|
||||
`name` char(32) NOT NULL DEFAULT '',
|
||||
`bincol` binary(4) NOT NULL,
|
||||
`bincol` binary(1) NOT NULL,
|
||||
`floatval` decimal(5,2) NOT NULL DEFAULT 0.0,
|
||||
`other` int NOT NULL DEFAULT 0,
|
||||
PRIMARY KEY (id),
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@
|
|||
# simple test of all group functions
|
||||
#
|
||||
|
||||
--source include/have_innodb.inc
|
||||
|
||||
--disable_warnings
|
||||
drop table if exists t1,t2;
|
||||
--enable_warnings
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ select 1 in ('1.1',2.0);
|
|||
|
||||
# Test case for bug #6365
|
||||
|
||||
create table t1 (a char(20) character set binary);
|
||||
create table t1 (a char(2) character set binary);
|
||||
insert into t1 values ('aa'), ('bb');
|
||||
select * from t1 where a in (NULL, 'aa');
|
||||
drop table t1;
|
||||
|
|
|
|||
|
|
@ -928,3 +928,37 @@ set global time_zone='Europe/Moscow';
|
|||
drop table t1;
|
||||
set global time_zone=default;
|
||||
set time_zone=default;
|
||||
|
||||
#
|
||||
# Test of fix to BUG 13146 - ansi quotes break loading of triggers
|
||||
#
|
||||
--disable_warnings
|
||||
DROP TABLE IF EXISTS `t1 test`;
|
||||
CREATE TABLE `t1 test` (
|
||||
`a1` int(11) default NULL
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
|
||||
|
||||
DROP TABLE IF EXISTS `t2 test`;
|
||||
CREATE TABLE `t2 test` (
|
||||
`a2` int(11) default NULL
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
|
||||
--enable_warnings
|
||||
|
||||
DELIMITER //;
|
||||
CREATE TRIGGER `test trig` BEFORE INSERT ON `t1 test` FOR EACH ROW BEGIN
|
||||
INSERT INTO `t2 test` SET a2 = NEW.a1; END //
|
||||
DELIMITER ;//
|
||||
|
||||
INSERT INTO `t1 test` VALUES (1);
|
||||
INSERT INTO `t1 test` VALUES (2);
|
||||
INSERT INTO `t1 test` VALUES (3);
|
||||
SELECT * FROM `t2 test`;
|
||||
# dump with compatible=ansi. Everything except triggers should be double
|
||||
# quoted
|
||||
--exec $MYSQL_DUMP --skip-comments --compatible=ansi --triggers test
|
||||
|
||||
--disable_warnings
|
||||
DROP TRIGGER `test trig`;
|
||||
DROP TABLE `t1 test`;
|
||||
DROP TABLE `t2 test`;
|
||||
--enable_warnings
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ CREATE TABLE t1 (
|
|||
auto int(5) unsigned NOT NULL auto_increment,
|
||||
string char(10),
|
||||
vstring varchar(10),
|
||||
bin binary(7),
|
||||
bin binary(2),
|
||||
vbin varbinary(7),
|
||||
tiny tinyint(4) DEFAULT '0' NOT NULL ,
|
||||
short smallint(6) DEFAULT '1' NOT NULL ,
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ CREATE TABLE t1 (
|
|||
auto int(5) unsigned NOT NULL auto_increment,
|
||||
string char(10) default "hello",
|
||||
vstring varchar(10) default "hello",
|
||||
bin binary(7),
|
||||
bin binary(2),
|
||||
vbin varbinary(7),
|
||||
tiny tinyint(4) DEFAULT '0' NOT NULL ,
|
||||
short smallint(6) DEFAULT '1' NOT NULL ,
|
||||
|
|
|
|||
|
|
@ -628,6 +628,6 @@ explain select * from t2 where a = 'a' or a='a ';
|
|||
update t1 set a='b' where a<>'a';
|
||||
--replace_column 9 #
|
||||
explain select * from t1 where a not between 'b' and 'b';
|
||||
select * from t1 where a not between 'b' and 'b';
|
||||
select a, hex(filler) from t1 where a not between 'b' and 'b';
|
||||
|
||||
drop table t1,t2,t3;
|
||||
|
|
|
|||
|
|
@ -4,6 +4,10 @@
|
|||
|
||||
source include/master-slave.inc;
|
||||
|
||||
--disable_warnings
|
||||
drop table if exists t1,t2;
|
||||
--enable_warnings
|
||||
|
||||
CREATE TABLE t1 (
|
||||
a int unsigned not null auto_increment primary key,
|
||||
b int unsigned
|
||||
|
|
@ -32,4 +36,27 @@ sync_with_master;
|
|||
SELECT * FROM t1 ORDER BY a;
|
||||
SELECT * FROM t2 ORDER BY a;
|
||||
|
||||
connection master;
|
||||
drop table t1,t2;
|
||||
sync_slave_with_master;
|
||||
|
||||
#
|
||||
# BUG#13236 multi-update with subquery & --replicate-ignore-table
|
||||
#
|
||||
reset master;
|
||||
|
||||
connection master;
|
||||
CREATE TABLE t1 ( a INT );
|
||||
INSERT INTO t1 VALUES (0);
|
||||
UPDATE t1, (SELECT 3 as b) AS x SET t1.a = x.b;
|
||||
select * from t1;
|
||||
sync_slave_with_master;
|
||||
|
||||
connection slave;
|
||||
select * from t1;
|
||||
|
||||
connection master;
|
||||
drop table t1;
|
||||
sync_slave_with_master;
|
||||
|
||||
# End of 4.1 tests
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
#
|
||||
|
||||
--disable_warnings
|
||||
drop table if exists t1,t2,t3,t4;
|
||||
drop table if exists t1,t2,t3,t4,t11;
|
||||
# The following may be left from older tests
|
||||
drop table if exists t1_1,t1_2,t9_1,t9_2,t1aa,t2aa;
|
||||
drop view if exists v1;
|
||||
|
|
@ -2069,6 +2069,7 @@ AND FK_firma_id = 2;
|
|||
|
||||
drop table t1;
|
||||
|
||||
#
|
||||
#
|
||||
# Test for Bug#8009, SELECT failed on bigint unsigned when using HEX
|
||||
#
|
||||
|
|
@ -2181,6 +2182,16 @@ select found_rows();
|
|||
|
||||
DROP TABLE t1;
|
||||
|
||||
#
|
||||
# Bug 7672 Unknown column error in order clause
|
||||
#
|
||||
CREATE TABLE t1 (a INT, b INT);
|
||||
(SELECT a, b AS c FROM t1) ORDER BY c+1;
|
||||
(SELECT a, b AS c FROM t1) ORDER BY b+1;
|
||||
SELECT a, b AS c FROM t1 ORDER BY c+1;
|
||||
SELECT a, b AS c FROM t1 ORDER BY b+1;
|
||||
drop table t1;
|
||||
|
||||
#
|
||||
# Bug #13356 assertion failed in resolve_const_item()
|
||||
#
|
||||
|
|
@ -2195,6 +2206,44 @@ select * from t1,t2 where f1=f3 and (f1,f2) = (2,null);
|
|||
select * from t1,t2 where f1=f3 and (f1,f2) <=> (2,null);
|
||||
drop table t1,t2;
|
||||
|
||||
#
|
||||
# Bug #13535
|
||||
#
|
||||
create table t1 (f1 int not null auto_increment primary key, f2 varchar(10));
|
||||
create table t11 like t1;
|
||||
insert into t1 values(1,""),(2,"");
|
||||
--replace_column 7 X 8 X 9 X 10 X 11 X 12 X 13 X 14 X
|
||||
show table status like 't1%';
|
||||
select 123 as a from t1 where f1 is null;
|
||||
drop table t1,t11;
|
||||
|
||||
# Bug 7672 Unknown column error in order clause
|
||||
#
|
||||
CREATE TABLE t1 (a INT, b INT);
|
||||
(SELECT a, b AS c FROM t1) ORDER BY c+1;
|
||||
(SELECT a, b AS c FROM t1) ORDER BY b+1;
|
||||
SELECT a, b AS c FROM t1 ORDER BY c+1;
|
||||
SELECT a, b AS c FROM t1 ORDER BY b+1;
|
||||
drop table t1;
|
||||
|
||||
#
|
||||
# Bug #3874 (function in GROUP and LEFT JOIN)
|
||||
#
|
||||
|
||||
CREATE TABLE t1 ( a INT NOT NULL, b INT NOT NULL, UNIQUE idx (a,b) );
|
||||
INSERT INTO t1 VALUES (1,1),(1,2),(1,3),(1,4);
|
||||
CREATE TABLE t2 ( a INT NOT NULL, b INT NOT NULL, e INT );
|
||||
INSERT INTO t2 VALUES ( 1,10,1), (1,10,2), (1,11,1), (1,11,2), (1,2,1), (1,2,2),(1,2,3);
|
||||
SELECT t2.a, t2.b, IF(t1.b IS NULL,'',e) AS c, COUNT(*) AS d FROM t2 LEFT JOIN
|
||||
t1 ON t2.a = t1.a AND t2.b = t1.b GROUP BY a, b, c;
|
||||
SELECT t2.a, t2.b, IF(t1.b IS NULL,'',e) AS c, COUNT(*) AS d FROM t2 LEFT JOIN
|
||||
t1 ON t2.a = t1.a AND t2.b = t1.b GROUP BY t1.a, t1.b, c;
|
||||
SELECT t2.a, t2.b, IF(t1.b IS NULL,'',e) AS c, COUNT(*) AS d FROM t2 LEFT JOIN
|
||||
t1 ON t2.a = t1.a AND t2.b = t1.b GROUP BY t2.a, t2.b, c;
|
||||
SELECT t2.a, t2.b, IF(t1.b IS NULL,'',e) AS c, COUNT(*) AS d FROM t2,t1
|
||||
WHERE t2.a = t1.a AND t2.b = t1.b GROUP BY a, b, c;
|
||||
DROP TABLE IF EXISTS t1, t2;
|
||||
|
||||
# End of 4.1 tests
|
||||
|
||||
#
|
||||
|
|
@ -2585,31 +2634,18 @@ drop view v1, v2, v3;
|
|||
# nested right join.
|
||||
#
|
||||
|
||||
create table a (
|
||||
id int(11) not null default '0'
|
||||
) engine=myisam default charset=latin1;
|
||||
|
||||
insert into a values (123),(191),(192);
|
||||
|
||||
create table b (
|
||||
id char(16) character set utf8 not null default ''
|
||||
) engine=myisam default charset=latin1;
|
||||
|
||||
insert into b values ('58013'),('58014'),('58015'),('58016');
|
||||
|
||||
create table c (
|
||||
a_id int(11) not null default '0',
|
||||
b_id char(16) character set utf8 default null
|
||||
) engine=myisam default charset=latin1;
|
||||
|
||||
insert into c values
|
||||
(123,null),(123,null),(123,null),(123,null),(123,null),(123,'58013');
|
||||
create table t1 (id int(11) not null default '0');
|
||||
insert into t1 values (123),(191),(192);
|
||||
create table t2 (id char(16) character set utf8 not null);
|
||||
insert into t2 values ('58013'),('58014'),('58015'),('58016');
|
||||
create table t3 (a_id int(11) not null, b_id char(16) character set utf8);
|
||||
insert into t3 values (123,null),(123,null),(123,null),(123,null),(123,null),(123,'58013');
|
||||
|
||||
-- both queries are equivalent
|
||||
select count(*)
|
||||
from a inner join (c left join b on b.id = c.b_id) on a.id = c.a_id;
|
||||
from t1 inner join (t3 left join t2 on t2.id = t3.b_id) on t1.id = t3.a_id;
|
||||
|
||||
select count(*)
|
||||
from a inner join (b right join c on b.id = c.b_id) on a.id = c.a_id;
|
||||
from t1 inner join (t2 right join t3 on t2.id = t3.b_id) on t1.id = t3.a_id;
|
||||
|
||||
drop table a, b, c;
|
||||
drop table t1,t2,t3;
|
||||
|
|
|
|||
|
|
@ -2431,7 +2431,7 @@ create function bug3788() returns date return cast("2005-03-04" as date)|
|
|||
select bug3788()|
|
||||
drop function bug3788|
|
||||
|
||||
create function bug3788() returns binary(5) return 5|
|
||||
create function bug3788() returns binary(1) return 5|
|
||||
select bug3788()|
|
||||
drop function bug3788|
|
||||
|
||||
|
|
|
|||
67
mysql-test/t/type_binary.test
Normal file
67
mysql-test/t/type_binary.test
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
# check 0x00 padding
|
||||
create table t1 (s1 binary(3));
|
||||
insert into t1 values (0x61), (0x6120), (0x612020);
|
||||
select hex(s1) from t1;
|
||||
drop table t1;
|
||||
|
||||
# check that 0x00 is not stripped in val_str
|
||||
create table t1 (s1 binary(2), s2 varbinary(2));
|
||||
insert into t1 values (0x4100,0x4100);
|
||||
select length(concat('*',s1,'*',s2,'*')) from t1;
|
||||
delete from t1;
|
||||
insert into t1 values (0x4120,0x4120);
|
||||
select length(concat('*',s1,'*',s2,'*')) from t1;
|
||||
drop table t1;
|
||||
|
||||
# check that trailing 0x00 and 0x20 do matter on comparison
|
||||
create table t1 (s1 varbinary(20), s2 varbinary(20));
|
||||
show create table t1;
|
||||
insert into t1 values (0x41,0x4100),(0x41,0x4120),(0x4100,0x4120);
|
||||
select hex(s1), hex(s2) from t1;
|
||||
select count(*) from t1 where s1 < s2;
|
||||
drop table t1;
|
||||
|
||||
# check that trailing 0x00 do matter on filesort
|
||||
create table t1 (s1 varbinary(2), s2 varchar(1));
|
||||
insert into t1 values (0x41,'a'), (0x4100,'b'), (0x41,'c'), (0x4100,'d');
|
||||
select hex(s1),s2 from t1 order by s1,s2;
|
||||
drop table t1;
|
||||
|
||||
# check that 0x01 is padded to 0x0100 and thus we get a duplicate value
|
||||
create table t1 (s1 binary(2) primary key);
|
||||
insert into t1 values (0x01);
|
||||
insert into t1 values (0x0120);
|
||||
--error 1062
|
||||
insert into t1 values (0x0100);
|
||||
select hex(s1) from t1 order by s1;
|
||||
# check index search
|
||||
select hex(s1) from t1 where s1=0x01;
|
||||
select hex(s1) from t1 where s1=0x0120;
|
||||
select hex(s1) from t1 where s1=0x0100;
|
||||
select count(distinct s1) from t1;
|
||||
alter table t1 drop primary key;
|
||||
# check non-indexed search
|
||||
select hex(s1) from t1 where s1=0x01;
|
||||
select hex(s1) from t1 where s1=0x0120;
|
||||
select hex(s1) from t1 where s1=0x0100;
|
||||
select count(distinct s1) from t1;
|
||||
drop table t1;
|
||||
|
||||
# check that 0x01 is not padded, and all three values are unique
|
||||
create table t1 (s1 varbinary(2) primary key);
|
||||
insert into t1 values (0x01);
|
||||
insert into t1 values (0x0120);
|
||||
insert into t1 values (0x0100);
|
||||
select hex(s1) from t1 order by s1;
|
||||
# check index search
|
||||
select hex(s1) from t1 where s1=0x01;
|
||||
select hex(s1) from t1 where s1=0x0120;
|
||||
select hex(s1) from t1 where s1=0x0100;
|
||||
select count(distinct s1) from t1;
|
||||
alter table t1 drop primary key;
|
||||
# check non-indexed search
|
||||
select hex(s1) from t1 where s1=0x01;
|
||||
select hex(s1) from t1 where s1=0x0120;
|
||||
select hex(s1) from t1 where s1=0x0100;
|
||||
select count(distinct s1) from t1;
|
||||
drop table t1;
|
||||
|
|
@ -67,9 +67,9 @@ select * from t1;
|
|||
drop table t1;
|
||||
|
||||
#
|
||||
# test of blob, text, char and char binary
|
||||
# test of blob, text, char and varbinary
|
||||
#
|
||||
create table t1 (t text,c char(10),b blob, d binary(10));
|
||||
create table t1 (t text,c char(10),b blob, d varbinary(10));
|
||||
insert into t1 values (NULL,NULL,NULL,NULL);
|
||||
insert into t1 values ("","","","");
|
||||
insert into t1 values ("hello","hello","hello","hello");
|
||||
|
|
@ -404,3 +404,22 @@ alter table t1 add primary key (a,b,c(255),d);
|
|||
alter table t1 add key (a,b,d,e);
|
||||
show create table t1;
|
||||
drop table t1;
|
||||
|
||||
#
|
||||
# Test that blob's and varbinary are sorted according to length
|
||||
#
|
||||
|
||||
CREATE table t1 (a blob);
|
||||
insert into t1 values ('b'),('a\0'),('a'),('a '),('aa'),(NULL);
|
||||
select hex(a) from t1 order by a;
|
||||
select hex(concat(a,'\0')) as b from t1 order by concat(a,'\0');
|
||||
alter table t1 modify a varbinary(5);
|
||||
select hex(a) from t1 order by a;
|
||||
select hex(concat(a,'\0')) as b from t1 order by concat(a,'\0');
|
||||
alter table t1 modify a char(5);
|
||||
select hex(a) from t1 order by a;
|
||||
select hex(concat(a,'\0')) as b from t1 order by concat(a,'\0');
|
||||
alter table t1 modify a binary(5);
|
||||
select hex(a) from t1 order by a;
|
||||
select hex(concat(a,'\0')) as b from t1 order by concat(a,'\0');
|
||||
drop table t1;
|
||||
|
|
|
|||
1
mysql-test/t/wait_timeout-master.opt
Normal file
1
mysql-test/t/wait_timeout-master.opt
Normal file
|
|
@ -0,0 +1 @@
|
|||
--wait-timeout=2
|
||||
11
mysql-test/t/wait_timeout.test
Normal file
11
mysql-test/t/wait_timeout.test
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
#
|
||||
# Bug #8731: wait_timeout does not work on Mac OS X
|
||||
#
|
||||
--disable_reconnect
|
||||
select 1;
|
||||
# wait_timeout is 2, so we should get disconnected now
|
||||
--sleep 5
|
||||
--error 2006
|
||||
select 2;
|
||||
--enable_reconnect
|
||||
select 3;
|
||||
|
|
@ -404,23 +404,6 @@ int sigwait(sigset_t *setp, int *sigp)
|
|||
#endif /* DONT_USE_SIGSUSPEND */
|
||||
#endif /* HAVE_SIGWAIT */
|
||||
|
||||
/*****************************************************************************
|
||||
** Implement pthread_signal for systems that can't use signal() with threads
|
||||
** Currently this is only used with BSDI 3.0
|
||||
*****************************************************************************/
|
||||
|
||||
#ifdef USE_PTHREAD_SIGNAL
|
||||
|
||||
int pthread_signal(int sig, void (*func)())
|
||||
{
|
||||
struct sigaction sact;
|
||||
sact.sa_flags= 0;
|
||||
sact.sa_handler= func;
|
||||
sigemptyset(&sact.sa_mask);
|
||||
sigaction(sig, &sact, (struct sigaction*) 0);
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
The following functions fixes that all pthread functions should work
|
||||
|
|
|
|||
|
|
@ -80,17 +80,7 @@ void init_thr_alarm(uint max_alarms)
|
|||
pthread_mutex_init(&LOCK_alarm,MY_MUTEX_INIT_FAST);
|
||||
pthread_cond_init(&COND_alarm,NULL);
|
||||
#if THR_CLIENT_ALARM != SIGALRM || defined(USE_ALARM_THREAD)
|
||||
#if defined(HAVE_mit_thread)
|
||||
sigset(THR_CLIENT_ALARM,thread_alarm); /* int. thread system calls */
|
||||
#else
|
||||
{
|
||||
struct sigaction sact;
|
||||
sact.sa_flags = 0;
|
||||
bzero((char*) &sact, sizeof(sact));
|
||||
sact.sa_handler = thread_alarm;
|
||||
sigaction(THR_CLIENT_ALARM, &sact, (struct sigaction*) 0);
|
||||
}
|
||||
#endif
|
||||
my_sigset(THR_CLIENT_ALARM,thread_alarm);
|
||||
#endif
|
||||
sigemptyset(&s);
|
||||
sigaddset(&s, THR_SERVER_ALARM);
|
||||
|
|
@ -110,12 +100,12 @@ void init_thr_alarm(uint max_alarms)
|
|||
#elif defined(USE_ONE_SIGNAL_HAND)
|
||||
pthread_sigmask(SIG_BLOCK, &s, NULL); /* used with sigwait() */
|
||||
#if THR_SERVER_ALARM == THR_CLIENT_ALARM
|
||||
sigset(THR_CLIENT_ALARM,process_alarm); /* Linuxthreads */
|
||||
my_sigset(THR_CLIENT_ALARM,process_alarm); /* Linuxthreads */
|
||||
pthread_sigmask(SIG_UNBLOCK, &s, NULL);
|
||||
#endif
|
||||
#else
|
||||
my_sigset(THR_SERVER_ALARM, process_alarm);
|
||||
pthread_sigmask(SIG_UNBLOCK, &s, NULL);
|
||||
sigset(THR_SERVER_ALARM,process_alarm);
|
||||
#endif
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
|
@ -290,7 +280,7 @@ sig_handler process_alarm(int sig __attribute__((unused)))
|
|||
printf("thread_alarm\n"); fflush(stdout);
|
||||
#endif
|
||||
#ifdef DONT_REMEMBER_SIGNAL
|
||||
sigset(THR_CLIENT_ALARM,process_alarm); /* int. thread system calls */
|
||||
my_sigset(THR_CLIENT_ALARM,process_alarm); /* int. thread system calls */
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
|
|
@ -310,7 +300,7 @@ sig_handler process_alarm(int sig __attribute__((unused)))
|
|||
process_alarm_part2(sig);
|
||||
#ifndef USE_ALARM_THREAD
|
||||
#if defined(DONT_REMEMBER_SIGNAL) && !defined(USE_ONE_SIGNAL_HAND)
|
||||
sigset(THR_SERVER_ALARM,process_alarm);
|
||||
my_sigset(THR_SERVER_ALARM,process_alarm);
|
||||
#endif
|
||||
pthread_mutex_unlock(&LOCK_alarm);
|
||||
pthread_sigmask(SIG_SETMASK,&old_mask,NULL);
|
||||
|
|
@ -512,7 +502,7 @@ static sig_handler thread_alarm(int sig)
|
|||
printf("thread_alarm\n"); fflush(stdout);
|
||||
#endif
|
||||
#ifdef DONT_REMEMBER_SIGNAL
|
||||
sigset(sig,thread_alarm); /* int. thread system calls */
|
||||
my_sigset(sig,thread_alarm); /* int. thread system calls */
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
|
@ -916,7 +906,7 @@ static sig_handler print_signal_warning(int sig)
|
|||
printf("Warning: Got signal %d from thread %s\n",sig,my_thread_name());
|
||||
fflush(stdout);
|
||||
#ifdef DONT_REMEMBER_SIGNAL
|
||||
sigset(sig,print_signal_warning); /* int. thread system calls */
|
||||
my_sigset(sig,print_signal_warning); /* int. thread system calls */
|
||||
#endif
|
||||
#ifndef OS2
|
||||
if (sig == SIGALRM)
|
||||
|
|
|
|||
|
|
@ -104,6 +104,7 @@ typedef ndbd_exit_classification_enum ndbd_exit_classification;
|
|||
|
||||
/* NDBCNTR 6100-> */
|
||||
#define NDBD_EXIT_RESTART_TIMEOUT 6100
|
||||
#define NDBD_EXIT_RESTART_DURING_SHUTDOWN 6101
|
||||
|
||||
/* TC 6200-> */
|
||||
/* DIH 6300-> */
|
||||
|
|
|
|||
|
|
@ -525,6 +525,9 @@ Ndbcntr::execCNTR_START_REF(Signal * signal){
|
|||
cmasterNodeId = ref->masterNodeId;
|
||||
sendCntrStartReq(signal);
|
||||
return;
|
||||
case CntrStartRef::StopInProgress:
|
||||
jam();
|
||||
progError(__LINE__, NDBD_EXIT_RESTART_DURING_SHUTDOWN);
|
||||
}
|
||||
ndbrequire(false);
|
||||
}
|
||||
|
|
@ -2022,7 +2025,9 @@ Ndbcntr::execSTOP_REQ(Signal* signal){
|
|||
return;
|
||||
}
|
||||
|
||||
if(c_stopRec.stopReq.senderRef != 0){
|
||||
if(c_stopRec.stopReq.senderRef != 0 ||
|
||||
(cmasterNodeId == getOwnNodeId() && !c_start.m_starting.isclear()))
|
||||
{
|
||||
/**
|
||||
* Requested a system shutdown
|
||||
*/
|
||||
|
|
@ -2036,7 +2041,8 @@ Ndbcntr::execSTOP_REQ(Signal* signal){
|
|||
/**
|
||||
* Requested a node shutdown
|
||||
*/
|
||||
if(StopReq::getSystemStop(c_stopRec.stopReq.requestInfo))
|
||||
if(c_stopRec.stopReq.senderRef &&
|
||||
StopReq::getSystemStop(c_stopRec.stopReq.requestInfo))
|
||||
ref->errorCode = StopRef::SystemShutdownInProgress;
|
||||
else
|
||||
ref->errorCode = StopRef::NodeShutdownInProgress;
|
||||
|
|
|
|||
|
|
@ -101,6 +101,9 @@ static const ErrStruct errArray[] =
|
|||
{NDBD_EXIT_RESTART_TIMEOUT, XCE,
|
||||
"Total restart time too long, consider increasing StartFailureTimeout "
|
||||
"or investigate error(s) on other node(s)"},
|
||||
{NDBD_EXIT_RESTART_DURING_SHUTDOWN, XRE,
|
||||
"Node started while node shutdown in progress. "
|
||||
"Please wait until shutdown complete before starting node"},
|
||||
|
||||
/* DIH */
|
||||
{NDBD_EXIT_MAX_CRASHED_REPLICAS, XFL,
|
||||
|
|
|
|||
|
|
@ -277,15 +277,13 @@ static ErrorItem errorTable[] =
|
|||
{MgmtSrvr::NOT_POSSIBLE_TO_SEND_CONFIG_UPDATE_TO_PROCESS_TYPE,
|
||||
"It is not possible to send an update of a configuration variable "
|
||||
"to this kind of process."},
|
||||
{5026, "Node shutdown in progress" },
|
||||
{5027, "System shutdown in progress" },
|
||||
{5028, "Node shutdown would cause system crash" },
|
||||
{5029, "Only one shutdown at a time is possible via mgm server" },
|
||||
{5060, "Operation not allowed in single user mode." },
|
||||
{5061, "DB is not in single user mode." },
|
||||
{5062, "The specified node is not an API node." },
|
||||
{5063,
|
||||
"Cannot enter single user mode. DB nodes in inconsistent startlevel."},
|
||||
{MgmtSrvr::NODE_SHUTDOWN_IN_PROGESS, "Node shutdown in progress" },
|
||||
{MgmtSrvr::SYSTEM_SHUTDOWN_IN_PROGRESS, "System shutdown in progress" },
|
||||
{MgmtSrvr::NODE_SHUTDOWN_WOULD_CAUSE_SYSTEM_CRASH,
|
||||
"Node shutdown would cause system crash" },
|
||||
{MgmtSrvr::NODE_NOT_API_NODE, "The specified node is not an API node." },
|
||||
{MgmtSrvr::OPERATION_NOT_ALLOWED_START_STOP,
|
||||
"Operation not allowed while nodes are starting or stopping."},
|
||||
{MgmtSrvr::NO_CONTACT_WITH_DB_NODES, "No contact with database nodes" }
|
||||
};
|
||||
|
||||
|
|
@ -293,13 +291,13 @@ int MgmtSrvr::translateStopRef(Uint32 errCode)
|
|||
{
|
||||
switch(errCode){
|
||||
case StopRef::NodeShutdownInProgress:
|
||||
return 5026;
|
||||
return NODE_SHUTDOWN_IN_PROGESS;
|
||||
break;
|
||||
case StopRef::SystemShutdownInProgress:
|
||||
return 5027;
|
||||
return SYSTEM_SHUTDOWN_IN_PROGRESS;
|
||||
break;
|
||||
case StopRef::NodeShutdownWouldCauseSystemCrash:
|
||||
return 5028;
|
||||
return NODE_SHUTDOWN_WOULD_CAUSE_SYSTEM_CRASH;
|
||||
break;
|
||||
}
|
||||
return 4999;
|
||||
|
|
@ -989,6 +987,18 @@ int MgmtSrvr::sendSTOP_REQ(NodeId nodeId,
|
|||
|
||||
int MgmtSrvr::stopNode(int nodeId, bool abort)
|
||||
{
|
||||
if (!abort)
|
||||
{
|
||||
NodeId nodeId = 0;
|
||||
ClusterMgr::Node node;
|
||||
while(getNextNodeId(&nodeId, NDB_MGM_NODE_TYPE_NDB))
|
||||
{
|
||||
node = theFacade->theClusterMgr->getNodeInfo(nodeId);
|
||||
if((node.m_state.startLevel != NodeState::SL_STARTED) &&
|
||||
(node.m_state.startLevel != NodeState::SL_NOTHING))
|
||||
return OPERATION_NOT_ALLOWED_START_STOP;
|
||||
}
|
||||
}
|
||||
NodeBitmask nodes;
|
||||
return sendSTOP_REQ(nodeId,
|
||||
nodes,
|
||||
|
|
@ -1027,7 +1037,7 @@ int MgmtSrvr::stop(int * stopCount, bool abort)
|
|||
int MgmtSrvr::enterSingleUser(int * stopCount, Uint32 singleUserNodeId)
|
||||
{
|
||||
if (getNodeType(singleUserNodeId) != NDB_MGM_NODE_TYPE_API)
|
||||
return 5062;
|
||||
return NODE_NOT_API_NODE;
|
||||
NodeId nodeId = 0;
|
||||
ClusterMgr::Node node;
|
||||
while(getNextNodeId(&nodeId, NDB_MGM_NODE_TYPE_NDB))
|
||||
|
|
@ -1035,7 +1045,7 @@ int MgmtSrvr::enterSingleUser(int * stopCount, Uint32 singleUserNodeId)
|
|||
node = theFacade->theClusterMgr->getNodeInfo(nodeId);
|
||||
if((node.m_state.startLevel != NodeState::SL_STARTED) &&
|
||||
(node.m_state.startLevel != NodeState::SL_NOTHING))
|
||||
return 5063;
|
||||
return OPERATION_NOT_ALLOWED_START_STOP;
|
||||
}
|
||||
NodeBitmask nodes;
|
||||
int ret = sendSTOP_REQ(0,
|
||||
|
|
|
|||
|
|
@ -174,10 +174,12 @@ public:
|
|||
STATIC_CONST( NODE_SHUTDOWN_IN_PROGESS = 5026 );
|
||||
STATIC_CONST( SYSTEM_SHUTDOWN_IN_PROGRESS = 5027 );
|
||||
STATIC_CONST( NODE_SHUTDOWN_WOULD_CAUSE_SYSTEM_CRASH = 5028 );
|
||||
STATIC_CONST( NO_CONTACT_WITH_CLUSTER = 6666 );
|
||||
STATIC_CONST( OPERATION_IN_PROGRESS = 6667 );
|
||||
|
||||
|
||||
STATIC_CONST( NO_CONTACT_WITH_DB_NODES = 5030 );
|
||||
|
||||
STATIC_CONST( NODE_NOT_API_NODE = 5062 );
|
||||
STATIC_CONST( OPERATION_NOT_ALLOWED_START_STOP = 5063 );
|
||||
|
||||
/**
|
||||
* This enum specifies the different signal loggig modes possible to set
|
||||
* with the setSignalLoggingMode method.
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@ export AR='mwldnlm'
|
|||
export AR_FLAGS='-type library -o'
|
||||
export AS='mwasmnlm'
|
||||
export CC='mwccnlm -gccincludes'
|
||||
export CFLAGS='-enum int -O3 -align 8 -proc 686 -relax_pointers -dialect c'
|
||||
export CFLAGS='-enum int -align 8 -proc 686 -relax_pointers -dialect c'
|
||||
export CXX='mwccnlm -gccincludes'
|
||||
export CXXFLAGS='-enum int -O3 -align 8 -proc 686 -relax_pointers -dialect c++ -bool on -wchar_t on -D_WCHAR_T'
|
||||
export CXXFLAGS='-enum int -align 8 -proc 686 -relax_pointers -dialect c++ -bool on -wchar_t on -D_WCHAR_T'
|
||||
export LD='mwldnlm'
|
||||
export LDFLAGS='-entry _LibCPrelude -exit _LibCPostlude -map -flags pseudopreemption'
|
||||
export RANLIB=:
|
||||
|
|
|
|||
|
|
@ -173,7 +173,7 @@ void report_stats()
|
|||
log_msg("\nFailed %u/%u test(s), %.02f%% successful.\n",
|
||||
total_fail, total_test, percent);
|
||||
log_msg("\nThe .out and .err files in %s may give you some\n", result_dir);
|
||||
log_msg("hint of what when wrong.\n");
|
||||
log_msg("hint of what went wrong.\n");
|
||||
log_msg("\nIf you want to report this error, please first read the documentation\n");
|
||||
log_msg("at: http://www.mysql.com/doc/en/MySQL_test_suite.html\n");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,8 +2,10 @@
|
|||
# Pack ISAM
|
||||
#------------------------------------------------------------------------------
|
||||
MODULE libc.nlm
|
||||
SCREENNAME "MySQL ISAM Table Pack Tool"
|
||||
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||
DESCRIPTION "MySQL ISAM Table Pack Tool"
|
||||
SCREENNAME "MySQL ISAM Table Pack Tool"
|
||||
VERSION 4, 0
|
||||
XDCDATA ../netware/mysql.xdc
|
||||
#DEBUG
|
||||
|
|
|
|||
|
|
@ -271,8 +271,11 @@ rm -f $BASE/bin/Makefile* $BASE/bin/*.in $BASE/bin/*.sh \
|
|||
if [ $BASE_SYSTEM = "netware" ] ; then
|
||||
echo "CREATE DATABASE mysql;" > $BASE/bin/init_db.sql
|
||||
echo "CREATE DATABASE test;" >> $BASE/bin/init_db.sql
|
||||
sh ./scripts/mysql_create_system_tables.sh real >> $BASE/bin/init_db.sql
|
||||
sh ./scripts/mysql_create_system_tables.sh test > $BASE/bin/test_db.sql
|
||||
sh ./scripts/mysql_create_system_tables.sh real "" "%" 0 \
|
||||
>> $BASE/bin/init_db.sql
|
||||
sh ./scripts/mysql_create_system_tables.sh test "" "%" 0 \
|
||||
> $BASE/bin/test_db.sql
|
||||
./scripts/fill_help_tables < ./Docs/manual.texi >> ./netware/init_db.sql
|
||||
fi
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ then
|
|||
c_u="$c_u CREATE TABLE user ("
|
||||
c_u="$c_u Host char(60) binary DEFAULT '' NOT NULL,"
|
||||
c_u="$c_u User char(16) binary DEFAULT '' NOT NULL,"
|
||||
c_u="$c_u Password binary(41) DEFAULT '' NOT NULL,"
|
||||
c_u="$c_u Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL,"
|
||||
c_u="$c_u Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
|
||||
c_u="$c_u Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
|
||||
c_u="$c_u Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ ALTER TABLE user
|
|||
MODIFY User char(16) NOT NULL default '',
|
||||
ENGINE=MyISAM, CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
|
||||
ALTER TABLE user
|
||||
MODIFY Password binary(41) NOT NULL default '',
|
||||
MODIFY Password char(41) character set latin1 collate latin1_bin NOT NULL default '',
|
||||
MODIFY Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
|
||||
MODIFY Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
|
||||
MODIFY Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
|
||||
|
|
|
|||
46
sql/field.cc
46
sql/field.cc
|
|
@ -5881,7 +5881,8 @@ int Field_string::store(const char *from,uint length,CHARSET_INFO *cs)
|
|||
memcpy(ptr,from,copy_length);
|
||||
if (copy_length < field_length) // Append spaces if shorter
|
||||
field_charset->cset->fill(field_charset,ptr+copy_length,
|
||||
field_length-copy_length,' ');
|
||||
field_length-copy_length,
|
||||
field_charset->pad_char);
|
||||
|
||||
if ((copy_length < length) && table->in_use->count_cuted_fields)
|
||||
{ // Check if we loosed some info
|
||||
|
|
@ -6401,6 +6402,17 @@ int Field_varstring::key_cmp(const byte *a,const byte *b)
|
|||
void Field_varstring::sort_string(char *to,uint length)
|
||||
{
|
||||
uint tot_length= length_bytes == 1 ? (uint) (uchar) *ptr : uint2korr(ptr);
|
||||
|
||||
if (field_charset == &my_charset_bin)
|
||||
{
|
||||
/* Store length last in high-byte order to sort longer strings first */
|
||||
if (length_bytes == 1)
|
||||
to[length-1]= tot_length;
|
||||
else
|
||||
mi_int2store(to+length-2, tot_length);
|
||||
length-= length_bytes;
|
||||
}
|
||||
|
||||
tot_length= my_strnxfrm(field_charset,
|
||||
(uchar*) to, length,
|
||||
(uchar*) ptr + length_bytes,
|
||||
|
|
@ -7092,6 +7104,13 @@ int Field_blob::key_cmp(const byte *a,const byte *b)
|
|||
}
|
||||
|
||||
|
||||
uint32 Field_blob::sort_length() const
|
||||
{
|
||||
return (uint32) (current_thd->variables.max_sort_length +
|
||||
(field_charset == &my_charset_bin ? 0 : packlength));
|
||||
}
|
||||
|
||||
|
||||
void Field_blob::sort_string(char *to,uint length)
|
||||
{
|
||||
char *blob;
|
||||
|
|
@ -7101,6 +7120,31 @@ void Field_blob::sort_string(char *to,uint length)
|
|||
bzero(to,length);
|
||||
else
|
||||
{
|
||||
if (field_charset == &my_charset_bin)
|
||||
{
|
||||
char *pos;
|
||||
|
||||
/*
|
||||
Store length of blob last in blob to shorter blobs before longer blobs
|
||||
*/
|
||||
length-= packlength;
|
||||
pos= to+length;
|
||||
|
||||
switch (packlength) {
|
||||
case 1:
|
||||
*pos= (char) blob_length;
|
||||
break;
|
||||
case 2:
|
||||
mi_int2store(pos, blob_length);
|
||||
break;
|
||||
case 3:
|
||||
mi_int3store(pos, blob_length);
|
||||
break;
|
||||
case 4:
|
||||
mi_int4store(pos, blob_length);
|
||||
break;
|
||||
}
|
||||
}
|
||||
memcpy_fixed(&blob,ptr+packlength,sizeof(char*));
|
||||
|
||||
blob_length=my_strnxfrm(field_charset,
|
||||
|
|
|
|||
|
|
@ -132,6 +132,7 @@ public:
|
|||
virtual bool eq_def(Field *field);
|
||||
virtual uint32 pack_length() const { return (uint32) field_length; }
|
||||
virtual uint32 pack_length_in_rec() const { return pack_length(); }
|
||||
virtual uint32 sort_length() const { return pack_length(); }
|
||||
virtual void reset(void) { bzero(ptr,pack_length()); }
|
||||
virtual void reset_fields() {}
|
||||
virtual void set_default()
|
||||
|
|
@ -1048,6 +1049,11 @@ public:
|
|||
void reset(void) { bzero(ptr,field_length+length_bytes); }
|
||||
uint32 pack_length() const { return (uint32) field_length+length_bytes; }
|
||||
uint32 key_length() const { return (uint32) field_length; }
|
||||
uint32 sort_length() const
|
||||
{
|
||||
return (uint32) field_length + (field_charset == &my_charset_bin ?
|
||||
length_bytes : 0);
|
||||
}
|
||||
int store(const char *to,uint length,CHARSET_INFO *charset);
|
||||
int store(longlong nr, bool unsigned_val);
|
||||
int store(double nr) { return Field_str::store(nr); } /* QQ: To be deleted */
|
||||
|
|
@ -1120,6 +1126,7 @@ public:
|
|||
void sort_string(char *buff,uint length);
|
||||
uint32 pack_length() const
|
||||
{ return (uint32) (packlength+table->s->blob_ptr_size); }
|
||||
uint32 sort_length() const;
|
||||
inline uint32 max_data_length() const
|
||||
{
|
||||
return (uint32) (((ulonglong) 1 << (packlength*8)) -1);
|
||||
|
|
|
|||
|
|
@ -50,7 +50,8 @@ static int merge_index(SORTPARAM *param,uchar *sort_buffer,
|
|||
IO_CACHE *outfile);
|
||||
static bool save_index(SORTPARAM *param,uchar **sort_keys, uint count,
|
||||
FILESORT_INFO *table_sort);
|
||||
static uint sortlength(SORT_FIELD *sortorder, uint s_length,
|
||||
static uint suffix_length(ulong string_length);
|
||||
static uint sortlength(THD *thd, SORT_FIELD *sortorder, uint s_length,
|
||||
bool *multi_byte_charset);
|
||||
static SORT_ADDON_FIELD *get_addon_fields(THD *thd, Field **ptabfield,
|
||||
uint sortlength, uint *plength);
|
||||
|
|
@ -123,7 +124,7 @@ ha_rows filesort(THD *thd, TABLE *table, SORT_FIELD *sortorder, uint s_length,
|
|||
sort_keys= (uchar **) NULL;
|
||||
error= 1;
|
||||
bzero((char*) ¶m,sizeof(param));
|
||||
param.sort_length= sortlength(sortorder, s_length, &multi_byte_charset);
|
||||
param.sort_length= sortlength(thd, sortorder, s_length, &multi_byte_charset);
|
||||
param.ref_length= table->file->ref_length;
|
||||
param.addon_field= 0;
|
||||
param.addon_length= 0;
|
||||
|
|
@ -585,6 +586,28 @@ err:
|
|||
} /* write_keys */
|
||||
|
||||
|
||||
/*
|
||||
Store length as suffix in high-byte-first order
|
||||
*/
|
||||
|
||||
static inline void store_length(uchar *to, uint length, uint pack_length)
|
||||
{
|
||||
switch (pack_length) {
|
||||
case 1:
|
||||
*to= (uchar) length;
|
||||
break;
|
||||
case 2:
|
||||
mi_int2store(to, length);
|
||||
break;
|
||||
case 3:
|
||||
mi_int3store(to, length);
|
||||
default:
|
||||
mi_int4store(to, length);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* makes a sort-key from record */
|
||||
|
||||
static void make_sortkey(register SORTPARAM *param,
|
||||
|
|
@ -623,9 +646,11 @@ static void make_sortkey(register SORTPARAM *param,
|
|||
maybe_null= item->maybe_null;
|
||||
switch (sort_field->result_type) {
|
||||
case STRING_RESULT:
|
||||
{
|
||||
{
|
||||
CHARSET_INFO *cs=item->collation.collation;
|
||||
char fill_char= ((cs->state & MY_CS_BINSORT) ? (char) 0 : ' ');
|
||||
int diff;
|
||||
uint sort_field_length;
|
||||
|
||||
if (maybe_null)
|
||||
*to++=1;
|
||||
|
|
@ -644,24 +669,32 @@ static void make_sortkey(register SORTPARAM *param,
|
|||
}
|
||||
break;
|
||||
}
|
||||
length=res->length();
|
||||
int diff=(int) (sort_field->length-length);
|
||||
length= res->length();
|
||||
sort_field_length= sort_field->length - sort_field->suffix_length;
|
||||
diff=(int) (sort_field_length - length);
|
||||
if (diff < 0)
|
||||
{
|
||||
diff=0; /* purecov: inspected */
|
||||
length=sort_field->length;
|
||||
length= sort_field_length;
|
||||
}
|
||||
if (sort_field->suffix_length)
|
||||
{
|
||||
/* Store length last in result_string */
|
||||
store_length(to + sort_field_length, length,
|
||||
sort_field->suffix_length);
|
||||
}
|
||||
if (sort_field->need_strxnfrm)
|
||||
{
|
||||
char *from=(char*) res->ptr();
|
||||
uint tmp_length;
|
||||
if ((unsigned char *)from == to)
|
||||
{
|
||||
set_if_smaller(length,sort_field->length);
|
||||
memcpy(param->tmp_buffer,from,length);
|
||||
from=param->tmp_buffer;
|
||||
}
|
||||
uint tmp_length=my_strnxfrm(cs,to,sort_field->length,
|
||||
(unsigned char *) from, length);
|
||||
tmp_length= my_strnxfrm(cs,to,sort_field->length,
|
||||
(unsigned char *) from, length);
|
||||
DBUG_ASSERT(tmp_length == sort_field->length);
|
||||
}
|
||||
else
|
||||
|
|
@ -670,7 +703,7 @@ static void make_sortkey(register SORTPARAM *param,
|
|||
cs->cset->fill(cs, (char *)to+length,diff,fill_char);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
case INT_RESULT:
|
||||
{
|
||||
longlong value= item->val_int_result();
|
||||
|
|
@ -1170,11 +1203,25 @@ static int merge_index(SORTPARAM *param, uchar *sort_buffer,
|
|||
} /* merge_index */
|
||||
|
||||
|
||||
static uint suffix_length(ulong string_length)
|
||||
{
|
||||
if (string_length < 256)
|
||||
return 1;
|
||||
if (string_length < 256L*256L)
|
||||
return 2;
|
||||
if (string_length < 256L*256L*256L)
|
||||
return 3;
|
||||
return 4; // Can't sort longer than 4G
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
Calculate length of sort key
|
||||
|
||||
SYNOPSIS
|
||||
sortlength()
|
||||
thd Thread handler
|
||||
sortorder Order of items to sort
|
||||
uint s_length Number of items to sort
|
||||
multi_byte_charset (out)
|
||||
|
|
@ -1190,10 +1237,10 @@ static int merge_index(SORTPARAM *param, uchar *sort_buffer,
|
|||
*/
|
||||
|
||||
static uint
|
||||
sortlength(SORT_FIELD *sortorder, uint s_length, bool *multi_byte_charset)
|
||||
sortlength(THD *thd, SORT_FIELD *sortorder, uint s_length,
|
||||
bool *multi_byte_charset)
|
||||
{
|
||||
reg2 uint length;
|
||||
THD *thd= current_thd;
|
||||
CHARSET_INFO *cs;
|
||||
*multi_byte_charset= 0;
|
||||
|
||||
|
|
@ -1201,19 +1248,17 @@ sortlength(SORT_FIELD *sortorder, uint s_length, bool *multi_byte_charset)
|
|||
for (; s_length-- ; sortorder++)
|
||||
{
|
||||
sortorder->need_strxnfrm= 0;
|
||||
sortorder->suffix_length= 0;
|
||||
if (sortorder->field)
|
||||
{
|
||||
if (sortorder->field->type() == FIELD_TYPE_BLOB)
|
||||
sortorder->length= thd->variables.max_sort_length;
|
||||
else
|
||||
cs= sortorder->field->sort_charset();
|
||||
sortorder->length= sortorder->field->sort_length();
|
||||
|
||||
if (use_strnxfrm((cs=sortorder->field->sort_charset())))
|
||||
{
|
||||
sortorder->length=sortorder->field->pack_length();
|
||||
if (use_strnxfrm((cs=sortorder->field->sort_charset())))
|
||||
{
|
||||
sortorder->need_strxnfrm= 1;
|
||||
*multi_byte_charset= 1;
|
||||
sortorder->length= cs->coll->strnxfrmlen(cs, sortorder->length);
|
||||
}
|
||||
sortorder->need_strxnfrm= 1;
|
||||
*multi_byte_charset= 1;
|
||||
sortorder->length= cs->coll->strnxfrmlen(cs, sortorder->length);
|
||||
}
|
||||
if (sortorder->field->maybe_null())
|
||||
length++; // Place for NULL marker
|
||||
|
|
@ -1229,6 +1274,12 @@ sortlength(SORT_FIELD *sortorder, uint s_length, bool *multi_byte_charset)
|
|||
sortorder->need_strxnfrm= 1;
|
||||
*multi_byte_charset= 1;
|
||||
}
|
||||
else if (cs == &my_charset_bin)
|
||||
{
|
||||
/* Store length last to be able to sort blob/varbinary */
|
||||
sortorder->suffix_length= suffix_length(sortorder->length);
|
||||
sortorder->length+= sortorder->suffix_length;
|
||||
}
|
||||
break;
|
||||
case INT_RESULT:
|
||||
#if SIZEOF_LONG_LONG > 4
|
||||
|
|
|
|||
|
|
@ -185,16 +185,16 @@ enum db_type ha_resolve_by_name(const char *name, uint namelen)
|
|||
handlerton **types;
|
||||
|
||||
if (thd && !my_strnncoll(&my_charset_latin1,
|
||||
(const uchar *)name, namelen,
|
||||
(const uchar *)"DEFAULT", 7))
|
||||
(const uchar *)name, namelen,
|
||||
(const uchar *)"DEFAULT", 7))
|
||||
return (enum db_type) thd->variables.table_type;
|
||||
|
||||
retest:
|
||||
for (types= sys_table_types; *types; types++)
|
||||
{
|
||||
if (!my_strnncoll(&my_charset_latin1,
|
||||
(const uchar *)name, namelen,
|
||||
(const uchar *)(*types)->name, strlen((*types)->name)))
|
||||
(const uchar *)name, namelen,
|
||||
(const uchar *)(*types)->name, strlen((*types)->name)))
|
||||
return (enum db_type) (*types)->db_type;
|
||||
}
|
||||
|
||||
|
|
@ -204,8 +204,9 @@ retest:
|
|||
for (table_alias= sys_table_aliases; table_alias->type; table_alias++)
|
||||
{
|
||||
if (!my_strnncoll(&my_charset_latin1,
|
||||
(const uchar *)name, namelen,
|
||||
(const uchar *)table_alias->alias, strlen(table_alias->alias)))
|
||||
(const uchar *)name, namelen,
|
||||
(const uchar *)table_alias->alias,
|
||||
strlen(table_alias->alias)))
|
||||
{
|
||||
name= table_alias->type;
|
||||
namelen= strlen(name);
|
||||
|
|
|
|||
20
sql/item.cc
20
sql/item.cc
|
|
@ -3213,6 +3213,22 @@ bool Item_field::fix_fields(THD *thd, Item **reference)
|
|||
TRUE)) ==
|
||||
not_found_field)
|
||||
{
|
||||
|
||||
/* Look up in current select's item_list to find aliased fields */
|
||||
if (thd->lex->current_select->is_item_list_lookup)
|
||||
{
|
||||
uint counter;
|
||||
bool not_used;
|
||||
Item** res= find_item_in_list(this, thd->lex->current_select->item_list,
|
||||
&counter, REPORT_EXCEPT_NOT_FOUND,
|
||||
¬_used);
|
||||
if (res != not_found_item && (*res)->type() == Item::FIELD_ITEM)
|
||||
{
|
||||
set_field((*((Item_field**)res))->field);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
If there are outer contexts (outer selects, but current select is
|
||||
not derived table or view) try to resolve this reference in the
|
||||
|
|
@ -4628,7 +4644,7 @@ void Item_ref::cleanup()
|
|||
|
||||
void Item_ref::print(String *str)
|
||||
{
|
||||
if (ref && *ref)
|
||||
if (ref)
|
||||
(*ref)->print(str);
|
||||
else
|
||||
Item_ident::print(str);
|
||||
|
|
@ -4814,7 +4830,7 @@ void Item_ref::make_field(Send_field *field)
|
|||
void Item_ref_null_helper::print(String *str)
|
||||
{
|
||||
str->append("<ref_null_helper>(", 18);
|
||||
if (ref && *ref)
|
||||
if (ref)
|
||||
(*ref)->print(str);
|
||||
else
|
||||
str->append('?');
|
||||
|
|
|
|||
|
|
@ -2351,7 +2351,7 @@ void Item_func_find_in_set::fix_length_and_dec()
|
|||
}
|
||||
}
|
||||
}
|
||||
agg_arg_collations_for_comparison(cmp_collation, args, 2);
|
||||
agg_arg_charsets(cmp_collation, args, 2, MY_COLL_CMP_CONV);
|
||||
}
|
||||
|
||||
static const char separator=',';
|
||||
|
|
|
|||
|
|
@ -480,12 +480,15 @@ public:
|
|||
class Item_func_char :public Item_str_func
|
||||
{
|
||||
public:
|
||||
Item_func_char(List<Item> &list) :Item_str_func(list) {}
|
||||
Item_func_char(List<Item> &list) :Item_str_func(list)
|
||||
{ collation.set(&my_charset_bin); }
|
||||
Item_func_char(List<Item> &list, CHARSET_INFO *cs) :Item_str_func(list)
|
||||
{ collation.set(cs); }
|
||||
String *val_str(String *);
|
||||
void fix_length_and_dec()
|
||||
{
|
||||
collation.set(&my_charset_bin);
|
||||
maybe_null=0; max_length=arg_count;
|
||||
maybe_null=0;
|
||||
max_length=arg_count * collation.collation->mbmaxlen;
|
||||
}
|
||||
const char *func_name() const { return "char"; }
|
||||
};
|
||||
|
|
|
|||
|
|
@ -928,7 +928,7 @@ static void __cdecl kill_server(int sig_ptr)
|
|||
RETURN_FROM_KILL_SERVER;
|
||||
kill_in_progress=TRUE;
|
||||
abort_loop=1; // This should be set
|
||||
signal(sig,SIG_IGN);
|
||||
my_sigset(sig,SIG_IGN);
|
||||
if (sig == MYSQL_KILL_SIGNAL || sig == 0)
|
||||
sql_print_information(ER(ER_NORMAL_SHUTDOWN),my_progname);
|
||||
else
|
||||
|
|
@ -977,11 +977,6 @@ pthread_handler_t kill_server_thread(void *arg __attribute__((unused)))
|
|||
}
|
||||
#endif
|
||||
|
||||
#if defined(__amiga__)
|
||||
#undef sigset
|
||||
#define sigset signal
|
||||
#endif
|
||||
|
||||
extern "C" sig_handler print_signal_warning(int sig)
|
||||
{
|
||||
if (!DBUG_IN_USE)
|
||||
|
|
@ -991,7 +986,7 @@ extern "C" sig_handler print_signal_warning(int sig)
|
|||
sig,my_thread_id());
|
||||
}
|
||||
#ifdef DONT_REMEMBER_SIGNAL
|
||||
sigset(sig,print_signal_warning); /* int. thread system calls */
|
||||
my_sigset(sig,print_signal_warning); /* int. thread system calls */
|
||||
#endif
|
||||
#if !defined(__WIN__) && !defined(OS2) && !defined(__NETWARE__)
|
||||
if (sig == SIGALRM)
|
||||
|
|
@ -2074,8 +2069,8 @@ static void init_signals(void)
|
|||
DBUG_ENTER("init_signals");
|
||||
|
||||
if (test_flags & TEST_SIGINT)
|
||||
sigset(THR_KILL_SIGNAL,end_thread_signal);
|
||||
sigset(THR_SERVER_ALARM,print_signal_warning); // Should never be called!
|
||||
my_sigset(THR_KILL_SIGNAL,end_thread_signal);
|
||||
my_sigset(THR_SERVER_ALARM,print_signal_warning); // Should never be called!
|
||||
|
||||
if (!(test_flags & TEST_NO_STACKTRACE) || (test_flags & TEST_CORE_ON_SIGNAL))
|
||||
{
|
||||
|
|
@ -2109,13 +2104,8 @@ static void init_signals(void)
|
|||
}
|
||||
#endif
|
||||
(void) sigemptyset(&set);
|
||||
#ifdef THREAD_SPECIFIC_SIGPIPE
|
||||
sigset(SIGPIPE,abort_thread);
|
||||
my_sigset(SIGPIPE,SIG_IGN);
|
||||
sigaddset(&set,SIGPIPE);
|
||||
#else
|
||||
(void) signal(SIGPIPE,SIG_IGN); // Can't know which thread
|
||||
sigaddset(&set,SIGPIPE);
|
||||
#endif
|
||||
sigaddset(&set,SIGINT);
|
||||
#ifndef IGNORE_SIGHUP_SIGQUIT
|
||||
sigaddset(&set,SIGQUIT);
|
||||
|
|
|
|||
|
|
@ -4844,7 +4844,8 @@ Log_event* next_event(RELAY_LOG_INFO* rli)
|
|||
time_t save_timestamp= rli->last_master_timestamp;
|
||||
rli->last_master_timestamp= 0;
|
||||
|
||||
DBUG_ASSERT(rli->relay_log.get_open_count() == rli->cur_log_old_open_count);
|
||||
DBUG_ASSERT(rli->relay_log.get_open_count() ==
|
||||
rli->cur_log_old_open_count);
|
||||
|
||||
if (rli->ign_master_log_name_end[0])
|
||||
{
|
||||
|
|
@ -4854,13 +4855,13 @@ Log_event* next_event(RELAY_LOG_INFO* rli)
|
|||
0, rli->ign_master_log_pos_end,
|
||||
Rotate_log_event::DUP_NAME);
|
||||
rli->ign_master_log_name_end[0]= 0;
|
||||
pthread_mutex_unlock(log_lock);
|
||||
if (unlikely(!ev))
|
||||
{
|
||||
errmsg= "Slave SQL thread failed to create a Rotate event "
|
||||
"(out of memory?), SHOW SLAVE STATUS may be inaccurate";
|
||||
goto err;
|
||||
}
|
||||
pthread_mutex_unlock(log_lock);
|
||||
ev->server_id= 0; // don't be ignored by slave SQL thread
|
||||
DBUG_RETURN(ev);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1899,6 +1899,7 @@ typedef struct st_sort_field {
|
|||
Field *field; /* Field to sort */
|
||||
Item *item; /* Item if not sorting fields */
|
||||
uint length; /* Length of sort field */
|
||||
uint suffix_length; /* Length suffix (0-4) */
|
||||
Item_result result_type; /* Type of item */
|
||||
bool reverse; /* if descending sort */
|
||||
bool need_strxnfrm; /* If we have to use strxnfrm() */
|
||||
|
|
|
|||
|
|
@ -1133,6 +1133,7 @@ void st_select_lex::init_query()
|
|||
ref_pointer_array= 0;
|
||||
select_n_having_items= 0;
|
||||
subquery_in_having= explicit_limit= 0;
|
||||
is_item_list_lookup= 0;
|
||||
first_execution= 1;
|
||||
first_cond_optimization= 1;
|
||||
parsing_place= NO_MATTER;
|
||||
|
|
@ -1165,6 +1166,7 @@ void st_select_lex::init_select()
|
|||
select_limit= 0; /* denotes the default limit = HA_POS_ERROR */
|
||||
offset_limit= 0; /* denotes the default offset = 0 */
|
||||
with_sum_func= 0;
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -482,6 +482,7 @@ public:
|
|||
List<Item> item_list; /* list of fields & expressions */
|
||||
List<String> interval_list, use_index, *use_index_ptr,
|
||||
ignore_index, *ignore_index_ptr;
|
||||
bool is_item_list_lookup;
|
||||
/*
|
||||
Usualy it is pointer to ftfunc_list_alloc, but in union used to create fake
|
||||
select_lex for calling mysql_select under results of union
|
||||
|
|
|
|||
|
|
@ -5906,7 +5906,7 @@ eq_ref_table(JOIN *join, ORDER *start_order, JOIN_TAB *tab)
|
|||
tab->cached_eq_ref_table=1;
|
||||
if (tab->type == JT_CONST) // We can skip const tables
|
||||
return (tab->eq_ref_table=1); /* purecov: inspected */
|
||||
if (tab->type != JT_EQ_REF)
|
||||
if (tab->type != JT_EQ_REF || tab->table->maybe_null)
|
||||
return (tab->eq_ref_table=0); // We must use this
|
||||
Item **ref_item=tab->ref.items;
|
||||
Item **end=ref_item+tab->ref.key_parts;
|
||||
|
|
@ -11410,7 +11410,7 @@ static int remove_dup_with_hash_index(THD *thd, TABLE *table,
|
|||
ulong total_length= 0;
|
||||
for (ptr= first_field, field_length=field_lengths ; *ptr ; ptr++)
|
||||
{
|
||||
uint length= (*ptr)->pack_length();
|
||||
uint length= (*ptr)->sort_length();
|
||||
(*field_length++)= length;
|
||||
total_length+= length;
|
||||
}
|
||||
|
|
@ -11950,11 +11950,16 @@ find_order_in_list(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables,
|
|||
We check order_item->fixed because Item_func_group_concat can put
|
||||
arguments for which fix_fields already was called.
|
||||
*/
|
||||
thd->lex->current_select->is_item_list_lookup= 1;
|
||||
if (!order_item->fixed &&
|
||||
(order_item->fix_fields(thd, order->item) ||
|
||||
(order_item= *order->item)->check_cols(1) ||
|
||||
thd->is_fatal_error))
|
||||
{
|
||||
thd->lex->current_select->is_item_list_lookup= 0;
|
||||
return TRUE; /* Wrong field. */
|
||||
}
|
||||
thd->lex->current_select->is_item_list_lookup= 0;
|
||||
|
||||
uint el= all_fields.elements;
|
||||
all_fields.push_front(order_item); /* Add new field to field list. */
|
||||
|
|
|
|||
|
|
@ -4536,6 +4536,8 @@ simple_expr:
|
|||
{ $$= new Item_func_atan($3,$5); }
|
||||
| CHAR_SYM '(' expr_list ')'
|
||||
{ $$= new Item_func_char(*$3); }
|
||||
| CHAR_SYM '(' expr_list USING charset_name ')'
|
||||
{ $$= new Item_func_char(*$3, $5); }
|
||||
| CHARSET '(' expr ')'
|
||||
{ $$= new Item_func_charset($3); }
|
||||
| COALESCE '(' expr_list ')'
|
||||
|
|
|
|||
|
|
@ -310,6 +310,7 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat,
|
|||
char *buff, *next_chunk, *buff_end;
|
||||
if (!(next_chunk= buff= my_malloc(n_length, MYF(MY_WME))))
|
||||
goto err;
|
||||
buff_end= buff + n_length;
|
||||
if (my_pread(file, (byte*)buff, n_length, record_offset + share->reclength,
|
||||
MYF(MY_NABP)))
|
||||
{
|
||||
|
|
@ -324,13 +325,14 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat,
|
|||
goto err;
|
||||
}
|
||||
next_chunk+= share->connect_string.length + 2;
|
||||
buff_end= buff + n_length;
|
||||
if (next_chunk + 2 < buff_end)
|
||||
{
|
||||
uint str_db_type_length= uint2korr(next_chunk);
|
||||
share->db_type= ha_resolve_by_name(next_chunk + 2, str_db_type_length);
|
||||
DBUG_PRINT("enter", ("Setting dbtype to: %d - %d - '%.*s'\n", share->db_type,
|
||||
str_db_type_length, str_db_type_length, next_chunk + 2));
|
||||
DBUG_PRINT("enter", ("Setting dbtype to: %d - %d - '%.*s'\n",
|
||||
share->db_type,
|
||||
str_db_type_length, str_db_type_length,
|
||||
next_chunk + 2));
|
||||
next_chunk+= str_db_type_length + 2;
|
||||
}
|
||||
my_free(buff, MYF(0));
|
||||
|
|
|
|||
|
|
@ -119,10 +119,10 @@ bool mysql_create_frm(THD *thd, my_string file_name,
|
|||
reclength=uint2korr(forminfo+266);
|
||||
|
||||
/* Calculate extra data segment length */
|
||||
str_db_type.str= (char *)ha_get_storage_engine(create_info->db_type);
|
||||
str_db_type.str= (char *) ha_get_storage_engine(create_info->db_type);
|
||||
str_db_type.length= strlen(str_db_type.str);
|
||||
create_info->extra_size= 2 + str_db_type.length;
|
||||
create_info->extra_size+= create_info->connect_string.length + 2;
|
||||
create_info->extra_size= (2 + str_db_type.length +
|
||||
2 + create_info->connect_string.length);
|
||||
|
||||
if ((file=create_frm(thd, file_name, db, table, reclength, fileinfo,
|
||||
create_info, keys)) < 0)
|
||||
|
|
|
|||
|
|
@ -1711,7 +1711,7 @@ static uint16 tab_big5_uni0[]={
|
|||
0x2467,0x2468,0x2469,0x2474,0x2475,0x2476,0x2477,0x2478,
|
||||
0x2479,0x247A,0x247B,0x247C,0x247D};
|
||||
|
||||
/* page 1 0xC940-0xF9D5 */
|
||||
/* page 1 0xC940-0xF9DC */
|
||||
static uint16 tab_big5_uni1[]={
|
||||
0x4E42,0x4E5C,0x51F5,0x531A,0x5382,0x4E07,0x4E0C,0x4E47,
|
||||
0x4E8D,0x56D7,0xFA0C,0x5C6E,0x5F73,0x4E0F,0x5187,0x4E0E,
|
||||
|
|
@ -3267,12 +3267,13 @@ static uint16 tab_big5_uni1[]={
|
|||
0x9E17,0x9F48,0x6207,0x6B1E,0x7227,0x864C,0x8EA8,0x9482,
|
||||
0x9480,0x9481,0x9A69,0x9A68,0x9B2E,0x9E19,0x7229,0x864B,
|
||||
0x8B9F,0x9483,0x9C79,0x9EB7,0x7675,0x9A6B,0x9C7A,0x9E1D,
|
||||
0x7069,0x706A,0x9EA4,0x9F7E,0x9F49,0x9F98};
|
||||
0x7069,0x706A,0x9EA4,0x9F7E,0x9F49,0x9F98,0x7881,0x92B9,
|
||||
0x88CF,0x58BB,0x6052,0x7CA7,0x5AFA};
|
||||
|
||||
static int func_big5_uni_onechar(int code){
|
||||
if ((code>=0xA140)&&(code<=0xC7FC))
|
||||
return(tab_big5_uni0[code-0xA140]);
|
||||
if ((code>=0xC940)&&(code<=0xF9D5))
|
||||
if ((code>=0xC940)&&(code<=0xF9DC))
|
||||
return(tab_big5_uni1[code-0xC940]);
|
||||
return(0);
|
||||
}
|
||||
|
|
@ -3901,7 +3902,7 @@ static uint16 tab_uni_big57[]={
|
|||
0xE54D,0xE552, 0,0xE54E, 0,0xE551,0xBC5C, 0,
|
||||
0xBEA5,0xBC5B, 0,0xE54A,0xE550, 0,0xBC5A,0xE54F,
|
||||
0,0xE54C, 0,0xBC58, 0, 0, 0, 0,
|
||||
0, 0,0xE94D, 0,0xE94F,0xE94A,0xBEC1,0xE94C,
|
||||
0, 0,0xE94D,0xF9D9,0xE94F,0xE94A,0xBEC1,0xE94C,
|
||||
0,0xBEC0,0xE94E, 0, 0,0xBEC3,0xE950,0xBEC2,
|
||||
0xE949,0xE94B, 0, 0, 0, 0,0xC0A5,0xECCC,
|
||||
0,0xC0A4,0xECCD,0xC0A3,0xECCB,0xC0A2,0xECCA, 0,
|
||||
|
|
@ -3973,7 +3974,7 @@ static uint16 tab_uni_big57[]={
|
|||
0xE175,0xB9DE,0xE174,0xB9E4, 0,0xE16D,0xB9DF, 0,
|
||||
0xE17B,0xB9E0,0xE16F,0xE172,0xE177,0xE171,0xE16C, 0,
|
||||
0, 0, 0,0xE173,0xE555,0xBC61,0xE558,0xE557,
|
||||
0xE55A,0xE55C, 0,0xBC5F, 0,0xE556, 0,0xE554,
|
||||
0xE55A,0xE55C,0xF9DC,0xBC5F, 0,0xE556, 0,0xE554,
|
||||
0,0xE55D,0xE55B,0xE559, 0,0xE55F, 0,0xE55E,
|
||||
0xBC63,0xBC5E, 0,0xBC60,0xBC62, 0, 0,0xE560,
|
||||
0xE957, 0, 0,0xE956,0xE955, 0,0xE958,0xE951,
|
||||
|
|
@ -4144,7 +4145,7 @@ static uint16 tab_uni_big57[]={
|
|||
0,0xCEC0, 0, 0, 0, 0, 0, 0,
|
||||
0xCECA,0xD1A1,0xCECB,0xABEE,0xCECE,0xCEC4,0xABED,0xCEC6,
|
||||
0,0xCEC7, 0, 0,0xCEC9,0xABE9, 0, 0,
|
||||
0xAEA3, 0, 0,0xCEC5,0xCEC1,0xAEA4, 0, 0,
|
||||
0xAEA3, 0,0xF9DA,0xCEC5,0xCEC1,0xAEA4, 0, 0,
|
||||
0xCECF,0xAE7E,0xD17D,0xCEC8, 0,0xD17C,0xCEC3,0xCECC,
|
||||
0, 0,0xABEC,0xAEA1,0xABF2,0xAEA2,0xCED0,0xD17E,
|
||||
0xABEB,0xAEA6,0xABF1,0xABF0,0xABEF,0xAEA5,0xCED1,0xAEA7,
|
||||
|
|
@ -4918,7 +4919,7 @@ static uint16 tab_uni_big57[]={
|
|||
0xDACF,0xDACE,0xDACB,0xB2B8,0xB577,0xDAC9,0xDACC,0xB578,
|
||||
0xDACD,0xDACA, 0, 0, 0, 0, 0, 0,
|
||||
0,0xDEEE, 0,0xDEF2,0xB84E, 0,0xE2F0,0xB851,
|
||||
0xDEF0, 0, 0,0xDEED,0xDEE8,0xDEEA,0xDEEB,0xDEE4,
|
||||
0xDEF0,0xF9D6, 0,0xDEED,0xDEE8,0xDEEA,0xDEEB,0xDEE4,
|
||||
0,0xB84D, 0, 0,0xB84C, 0,0xB848,0xDEE7,
|
||||
0,0xB84F, 0,0xB850,0xDEE6,0xDEE9,0xDEF1,0xB84A,
|
||||
0xB84B,0xDEEF,0xDEE5, 0, 0, 0,0xE2F2,0xBAD0,
|
||||
|
|
@ -5050,7 +5051,7 @@ static uint16 tab_uni_big57[]={
|
|||
0xD34D,0xAFBB,0xD34B, 0,0xD34C,0xD34E, 0, 0,
|
||||
0,0xD34A,0xB2C9, 0,0xD6DE,0xB2CB,0xD6E0,0xB2CA,
|
||||
0xD6DF, 0, 0, 0, 0, 0,0xDAE8,0xB5AF,
|
||||
0,0xDAEA,0xDAE7,0xD6E1, 0,0xB5B0, 0, 0,
|
||||
0,0xDAEA,0xDAE7,0xD6E1, 0,0xB5B0, 0,0xF9DB,
|
||||
0xDAE9, 0, 0, 0, 0, 0, 0,0xDF56,
|
||||
0,0xB864,0xDF54,0xB865,0xDF55,0xB866, 0, 0,
|
||||
0,0xBAE9,0xE361,0xE35E,0xE360,0xBAEA,0xBAEB,0xE35F,
|
||||
|
|
@ -5439,7 +5440,7 @@ static uint16 tab_uni_big57[]={
|
|||
0,0xB5F6,0xDBCD, 0, 0, 0,0xDBC9,0xDBCB,
|
||||
0xDBC6,0xDBC5,0xDBC3, 0,0xDBCA,0xDBCC,0xDBC8, 0,
|
||||
0xDBC7,0xB5F4,0xB5F5, 0, 0, 0, 0, 0,
|
||||
0,0xDBCF,0xB8CD,0xDFF2,0xDFF8,0xDFF3,0xDFF4, 0,
|
||||
0,0xDBCF,0xB8CD,0xDFF2,0xDFF8,0xDFF3,0xDFF4,0xF9D8,
|
||||
0xDFF9, 0,0xB8CF, 0,0xB8C7,0xB8CE,0xDFF1,0xDBC4,
|
||||
0xB8CA,0xB8C8,0xDFF7,0xDFF6,0xB8C9,0xB8CB,0xDFF5,0xB8C6,
|
||||
0,0xB8CC, 0, 0, 0, 0, 0,0xE3F6,
|
||||
|
|
@ -5757,7 +5758,7 @@ static uint16 tab_uni_big57[]={
|
|||
0xE47B,0xE4AF,0xE4AC,0xE4A7,0xE477,0xE476,0xE4A1,0xE4B4,
|
||||
0xBBCF,0xE4B7,0xE47D,0xE4A3,0xBE52, 0, 0, 0,
|
||||
0, 0,0xBE5A,0xBE55,0xE8A4,0xE8A1,0xE867,0xBE50,
|
||||
0, 0, 0,0xBE4F,0xBE56, 0, 0, 0,
|
||||
0,0xF9D7, 0,0xBE4F,0xBE56, 0, 0, 0,
|
||||
0xE865,0xBE54,0xE871,0xE863,0xE864,0xBE4E,0xE8A3,0xBE58,
|
||||
0xE874,0xE879,0xE873,0xEBEE,0xE86F,0xE877,0xE875,0xE868,
|
||||
0xE862,0xE87D,0xBE57,0xE87E, 0,0xE878, 0,0xE86D,
|
||||
|
|
@ -6398,6 +6399,7 @@ CHARSET_INFO my_charset_big5_chinese_ci=
|
|||
2, /* mbmaxlen */
|
||||
0, /* min_sort_char */
|
||||
255, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_big5_handler,
|
||||
&my_collation_big5_chinese_ci_handler
|
||||
|
|
@ -6430,6 +6432,7 @@ CHARSET_INFO my_charset_big5_bin=
|
|||
2, /* mbmaxlen */
|
||||
0, /* min_sort_char */
|
||||
255, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_big5_handler,
|
||||
&my_collation_mb_bin_handler
|
||||
|
|
|
|||
|
|
@ -86,6 +86,14 @@ static int my_strnncoll_binary(CHARSET_INFO * cs __attribute__((unused)),
|
|||
}
|
||||
|
||||
|
||||
uint my_lengthsp_binary(CHARSET_INFO *cs __attribute__((unused)),
|
||||
const char *ptr __attribute__((unused)),
|
||||
uint length)
|
||||
{
|
||||
return length;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
Compare two strings. Result is sign(first_argument - second_argument)
|
||||
|
||||
|
|
@ -491,7 +499,7 @@ static MY_CHARSET_HANDLER my_charset_handler=
|
|||
my_numchars_8bit,
|
||||
my_charpos_8bit,
|
||||
my_well_formed_len_8bit,
|
||||
my_lengthsp_8bit,
|
||||
my_lengthsp_binary,
|
||||
my_numcells_8bit,
|
||||
my_mb_wc_bin,
|
||||
my_wc_mb_bin,
|
||||
|
|
@ -516,7 +524,7 @@ static MY_CHARSET_HANDLER my_charset_handler=
|
|||
CHARSET_INFO my_charset_bin =
|
||||
{
|
||||
63,0,0, /* number */
|
||||
MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_PRIMARY,/* state */
|
||||
MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_PRIMARY,/* state */
|
||||
"binary", /* cs name */
|
||||
"binary", /* name */
|
||||
"", /* comment */
|
||||
|
|
@ -539,6 +547,7 @@ CHARSET_INFO my_charset_bin =
|
|||
1, /* mbmaxlen */
|
||||
0, /* min_sort_char */
|
||||
255, /* max_sort_char */
|
||||
0, /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_handler,
|
||||
&my_collation_binary_handler
|
||||
|
|
|
|||
|
|
@ -5522,6 +5522,7 @@ CHARSET_INFO my_charset_cp932_japanese_ci=
|
|||
2, /* mbmaxlen */
|
||||
0, /* min_sort_char */
|
||||
255, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
1, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_handler,
|
||||
&my_collation_ci_handler
|
||||
|
|
@ -5553,6 +5554,7 @@ CHARSET_INFO my_charset_cp932_bin=
|
|||
2, /* mbmaxlen */
|
||||
0, /* min_sort_char */
|
||||
255, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
1, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_handler,
|
||||
&my_collation_mb_bin_handler
|
||||
|
|
|
|||
|
|
@ -628,6 +628,7 @@ CHARSET_INFO my_charset_latin2_czech_ci =
|
|||
1, /* mbmaxlen */
|
||||
0, /* min_sort_char */
|
||||
0, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_8bit_handler,
|
||||
&my_collation_latin2_czech_ci_handler
|
||||
|
|
|
|||
|
|
@ -8706,6 +8706,7 @@ CHARSET_INFO my_charset_euckr_korean_ci=
|
|||
2, /* mbmaxlen */
|
||||
0, /* min_sort_char */
|
||||
255, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_handler,
|
||||
&my_collation_ci_handler
|
||||
|
|
@ -8738,6 +8739,7 @@ CHARSET_INFO my_charset_euckr_bin=
|
|||
2, /* mbmaxlen */
|
||||
0, /* min_sort_char */
|
||||
255, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_handler,
|
||||
&my_collation_mb_bin_handler
|
||||
|
|
|
|||
|
|
@ -8708,6 +8708,7 @@ CHARSET_INFO my_charset_eucjpms_japanese_ci=
|
|||
3, /* mbmaxlen */
|
||||
0, /* min_sort_char */
|
||||
255, /* max_sort_char */
|
||||
' ', /* pad_char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_handler,
|
||||
&my_collation_ci_handler
|
||||
|
|
@ -8740,6 +8741,7 @@ CHARSET_INFO my_charset_eucjpms_bin=
|
|||
3, /* mbmaxlen */
|
||||
0, /* min_sort_char */
|
||||
255, /* max_sort_char */
|
||||
' ', /* pad_char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_handler,
|
||||
&my_collation_mb_bin_handler
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ CHARSET_INFO compiled_charsets[] = {
|
|||
0, /* mbmaxlen */
|
||||
0, /* min_sort_ord */
|
||||
0, /* max_sort_ord */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
NULL, /* cset handler */
|
||||
NULL /* coll handler */
|
||||
|
|
|
|||
|
|
@ -5757,6 +5757,7 @@ CHARSET_INFO my_charset_gb2312_chinese_ci=
|
|||
2, /* mbmaxlen */
|
||||
0, /* min_sort_char */
|
||||
255, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_handler,
|
||||
&my_collation_ci_handler
|
||||
|
|
@ -5788,6 +5789,7 @@ CHARSET_INFO my_charset_gb2312_bin=
|
|||
2, /* mbmaxlen */
|
||||
0, /* min_sort_char */
|
||||
255, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_handler,
|
||||
&my_collation_mb_bin_handler
|
||||
|
|
|
|||
|
|
@ -10045,6 +10045,7 @@ CHARSET_INFO my_charset_gbk_chinese_ci=
|
|||
2, /* mbmaxlen */
|
||||
0, /* min_sort_char */
|
||||
255, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_handler,
|
||||
&my_collation_ci_handler
|
||||
|
|
@ -10076,6 +10077,7 @@ CHARSET_INFO my_charset_gbk_bin=
|
|||
2, /* mbmaxlen */
|
||||
0, /* min_sort_char */
|
||||
255, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_handler,
|
||||
&my_collation_mb_bin_handler
|
||||
|
|
|
|||
|
|
@ -441,6 +441,7 @@ CHARSET_INFO my_charset_latin1=
|
|||
1, /* mbmaxlen */
|
||||
0, /* min_sort_char */
|
||||
255, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_handler,
|
||||
&my_collation_8bit_simple_ci_handler
|
||||
|
|
@ -740,6 +741,7 @@ CHARSET_INFO my_charset_latin1_german2_ci=
|
|||
1, /* mbmaxlen */
|
||||
0, /* min_sort_char */
|
||||
247, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_handler,
|
||||
&my_collation_german2_ci_handler
|
||||
|
|
@ -772,6 +774,7 @@ CHARSET_INFO my_charset_latin1_bin=
|
|||
1, /* mbmaxlen */
|
||||
0, /* min_sort_char */
|
||||
255, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_handler,
|
||||
&my_collation_8bit_bin_handler
|
||||
|
|
|
|||
|
|
@ -1316,6 +1316,7 @@ static my_bool my_cset_init_8bit(CHARSET_INFO *cs, void *(*alloc)(uint))
|
|||
{
|
||||
cs->caseup_multiply= 1;
|
||||
cs->casedn_multiply= 1;
|
||||
cs->pad_char= ' ';
|
||||
return create_fromuni(cs, alloc);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4693,6 +4693,7 @@ CHARSET_INFO my_charset_sjis_japanese_ci=
|
|||
2, /* mbmaxlen */
|
||||
0, /* min_sort_char */
|
||||
255, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_handler,
|
||||
&my_collation_ci_handler
|
||||
|
|
@ -4724,6 +4725,7 @@ CHARSET_INFO my_charset_sjis_bin=
|
|||
2, /* mbmaxlen */
|
||||
0, /* min_sort_char */
|
||||
255, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_handler,
|
||||
&my_collation_mb_bin_handler
|
||||
|
|
|
|||
|
|
@ -498,7 +498,7 @@ static uint thai2sortable(uchar *tstr, uint len)
|
|||
l2bias use to control position weight of l2char
|
||||
example (*=l2char) XX*X must come before X*XX
|
||||
*/
|
||||
memcpy_overlap((char*) p, (char*) (p+1), tlen-1);
|
||||
memmove((char*) p, (char*) (p+1), tlen-1);
|
||||
tstr[len-1]= l2bias + t_ctype0[1]- L2_GARAN +1;
|
||||
p--;
|
||||
continue;
|
||||
|
|
@ -922,6 +922,7 @@ CHARSET_INFO my_charset_tis620_thai_ci=
|
|||
1, /* mbmaxlen */
|
||||
0, /* min_sort_char */
|
||||
255, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_handler,
|
||||
&my_collation_ci_handler
|
||||
|
|
@ -953,6 +954,7 @@ CHARSET_INFO my_charset_tis620_bin=
|
|||
1, /* mbmaxlen */
|
||||
0, /* min_sort_char */
|
||||
255, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_handler,
|
||||
&my_collation_8bit_bin_handler
|
||||
|
|
|
|||
|
|
@ -7954,6 +7954,7 @@ static my_bool create_tailoring(CHARSET_INFO *cs, void *(*alloc)(uint))
|
|||
|
||||
static my_bool my_coll_init_uca(CHARSET_INFO *cs, void *(*alloc)(uint))
|
||||
{
|
||||
cs->pad_char= ' ';
|
||||
return create_tailoring(cs, alloc);
|
||||
}
|
||||
|
||||
|
|
@ -8071,6 +8072,7 @@ CHARSET_INFO my_charset_ucs2_general_uca=
|
|||
2, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_ucs2_handler,
|
||||
&my_collation_ucs2_uca_handler
|
||||
|
|
@ -8102,6 +8104,7 @@ CHARSET_INFO my_charset_ucs2_icelandic_uca_ci=
|
|||
2, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_ucs2_handler,
|
||||
&my_collation_ucs2_uca_handler
|
||||
|
|
@ -8133,6 +8136,7 @@ CHARSET_INFO my_charset_ucs2_latvian_uca_ci=
|
|||
2, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_ucs2_handler,
|
||||
&my_collation_ucs2_uca_handler
|
||||
|
|
@ -8164,6 +8168,7 @@ CHARSET_INFO my_charset_ucs2_romanian_uca_ci=
|
|||
2, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_ucs2_handler,
|
||||
&my_collation_ucs2_uca_handler
|
||||
|
|
@ -8195,6 +8200,7 @@ CHARSET_INFO my_charset_ucs2_slovenian_uca_ci=
|
|||
2, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_ucs2_handler,
|
||||
&my_collation_ucs2_uca_handler
|
||||
|
|
@ -8226,6 +8232,7 @@ CHARSET_INFO my_charset_ucs2_polish_uca_ci=
|
|||
2, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_ucs2_handler,
|
||||
&my_collation_ucs2_uca_handler
|
||||
|
|
@ -8257,6 +8264,7 @@ CHARSET_INFO my_charset_ucs2_estonian_uca_ci=
|
|||
2, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_ucs2_handler,
|
||||
&my_collation_ucs2_uca_handler
|
||||
|
|
@ -8288,6 +8296,7 @@ CHARSET_INFO my_charset_ucs2_spanish_uca_ci=
|
|||
2, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_ucs2_handler,
|
||||
&my_collation_ucs2_uca_handler
|
||||
|
|
@ -8319,6 +8328,7 @@ CHARSET_INFO my_charset_ucs2_swedish_uca_ci=
|
|||
2, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_ucs2_handler,
|
||||
&my_collation_ucs2_uca_handler
|
||||
|
|
@ -8350,6 +8360,7 @@ CHARSET_INFO my_charset_ucs2_turkish_uca_ci=
|
|||
2, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_ucs2_handler,
|
||||
&my_collation_ucs2_uca_handler
|
||||
|
|
@ -8381,6 +8392,7 @@ CHARSET_INFO my_charset_ucs2_czech_uca_ci=
|
|||
2, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_ucs2_handler,
|
||||
&my_collation_ucs2_uca_handler
|
||||
|
|
@ -8413,6 +8425,7 @@ CHARSET_INFO my_charset_ucs2_danish_uca_ci=
|
|||
2, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_ucs2_handler,
|
||||
&my_collation_ucs2_uca_handler
|
||||
|
|
@ -8444,6 +8457,7 @@ CHARSET_INFO my_charset_ucs2_lithuanian_uca_ci=
|
|||
2, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_ucs2_handler,
|
||||
&my_collation_ucs2_uca_handler
|
||||
|
|
@ -8475,6 +8489,7 @@ CHARSET_INFO my_charset_ucs2_slovak_uca_ci=
|
|||
2, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_ucs2_handler,
|
||||
&my_collation_ucs2_uca_handler
|
||||
|
|
@ -8506,6 +8521,7 @@ CHARSET_INFO my_charset_ucs2_spanish2_uca_ci=
|
|||
2, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_ucs2_handler,
|
||||
&my_collation_ucs2_uca_handler
|
||||
|
|
@ -8538,6 +8554,7 @@ CHARSET_INFO my_charset_ucs2_roman_uca_ci=
|
|||
2, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_ucs2_handler,
|
||||
&my_collation_ucs2_uca_handler
|
||||
|
|
@ -8570,6 +8587,7 @@ CHARSET_INFO my_charset_ucs2_persian_uca_ci=
|
|||
2, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_ucs2_handler,
|
||||
&my_collation_ucs2_uca_handler
|
||||
|
|
@ -8602,6 +8620,7 @@ CHARSET_INFO my_charset_ucs2_esperanto_uca_ci=
|
|||
2, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_ucs2_handler,
|
||||
&my_collation_ucs2_uca_handler
|
||||
|
|
@ -8681,6 +8700,7 @@ CHARSET_INFO my_charset_utf8_general_uca_ci=
|
|||
3, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_utf8_handler,
|
||||
&my_collation_any_uca_handler
|
||||
|
|
@ -8713,6 +8733,7 @@ CHARSET_INFO my_charset_utf8_icelandic_uca_ci=
|
|||
3, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_utf8_handler,
|
||||
&my_collation_any_uca_handler
|
||||
|
|
@ -8744,6 +8765,7 @@ CHARSET_INFO my_charset_utf8_latvian_uca_ci=
|
|||
3, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_utf8_handler,
|
||||
&my_collation_any_uca_handler
|
||||
|
|
@ -8775,6 +8797,7 @@ CHARSET_INFO my_charset_utf8_romanian_uca_ci=
|
|||
3, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_utf8_handler,
|
||||
&my_collation_any_uca_handler
|
||||
|
|
@ -8806,6 +8829,7 @@ CHARSET_INFO my_charset_utf8_slovenian_uca_ci=
|
|||
3, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_utf8_handler,
|
||||
&my_collation_any_uca_handler
|
||||
|
|
@ -8837,6 +8861,7 @@ CHARSET_INFO my_charset_utf8_polish_uca_ci=
|
|||
3, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_utf8_handler,
|
||||
&my_collation_any_uca_handler
|
||||
|
|
@ -8868,6 +8893,7 @@ CHARSET_INFO my_charset_utf8_estonian_uca_ci=
|
|||
3, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_utf8_handler,
|
||||
&my_collation_any_uca_handler
|
||||
|
|
@ -8899,6 +8925,7 @@ CHARSET_INFO my_charset_utf8_spanish_uca_ci=
|
|||
3, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_utf8_handler,
|
||||
&my_collation_any_uca_handler
|
||||
|
|
@ -8930,6 +8957,7 @@ CHARSET_INFO my_charset_utf8_swedish_uca_ci=
|
|||
3, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_utf8_handler,
|
||||
&my_collation_any_uca_handler
|
||||
|
|
@ -8961,6 +8989,7 @@ CHARSET_INFO my_charset_utf8_turkish_uca_ci=
|
|||
3, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_utf8_handler,
|
||||
&my_collation_any_uca_handler
|
||||
|
|
@ -8992,6 +9021,7 @@ CHARSET_INFO my_charset_utf8_czech_uca_ci=
|
|||
3, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_utf8_handler,
|
||||
&my_collation_any_uca_handler
|
||||
|
|
@ -9024,6 +9054,7 @@ CHARSET_INFO my_charset_utf8_danish_uca_ci=
|
|||
3, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_utf8_handler,
|
||||
&my_collation_any_uca_handler
|
||||
|
|
@ -9055,6 +9086,7 @@ CHARSET_INFO my_charset_utf8_lithuanian_uca_ci=
|
|||
3, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_utf8_handler,
|
||||
&my_collation_any_uca_handler
|
||||
|
|
@ -9086,6 +9118,7 @@ CHARSET_INFO my_charset_utf8_slovak_uca_ci=
|
|||
3, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_utf8_handler,
|
||||
&my_collation_any_uca_handler
|
||||
|
|
@ -9117,6 +9150,7 @@ CHARSET_INFO my_charset_utf8_spanish2_uca_ci=
|
|||
3, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_utf8_handler,
|
||||
&my_collation_any_uca_handler
|
||||
|
|
@ -9148,6 +9182,7 @@ CHARSET_INFO my_charset_utf8_roman_uca_ci=
|
|||
3, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_utf8_handler,
|
||||
&my_collation_any_uca_handler
|
||||
|
|
@ -9179,6 +9214,7 @@ CHARSET_INFO my_charset_utf8_persian_uca_ci=
|
|||
3, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_utf8_handler,
|
||||
&my_collation_any_uca_handler
|
||||
|
|
@ -9210,6 +9246,7 @@ CHARSET_INFO my_charset_utf8_esperanto_uca_ci=
|
|||
3, /* mbmaxlen */
|
||||
9, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_utf8_handler,
|
||||
&my_collation_any_uca_handler
|
||||
|
|
|
|||
|
|
@ -1623,6 +1623,7 @@ CHARSET_INFO my_charset_ucs2_general_ci=
|
|||
2, /* mbmaxlen */
|
||||
0, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_ucs2_handler,
|
||||
&my_collation_ucs2_general_ci_handler
|
||||
|
|
@ -1654,6 +1655,7 @@ CHARSET_INFO my_charset_ucs2_bin=
|
|||
2, /* mbmaxlen */
|
||||
0, /* min_sort_char */
|
||||
0xFFFF, /* max_sort_char */
|
||||
' ', /* pad char */
|
||||
0, /* escape_with_backslash_is_dangerous */
|
||||
&my_charset_ucs2_handler,
|
||||
&my_collation_ucs2_bin_handler
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue