mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 02:05:57 +01:00
Merge
This commit is contained in:
tomas@poseidon.ndb.mysql.com
commit
620b7bafb0
449 changed files with 13079 additions and 6107 deletions
996
.bzrignore
996
.bzrignore
File diff suppressed because it is too large
Load diff
|
|
@ -10,6 +10,11 @@ prefix_configs="--prefix=/usr/local/mysql"
|
|||
just_print=
|
||||
just_configure=
|
||||
full_debug=
|
||||
if test -n "$MYSQL_BUILD_PREFIX"
|
||||
then
|
||||
prefix_configs="--prefix=$MYSQL_BUILD_PREFIX"
|
||||
fi
|
||||
|
||||
while test $# -gt 0
|
||||
do
|
||||
case "$1" in
|
||||
|
|
@ -47,10 +52,11 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch
|
|||
#debug_extra_warnings="-Wuninitialized"
|
||||
c_warnings="$global_warnings -Wunused"
|
||||
cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
|
||||
|
||||
base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-partition"
|
||||
max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-openssl --with-embedded-server --with-big-tables --with-partition"
|
||||
base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine --with-partition"
|
||||
base_max_no_ndb_configs="--with-innodb --with-berkeley-db --without-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine"
|
||||
max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-csv-storage-engine --with-openssl --with-embedded-server --with-big-tables --with-partition"
|
||||
max_configs="$base_max_configs --with-embedded-server"
|
||||
max_no_ndb_configs="$base_max_no_ndb_configs --with-embedded-server"
|
||||
|
||||
path=`dirname $0`
|
||||
. "$path/check-cpu"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ aclocal || die "Can't execute aclocal"
|
|||
autoheader || die "Can't execute autoheader"
|
||||
# --force means overwrite ltmain.sh script if it already exists
|
||||
# Added glibtoolize reference to make native OSX autotools work
|
||||
if [ -f /usr/bin/glibtoolize ] ; then
|
||||
if test -f /usr/bin/glibtoolize ; then
|
||||
glibtoolize --automake --force || die "Can't execute glibtoolize"
|
||||
else
|
||||
libtoolize --automake --force || die "Can't execute libtoolize"
|
||||
|
|
|
|||
11
BUILD/compile-pentium-debug-max-no-ndb
Executable file
11
BUILD/compile-pentium-debug-max-no-ndb
Executable file
|
|
@ -0,0 +1,11 @@
|
|||
#! /bin/sh
|
||||
|
||||
path=`dirname $0`
|
||||
. "$path/SETUP.sh" $@ --with-debug=full
|
||||
|
||||
extra_flags="$pentium_cflags $debug_cflags $max_cflags"
|
||||
c_warnings="$c_warnings $debug_extra_warnings"
|
||||
cxx_warnings="$cxx_warnings $debug_extra_warnings"
|
||||
extra_configs="$pentium_configs $debug_configs $max_no_ndb_configs"
|
||||
|
||||
. "$path/FINISH.sh"
|
||||
11
BUILD/compile-ppc-debug-max-no-ndb
Executable file
11
BUILD/compile-ppc-debug-max-no-ndb
Executable file
|
|
@ -0,0 +1,11 @@
|
|||
#! /bin/sh
|
||||
|
||||
path=`dirname $0`
|
||||
. "$path/SETUP.sh"
|
||||
|
||||
extra_flags="$ppc_cflags $debug_cflags $max_cflags"
|
||||
c_warnings="$c_warnings $debug_extra_warnings"
|
||||
cxx_warnings="$cxx_warnings $debug_extra_warnings"
|
||||
extra_configs="$debug_configs $max_no_ndb_configs"
|
||||
|
||||
. "$path/FINISH.sh"
|
||||
19
Makefile.am
19
Makefile.am
|
|
@ -109,15 +109,26 @@ MYSQL_TEST_RUN_ARGS = --manager-port=$(MYSQL_TEST_MANAGER_PORT) \
|
|||
--master_port=$(MYSQL_TEST_MASTER_PORT) \
|
||||
--slave_port=$(MYSQL_TEST_SLAVE_PORT) \
|
||||
--ndbcluster_port=$(MYSQL_TEST_NDB_PORT)
|
||||
|
||||
test:
|
||||
cd mysql-test ; \
|
||||
./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) && \
|
||||
./mysql-test-run.pl --ps-protocol $(MYSQL_TEST_RUN_ARGS)
|
||||
./mysql-test-run $(MYSQL_TEST_RUN_ARGS) && \
|
||||
./mysql-test-run $(MYSQL_TEST_RUN_ARGS) --ps-protocol
|
||||
|
||||
test-force:
|
||||
cd mysql-test ; \
|
||||
./mysql-test-run --force $(MYSQL_TEST_RUN_ARGS) ; \
|
||||
./mysql-test-run --ps-protocol --force $(MYSQL_TEST_RUN_ARGS)
|
||||
./mysql-test-run $(MYSQL_TEST_RUN_ARGS) --force ; \
|
||||
./mysql-test-run $(MYSQL_TEST_RUN_ARGS) --ps-protocol --force
|
||||
|
||||
test-pl:
|
||||
cd mysql-test ; \
|
||||
./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) && \
|
||||
./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) --ps-protocol
|
||||
|
||||
test-force-pl:
|
||||
cd mysql-test ; \
|
||||
./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) --force ; \
|
||||
./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) --ps-protocol --force
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
|
|
|||
1
VC++Files/storage/bdb/bdb.vcproj → VC++Files/bdb/bdb.vcproj
Executable file → Normal file
1
VC++Files/storage/bdb/bdb.vcproj → VC++Files/bdb/bdb.vcproj
Executable file → Normal file
|
|
@ -3,7 +3,6 @@
|
|||
ProjectType="Visual C++"
|
||||
Version="7.10"
|
||||
Name="bdb"
|
||||
ProjectGUID="{FB168572-FFF4-4503-9331-4E958459DC9D}"
|
||||
SccProjectName=""
|
||||
SccLocalPath="">
|
||||
<Platforms>
|
||||
0
VC++Files/client/mysql.vcproj
Executable file → Normal file
0
VC++Files/client/mysql.vcproj
Executable file → Normal file
0
VC++Files/client/mysqladmin.vcproj
Executable file → Normal file
0
VC++Files/client/mysqladmin.vcproj
Executable file → Normal file
0
VC++Files/client/mysqlclient.vcproj
Executable file → Normal file
0
VC++Files/client/mysqlclient.vcproj
Executable file → Normal file
0
VC++Files/client/mysqldump.vcproj
Executable file → Normal file
0
VC++Files/client/mysqldump.vcproj
Executable file → Normal file
0
VC++Files/client/mysqlimport.vcproj
Executable file → Normal file
0
VC++Files/client/mysqlimport.vcproj
Executable file → Normal file
0
VC++Files/client/mysqlshow.vcproj
Executable file → Normal file
0
VC++Files/client/mysqlshow.vcproj
Executable file → Normal file
0
VC++Files/client/mysqltest.vcproj
Executable file → Normal file
0
VC++Files/client/mysqltest.vcproj
Executable file → Normal file
0
VC++Files/comp_err/comp_err.vcproj
Executable file → Normal file
0
VC++Files/comp_err/comp_err.vcproj
Executable file → Normal file
0
VC++Files/dbug/dbug.vcproj
Executable file → Normal file
0
VC++Files/dbug/dbug.vcproj
Executable file → Normal file
9
VC++Files/storage/heap/heap.vcproj → VC++Files/heap/heap.vcproj
Executable file → Normal file
9
VC++Files/storage/heap/heap.vcproj → VC++Files/heap/heap.vcproj
Executable file → Normal file
|
|
@ -3,7 +3,6 @@
|
|||
ProjectType="Visual C++"
|
||||
Version="7.10"
|
||||
Name="heap"
|
||||
ProjectGUID="{603E5567-F3CD-4547-9F2B-E0082B702B0D}"
|
||||
SccProjectName=""
|
||||
SccLocalPath="">
|
||||
<Platforms>
|
||||
|
|
@ -23,7 +22,7 @@
|
|||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
OptimizeForProcessor="2"
|
||||
AdditionalIncludeDirectories="../../include"
|
||||
AdditionalIncludeDirectories="../include"
|
||||
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;NDEBUG"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
|
|
@ -72,7 +71,7 @@
|
|||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
OptimizeForProcessor="2"
|
||||
AdditionalIncludeDirectories="../../include"
|
||||
AdditionalIncludeDirectories="../include"
|
||||
PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_TLS"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="1"
|
||||
|
|
@ -122,7 +121,7 @@
|
|||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
OptimizeForProcessor="2"
|
||||
AdditionalIncludeDirectories="../../include"
|
||||
AdditionalIncludeDirectories="../include"
|
||||
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;NDEBUG;USE_TLS"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
|
|
@ -171,7 +170,7 @@
|
|||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
OptimizeForProcessor="2"
|
||||
AdditionalIncludeDirectories="../../include"
|
||||
AdditionalIncludeDirectories="../include"
|
||||
PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="1"
|
||||
9
VC++Files/storage/innobase/innobase.vcproj → VC++Files/innobase/innobase.vcproj
Executable file → Normal file
9
VC++Files/storage/innobase/innobase.vcproj → VC++Files/innobase/innobase.vcproj
Executable file → Normal file
|
|
@ -3,7 +3,6 @@
|
|||
ProjectType="Visual C++"
|
||||
Version="7.10"
|
||||
Name="innobase"
|
||||
ProjectGUID="{AEFFF9CA-3387-4027-B569-33D5D26887D1}"
|
||||
SccProjectName=""
|
||||
SccLocalPath="">
|
||||
<Platforms>
|
||||
|
|
@ -25,7 +24,7 @@
|
|||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
OptimizeForProcessor="2"
|
||||
AdditionalIncludeDirectories="include, ../../include"
|
||||
AdditionalIncludeDirectories="../innobase/include,../include"
|
||||
PreprocessorDefinitions="_LIB;_WIN32;WIN32;NDEBUG;MYSQL_SERVER"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
|
|
@ -76,7 +75,7 @@
|
|||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
OptimizeForProcessor="2"
|
||||
AdditionalIncludeDirectories="include, ../../include"
|
||||
AdditionalIncludeDirectories="../innobase/include,../include"
|
||||
PreprocessorDefinitions="NDEBUG;_LIB;_WIN32;WIN32;MYSQL_SERVER"
|
||||
RuntimeLibrary="1"
|
||||
PrecompiledHeaderFile=".\debug/innobase.pch"
|
||||
|
|
@ -127,7 +126,7 @@
|
|||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
OptimizeForProcessor="2"
|
||||
AdditionalIncludeDirectories="include, ../../include"
|
||||
AdditionalIncludeDirectories="../innobase/include,../include"
|
||||
PreprocessorDefinitions="_LIB;_WIN32;WIN32;MYSQL_SERVER;NDEBUG"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
|
|
@ -180,7 +179,7 @@
|
|||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
OptimizeForProcessor="2"
|
||||
AdditionalIncludeDirectories="include, ../../include"
|
||||
AdditionalIncludeDirectories="../innobase/include,../include"
|
||||
PreprocessorDefinitions="_LIB;_WIN32;WIN32;NDEBUG;MYSQL_SERVER"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
0
VC++Files/libmysql/libmysql.vcproj
Executable file → Normal file
0
VC++Files/libmysql/libmysql.vcproj
Executable file → Normal file
0
VC++Files/libmysqld/examples/test_libmysqld.vcproj
Executable file → Normal file
0
VC++Files/libmysqld/examples/test_libmysqld.vcproj
Executable file → Normal file
14
VC++Files/libmysqld/libmysqld.vcproj
Executable file → Normal file
14
VC++Files/libmysqld/libmysqld.vcproj
Executable file → Normal file
|
|
@ -24,7 +24,7 @@
|
|||
AdditionalIncludeDirectories="../include,../libmysqld,../sql,../regex,../extra/yassl/include,../bdb/build_win32,../zlib"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;SAFEMALLOC;HAVE_BERKELEY_DB;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;HAVE_INNOBASE_DB;USE_TLS;__WIN__"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="0"
|
||||
RuntimeLibrary="1"
|
||||
PrecompiledHeaderFile=".\debug/libmysqld.pch"
|
||||
AssemblerListingLocation=".\debug/"
|
||||
ObjectFile=".\debug/"
|
||||
|
|
@ -37,11 +37,11 @@
|
|||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="odbc32.lib odbccp32.lib Wsock32.lib ..\lib_debug\dbug_tls.lib ..\lib_debug\mysys_tls.lib ..\lib_debug\strings.lib ..\lib_debug\regex.lib ..\lib_debug\heap_tls.lib ..\lib_debug\innodb.lib ..\extra\yassl\Debug\yassl.lib"
|
||||
AdditionalDependencies="odbc32.lib odbccp32.lib Wsock32.lib"
|
||||
OutputFile="../lib_debug/libmysqld.dll"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
IgnoreDefaultLibraryNames="LIBCMTD"
|
||||
IgnoreDefaultLibraryNames=""
|
||||
ModuleDefinitionFile=".\libmysqld.def"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile=".\debug/libmysqld.pdb"
|
||||
|
|
@ -106,7 +106,7 @@
|
|||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\myisam_tls.lib ..\lib_release\myisammrg_tls.lib ..\lib_release\mysys_tls.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap_tls.lib ..\lib_release\innodb.lib ..\lib_release\zlib.lib ..\extra\yassl\Release\yassl.lib"
|
||||
AdditionalDependencies="odbc32.lib odbccp32.lib Wsock32.lib"
|
||||
OutputFile="../lib_pro/libmysqld.dll"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
|
|
@ -172,7 +172,7 @@
|
|||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\myisam_tls.lib ..\lib_release\myisammrg_tls.lib ..\lib_release\mysys_tls.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap_tls.lib ..\lib_release\innodb.lib ..\lib_release\bdb.lib ..\lib_release\zlib.lib ..\extra\yassl\Release\yassl.lib"
|
||||
AdditionalDependencies="odbc32.lib odbccp32.lib Wsock32.lib"
|
||||
OutputFile="../lib_release/libmysqld.dll"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
|
|
@ -238,7 +238,7 @@
|
|||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\myisam_tls.lib ..\lib_release\myisammrg_tls.lib ..\lib_release\mysys_tls.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap_tls.lib ..\lib_release\zlib.lib ..\extra\yassl\Release\yassl.lib"
|
||||
AdditionalDependencies="odbc32.lib odbccp32.lib Wsock32.lib"
|
||||
OutputFile="../lib_classic/libmysqld.dll"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
|
|
@ -2299,7 +2299,7 @@
|
|||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\sql\protocol_cursor.cpp">
|
||||
RelativePath="..\sql\sql_cursor.cpp">
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32">
|
||||
<Tool
|
||||
|
|
|
|||
6
VC++Files/libmysqltest/myTest.vcproj
Executable file → Normal file
6
VC++Files/libmysqltest/myTest.vcproj
Executable file → Normal file
|
|
@ -40,7 +40,7 @@
|
|||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="libmysql.lib odbc32.lib odbccp32.lib"
|
||||
OutputFile=".\release/myTest.exe"
|
||||
OutputFile="..\client_release/myTest.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories="..\lib_release"
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
OutputDirectory=".\debug"
|
||||
OutputDirectory="..\client_debug"
|
||||
IntermediateDirectory=".\debug"
|
||||
ConfigurationType="1"
|
||||
UseOfMFC="0"
|
||||
|
|
@ -100,7 +100,7 @@
|
|||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="libmysql.lib odbc32.lib odbccp32.lib"
|
||||
OutputFile=".\debug/myTest.exe"
|
||||
OutputFile="../client_debug/myTest.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories="..\lib_debug"
|
||||
|
|
|
|||
0
VC++Files/my_print_defaults/my_print_defaults.vcproj
Executable file → Normal file
0
VC++Files/my_print_defaults/my_print_defaults.vcproj
Executable file → Normal file
9
VC++Files/storage/myisam/myisam.vcproj → VC++Files/myisam/myisam.vcproj
Executable file → Normal file
9
VC++Files/storage/myisam/myisam.vcproj → VC++Files/myisam/myisam.vcproj
Executable file → Normal file
|
|
@ -3,7 +3,6 @@
|
|||
ProjectType="Visual C++"
|
||||
Version="7.10"
|
||||
Name="myisam"
|
||||
ProjectGUID="{E85E5D80-641E-44C7-B909-3805A8D3167B}"
|
||||
SccProjectName=""
|
||||
SccLocalPath="">
|
||||
<Platforms>
|
||||
|
|
@ -22,7 +21,7 @@
|
|||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
OptimizeForProcessor="2"
|
||||
AdditionalIncludeDirectories="../../include"
|
||||
AdditionalIncludeDirectories="../include"
|
||||
PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="1"
|
||||
|
|
@ -73,7 +72,7 @@
|
|||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
OptimizeForProcessor="2"
|
||||
AdditionalIncludeDirectories="../../include"
|
||||
AdditionalIncludeDirectories="../include"
|
||||
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;NDEBUG"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
|
|
@ -124,7 +123,7 @@
|
|||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
OptimizeForProcessor="2"
|
||||
AdditionalIncludeDirectories="../../include"
|
||||
AdditionalIncludeDirectories="../include"
|
||||
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;NDEBUG;USE_TLS"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
|
|
@ -174,7 +173,7 @@
|
|||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
OptimizeForProcessor="2"
|
||||
AdditionalIncludeDirectories="../../include"
|
||||
AdditionalIncludeDirectories="../include"
|
||||
PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_TLS"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="1"
|
||||
0
VC++Files/myisam_ftdump/myisam_ftdump.vcproj
Executable file → Normal file
0
VC++Files/myisam_ftdump/myisam_ftdump.vcproj
Executable file → Normal file
2
VC++Files/myisamchk/myisamchk.vcproj
Executable file → Normal file
2
VC++Files/myisamchk/myisamchk.vcproj
Executable file → Normal file
|
|
@ -101,7 +101,7 @@
|
|||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="wsock32.lib setargv.obj ..\lib_release\myisam.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\zlib.lib"
|
||||
AdditionalDependencies="wsock32.lib setargv.obj"
|
||||
OutputFile="../client_classic/myisamchk.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
|
|
|
|||
0
VC++Files/myisamlog/myisamlog.vcproj
Executable file → Normal file
0
VC++Files/myisamlog/myisamlog.vcproj
Executable file → Normal file
9
VC++Files/storage/myisammrg/myisammrg.vcproj → VC++Files/myisammrg/myisammrg.vcproj
Executable file → Normal file
9
VC++Files/storage/myisammrg/myisammrg.vcproj → VC++Files/myisammrg/myisammrg.vcproj
Executable file → Normal file
|
|
@ -3,7 +3,6 @@
|
|||
ProjectType="Visual C++"
|
||||
Version="7.10"
|
||||
Name="myisammrg"
|
||||
ProjectGUID="{91B7E9AD-5F85-4236-9A28-B032543B123E}"
|
||||
SccProjectName=""
|
||||
SccLocalPath="">
|
||||
<Platforms>
|
||||
|
|
@ -23,7 +22,7 @@
|
|||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
OptimizeForProcessor="2"
|
||||
AdditionalIncludeDirectories="../../include"
|
||||
AdditionalIncludeDirectories="../include"
|
||||
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;NDEBUG"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
|
|
@ -73,7 +72,7 @@
|
|||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
OptimizeForProcessor="2"
|
||||
AdditionalIncludeDirectories="../../include"
|
||||
AdditionalIncludeDirectories="../include"
|
||||
PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_TLS"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="1"
|
||||
|
|
@ -124,7 +123,7 @@
|
|||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
OptimizeForProcessor="2"
|
||||
AdditionalIncludeDirectories="../../include"
|
||||
AdditionalIncludeDirectories="../include"
|
||||
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;NDEBUG;USE_TLS"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
|
|
@ -174,7 +173,7 @@
|
|||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
OptimizeForProcessor="2"
|
||||
AdditionalIncludeDirectories="../../include"
|
||||
AdditionalIncludeDirectories="../include"
|
||||
PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="1"
|
||||
0
VC++Files/myisampack/myisampack.vcproj
Executable file → Normal file
0
VC++Files/myisampack/myisampack.vcproj
Executable file → Normal file
0
VC++Files/mysql-test/mysql_test_run_new.vcproj
Executable file → Normal file
0
VC++Files/mysql-test/mysql_test_run_new.vcproj
Executable file → Normal file
541
VC++Files/mysql.sln
Executable file → Normal file
541
VC++Files/mysql.sln
Executable file → Normal file
|
|
@ -1,4 +1,8 @@
|
|||
Microsoft Visual Studio Solution File, Format Version 8.00
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdb", "bdb\bdb.vcproj", "{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "comp_err", "comp_err\comp_err.vcproj", "{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859} = {EEC1300B-85A5-497C-B3E1-F708021DF859}
|
||||
|
|
@ -10,6 +14,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbug", "dbug\dbug.vcproj",
|
|||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "heap", "heap\heap.vcproj", "{C70A6DC7-7D45-4C16-8654-7E57713A4C04}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "innobase", "innobase\innobase.vcproj", "{13D37150-54D0-46C5-9519-03923243C7C7}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmysql", "libmysql\libmysql.vcproj", "{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859} = {EEC1300B-85A5-497C-B3E1-F708021DF859}
|
||||
|
|
@ -22,8 +34,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmysqld", "libmysqld\libm
|
|||
ProjectSection(ProjectDependencies) = postProject
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859} = {EEC1300B-85A5-497C-B3E1-F708021DF859}
|
||||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113} = {207E9014-C4D1-4F6D-B76F-BC7DD7E31113}
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7} = {13D37150-54D0-46C5-9519-03923243C7C7}
|
||||
{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB} = {BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3} = {6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}
|
||||
{DB28DE80-837F-4497-9AA9-CC0A20584C98} = {DB28DE80-837F-4497-9AA9-CC0A20584C98}
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0} = {D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2} = {262280A8-37D5-4037-BDFB-242468DFB3D2}
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF} = {8762A9B8-72A9-462E-A9A2-F3265081F8AF}
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04} = {C70A6DC7-7D45-4C16-8654-7E57713A4C04}
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE}
|
||||
EndProjectSection
|
||||
|
|
@ -40,9 +58,14 @@ 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}") = "myisam", "myisam\myisam.vcproj", "{262280A8-37D5-4037-BDFB-242468DFB3D2}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "myisam_ftdump", "myisam_ftdump\myisam_ftdump.vcproj", "{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859} = {EEC1300B-85A5-497C-B3E1-F708021DF859}
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2} = {262280A8-37D5-4037-BDFB-242468DFB3D2}
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE}
|
||||
EndProjectSection
|
||||
|
|
@ -50,6 +73,7 @@ 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}
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2} = {262280A8-37D5-4037-BDFB-242468DFB3D2}
|
||||
{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}
|
||||
|
|
@ -58,14 +82,20 @@ EndProject
|
|||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "myisamlog", "myisamlog\myisamlog.vcproj", "{194F5EE6-9440-4298-A6FE-A9B4B480B44C}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859} = {EEC1300B-85A5-497C-B3E1-F708021DF859}
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2} = {262280A8-37D5-4037-BDFB-242468DFB3D2}
|
||||
{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}") = "myisammrg", "myisammrg\myisammrg.vcproj", "{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
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}
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2} = {262280A8-37D5-4037-BDFB-242468DFB3D2}
|
||||
{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}
|
||||
|
|
@ -111,15 +141,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqld", "sql\mysqld.vcproj
|
|||
ProjectSection(ProjectDependencies) = postProject
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859} = {EEC1300B-85A5-497C-B3E1-F708021DF859}
|
||||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113} = {207E9014-C4D1-4F6D-B76F-BC7DD7E31113}
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D} = {603E5567-F3CD-4547-9F2B-E0082B702B0D}
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D} = {FB168572-FFF4-4503-9331-4E958459DC9D}
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7} = {13D37150-54D0-46C5-9519-03923243C7C7}
|
||||
{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB} = {BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B} = {E85E5D80-641E-44C7-B909-3805A8D3167B}
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3} = {6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}
|
||||
{DB28DE80-837F-4497-9AA9-CC0A20584C98} = {DB28DE80-837F-4497-9AA9-CC0A20584C98}
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E} = {91B7E9AD-5F85-4236-9A28-B032543B123E}
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0} = {D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2} = {262280A8-37D5-4037-BDFB-242468DFB3D2}
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF} = {8762A9B8-72A9-462E-A9A2-F3265081F8AF}
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B} = {F74653C4-8003-4A79-8F53-FC69E0AD7A9B}
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1} = {AEFFF9CA-3387-4027-B569-33D5D26887D1}
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04} = {C70A6DC7-7D45-4C16-8654-7E57713A4C04}
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE}
|
||||
EndProjectSection
|
||||
|
|
@ -148,8 +178,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlserver", "mysqlserver\
|
|||
ProjectSection(ProjectDependencies) = postProject
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859} = {EEC1300B-85A5-497C-B3E1-F708021DF859}
|
||||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113} = {207E9014-C4D1-4F6D-B76F-BC7DD7E31113}
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7} = {13D37150-54D0-46C5-9519-03923243C7C7}
|
||||
{37D9BA79-302E-4582-A545-CB5FF7982EA3} = {37D9BA79-302E-4582-A545-CB5FF7982EA3}
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0} = {D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2} = {262280A8-37D5-4037-BDFB-242468DFB3D2}
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF} = {8762A9B8-72A9-462E-A9A2-F3265081F8AF}
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04} = {C70A6DC7-7D45-4C16-8654-7E57713A4C04}
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE}
|
||||
EndProjectSection
|
||||
|
|
@ -235,6 +269,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqltest", "client\mysqlte
|
|||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysql_client_test", "tests\mysql_client_test.vcproj", "{DA224DAB-5006-42BE-BB77-16E8BE5326D5}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB} = {26383276-4843-494B-8BE0-8936ED3EBAAB}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysql_test_run_new", "mysql-test\mysql_test_run_new.vcproj", "{6189F838-21C6-42A1-B2D0-9146316573F7}"
|
||||
|
|
@ -253,24 +288,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlmanager", "server-tool
|
|||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B} = {F74653C4-8003-4A79-8F53-FC69E0AD7A9B}
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE}
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdb", "storage\bdb\bdb.vcproj", "{FB168572-FFF4-4503-9331-4E958459DC9D}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "heap", "storage\heap\heap.vcproj", "{603E5567-F3CD-4547-9F2B-E0082B702B0D}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "innobase", "storage\innobase\innobase.vcproj", "{AEFFF9CA-3387-4027-B569-33D5D26887D1}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "myisam", "storage\myisam\myisam.vcproj", "{E85E5D80-641E-44C7-B909-3805A8D3167B}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "myisammrg", "storage\myisammrg\myisammrg.vcproj", "{91B7E9AD-5F85-4236-9A28-B032543B123E}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Global
|
||||
|
|
@ -288,10 +305,34 @@ Global
|
|||
pro = pro
|
||||
pro nt = pro nt
|
||||
Release = Release
|
||||
TLS = TLS
|
||||
TLS_DEBUG = TLS_DEBUG
|
||||
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_Release.ActiveCfg = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Embedded_Release.Build.0 = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Max.ActiveCfg = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Max.Build.0 = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Max nt.ActiveCfg = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Max nt.Build.0 = Max|Win32
|
||||
{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}.Release.ActiveCfg = Max|Win32
|
||||
{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Release.Build.0 = Max|Win32
|
||||
{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.classic.ActiveCfg = Release|Win32
|
||||
{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.classic nt.ActiveCfg = Release|Win32
|
||||
{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.classic nt.Build.0 = Release|Win32
|
||||
|
|
@ -312,21 +353,20 @@ Global
|
|||
{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.pro nt.Build.0 = Release|Win32
|
||||
{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.Release.ActiveCfg = Release|Win32
|
||||
{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.Release.Build.0 = Release|Win32
|
||||
{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.TLS.ActiveCfg = Release|Win32
|
||||
{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.TLS.Build.0 = Release|Win32
|
||||
{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.TLS_DEBUG.ActiveCfg = Release|Win32
|
||||
{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.TLS_DEBUG.Build.0 = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.classic.ActiveCfg = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.classic.Build.0 = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.classic nt.ActiveCfg = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.classic nt.Build.0 = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.Debug.ActiveCfg = Debug|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.Debug.Build.0 = Debug|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.Embedded_Classic.ActiveCfg = Debug|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.Embedded_Classic.ActiveCfg = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.Embedded_Classic.Build.0 = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.Embedded_Debug.ActiveCfg = TLS_DEBUG|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.Embedded_Debug.Build.0 = TLS_DEBUG|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.Embedded_Pro.ActiveCfg = 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_Release.ActiveCfg = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.Embedded_Release.Build.0 = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.Max.ActiveCfg = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.Max.Build.0 = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.Max nt.ActiveCfg = Release|Win32
|
||||
|
|
@ -339,10 +379,58 @@ Global
|
|||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.pro nt.Build.0 = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.Release.ActiveCfg = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.Release.Build.0 = Release|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.TLS.ActiveCfg = TLS_DEBUG|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.TLS.Build.0 = TLS_DEBUG|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.TLS_DEBUG.ActiveCfg = TLS_DEBUG|Win32
|
||||
{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.TLS_DEBUG.Build.0 = TLS_DEBUG|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.classic.ActiveCfg = Release|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.classic.Build.0 = Release|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.classic nt.ActiveCfg = Release|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.classic nt.Build.0 = Release|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Debug.ActiveCfg = Debug|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Debug.Build.0 = Debug|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Embedded_Classic.ActiveCfg = TLS|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Embedded_Classic.Build.0 = TLS|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Embedded_Debug.ActiveCfg = TLS_DEBUG|Win32
|
||||
{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_Release.ActiveCfg = TLS|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Embedded_Release.Build.0 = TLS|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Max.ActiveCfg = Release|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Max.Build.0 = Release|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Max nt.ActiveCfg = Release|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Max nt.Build.0 = Release|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.nt.ActiveCfg = Release|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.nt.Build.0 = Release|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.pro.ActiveCfg = Release|Win32
|
||||
{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}.Release.ActiveCfg = Release|Win32
|
||||
{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Release.Build.0 = Release|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.classic.ActiveCfg = Release|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.classic.Build.0 = Release|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.classic nt.ActiveCfg = nt|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.classic nt.Build.0 = nt|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.Debug.ActiveCfg = Debug|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.Debug.Build.0 = Debug|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.Embedded_Classic.ActiveCfg = Release|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.Embedded_Classic.Build.0 = Release|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{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_Release.ActiveCfg = Release|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.Embedded_Release.Build.0 = Release|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.Max.ActiveCfg = Release|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.Max.Build.0 = Release|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.Max nt.ActiveCfg = Max nt|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.Max nt.Build.0 = Max nt|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.nt.ActiveCfg = nt|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.nt.Build.0 = nt|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.pro.ActiveCfg = Release|Win32
|
||||
{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}.Release.ActiveCfg = Release|Win32
|
||||
{13D37150-54D0-46C5-9519-03923243C7C7}.Release.Build.0 = Release|Win32
|
||||
{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.classic.ActiveCfg = Release|Win32
|
||||
{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.classic.Build.0 = Release|Win32
|
||||
{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.classic nt.ActiveCfg = Release|Win32
|
||||
|
|
@ -365,10 +453,6 @@ Global
|
|||
{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.pro nt.Build.0 = Release|Win32
|
||||
{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.Release.ActiveCfg = Release|Win32
|
||||
{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.Release.Build.0 = Release|Win32
|
||||
{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.TLS.ActiveCfg = Release|Win32
|
||||
{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.TLS.Build.0 = Release|Win32
|
||||
{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.TLS_DEBUG.ActiveCfg = Release|Win32
|
||||
{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.TLS_DEBUG.Build.0 = Release|Win32
|
||||
{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.classic.ActiveCfg = classic|Win32
|
||||
{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.classic nt.ActiveCfg = classic|Win32
|
||||
{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.Debug.ActiveCfg = Debug|Win32
|
||||
|
|
@ -386,12 +470,8 @@ Global
|
|||
{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.pro.ActiveCfg = pro|Win32
|
||||
{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.pro nt.ActiveCfg = pro|Win32
|
||||
{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.Release.ActiveCfg = Release|Win32
|
||||
{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.TLS.ActiveCfg = classic|Win32
|
||||
{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.TLS.Build.0 = classic|Win32
|
||||
{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.TLS_DEBUG.ActiveCfg = classic|Win32
|
||||
{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.TLS_DEBUG.Build.0 = classic|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.classic.ActiveCfg = Debug|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.classic.Build.0 = Debug|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.classic.ActiveCfg = Release|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.classic.Build.0 = Release|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.classic nt.ActiveCfg = Release|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.classic nt.Build.0 = Release|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.Debug.ActiveCfg = Debug|Win32
|
||||
|
|
@ -412,10 +492,6 @@ Global
|
|||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.pro nt.Build.0 = Release|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.Release.ActiveCfg = Release|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.Release.Build.0 = Release|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.TLS.ActiveCfg = Debug|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.TLS.Build.0 = Debug|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.TLS_DEBUG.ActiveCfg = Debug|Win32
|
||||
{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.TLS_DEBUG.Build.0 = Debug|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.classic.ActiveCfg = classic|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.classic.Build.0 = classic|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.classic nt.ActiveCfg = Release|Win32
|
||||
|
|
@ -438,10 +514,32 @@ Global
|
|||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.pro nt.Build.0 = Release|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.Release.ActiveCfg = Release|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.Release.Build.0 = Release|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.TLS.ActiveCfg = Debug|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.TLS.Build.0 = Debug|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.TLS_DEBUG.ActiveCfg = Debug|Win32
|
||||
{B0EC3594-CD67-4364-826E-BA75EF2050F8}.TLS_DEBUG.Build.0 = Debug|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.classic.ActiveCfg = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.classic.Build.0 = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.classic nt.ActiveCfg = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.classic nt.Build.0 = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.Debug.ActiveCfg = Debug|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.Debug.Build.0 = Debug|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.Embedded_Classic.ActiveCfg = TLS|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.Embedded_Classic.Build.0 = TLS|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{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_Release.ActiveCfg = TLS|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.Embedded_Release.Build.0 = TLS|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.Max.ActiveCfg = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.Max.Build.0 = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.Max nt.ActiveCfg = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.Max nt.Build.0 = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.nt.ActiveCfg = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.nt.Build.0 = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.pro.ActiveCfg = Release|Win32
|
||||
{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}.Release.ActiveCfg = Release|Win32
|
||||
{262280A8-37D5-4037-BDFB-242468DFB3D2}.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
|
||||
|
|
@ -464,10 +562,6 @@ Global
|
|||
{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.pro nt.Build.0 = Release|Win32
|
||||
{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.Release.ActiveCfg = Release|Win32
|
||||
{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.Release.Build.0 = Release|Win32
|
||||
{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.TLS.ActiveCfg = Release|Win32
|
||||
{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.TLS.Build.0 = Release|Win32
|
||||
{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.TLS_DEBUG.ActiveCfg = Release|Win32
|
||||
{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.TLS_DEBUG.Build.0 = Release|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.classic.ActiveCfg = classic|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.classic.Build.0 = classic|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.classic nt.ActiveCfg = Release|Win32
|
||||
|
|
@ -490,10 +584,6 @@ Global
|
|||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.pro 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-0668C6168C0F}.TLS.ActiveCfg = Debug|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.TLS.Build.0 = Debug|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.TLS_DEBUG.ActiveCfg = Debug|Win32
|
||||
{87CD9881-D234-4306-BBC6-0668C6168C0F}.TLS_DEBUG.Build.0 = Debug|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
|
||||
|
|
@ -516,10 +606,32 @@ Global
|
|||
{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.pro nt.Build.0 = Release|Win32
|
||||
{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.Release.ActiveCfg = Release|Win32
|
||||
{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.Release.Build.0 = Release|Win32
|
||||
{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.TLS.ActiveCfg = Release|Win32
|
||||
{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.TLS.Build.0 = Release|Win32
|
||||
{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.TLS_DEBUG.ActiveCfg = Release|Win32
|
||||
{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.TLS_DEBUG.Build.0 = Release|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.classic.ActiveCfg = Release|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.classic.Build.0 = Release|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.classic nt.ActiveCfg = Release|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.classic nt.Build.0 = Release|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Debug.ActiveCfg = Debug|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Debug.Build.0 = Debug|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Embedded_Classic.ActiveCfg = TLS|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Embedded_Classic.Build.0 = TLS|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{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_Release.ActiveCfg = TLS|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Embedded_Release.Build.0 = TLS|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Max.ActiveCfg = Release|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Max.Build.0 = Release|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Max nt.ActiveCfg = Release|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Max nt.Build.0 = Release|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.nt.ActiveCfg = Release|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.nt.Build.0 = Release|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.pro.ActiveCfg = Release|Win32
|
||||
{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}.Release.ActiveCfg = Release|Win32
|
||||
{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Release.Build.0 = Release|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CC}.classic.ActiveCfg = classic|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CC}.classic.Build.0 = classic|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CC}.classic nt.ActiveCfg = Release|Win32
|
||||
|
|
@ -542,10 +654,6 @@ Global
|
|||
{EF833A1E-E358-4B6C-9C27-9489E85041CC}.pro 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-9489E85041CC}.TLS.ActiveCfg = classic|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CC}.TLS.Build.0 = classic|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CC}.TLS_DEBUG.ActiveCfg = classic|Win32
|
||||
{EF833A1E-E358-4B6C-9C27-9489E85041CC}.TLS_DEBUG.Build.0 = classic|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
|
||||
|
|
@ -568,10 +676,6 @@ Global
|
|||
{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.pro nt.Build.0 = Release|Win32
|
||||
{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.Release.ActiveCfg = Release|Win32
|
||||
{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.Release.Build.0 = Release|Win32
|
||||
{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.TLS.ActiveCfg = Debug|Win32
|
||||
{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.TLS.Build.0 = Debug|Win32
|
||||
{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.TLS_DEBUG.ActiveCfg = Debug|Win32
|
||||
{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.TLS_DEBUG.Build.0 = Debug|Win32
|
||||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.classic.ActiveCfg = classic|Win32
|
||||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.classic.Build.0 = classic|Win32
|
||||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.classic nt.ActiveCfg = Release|Win32
|
||||
|
|
@ -594,10 +698,6 @@ Global
|
|||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.pro nt.Build.0 = Release|Win32
|
||||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.Release.ActiveCfg = Release|Win32
|
||||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.Release.Build.0 = Release|Win32
|
||||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.TLS.ActiveCfg = Debug|Win32
|
||||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.TLS.Build.0 = Debug|Win32
|
||||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.TLS_DEBUG.ActiveCfg = Debug|Win32
|
||||
{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.TLS_DEBUG.Build.0 = Debug|Win32
|
||||
{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.classic.ActiveCfg = classic|Win32
|
||||
{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.classic.Build.0 = classic|Win32
|
||||
{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.classic nt.ActiveCfg = Release|Win32
|
||||
|
|
@ -620,10 +720,6 @@ Global
|
|||
{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.pro nt.Build.0 = Release|Win32
|
||||
{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.Release.ActiveCfg = Release|Win32
|
||||
{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.Release.Build.0 = Release|Win32
|
||||
{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.TLS.ActiveCfg = Release|Win32
|
||||
{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.TLS.Build.0 = Release|Win32
|
||||
{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.TLS_DEBUG.ActiveCfg = Release|Win32
|
||||
{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.TLS_DEBUG.Build.0 = Release|Win32
|
||||
{67154F28-D076-419E-B149-819EF548E670}.classic.ActiveCfg = classic|Win32
|
||||
{67154F28-D076-419E-B149-819EF548E670}.classic.Build.0 = classic|Win32
|
||||
{67154F28-D076-419E-B149-819EF548E670}.classic nt.ActiveCfg = Release|Win32
|
||||
|
|
@ -646,12 +742,8 @@ Global
|
|||
{67154F28-D076-419E-B149-819EF548E670}.pro nt.Build.0 = Release|Win32
|
||||
{67154F28-D076-419E-B149-819EF548E670}.Release.ActiveCfg = Release|Win32
|
||||
{67154F28-D076-419E-B149-819EF548E670}.Release.Build.0 = Release|Win32
|
||||
{67154F28-D076-419E-B149-819EF548E670}.TLS.ActiveCfg = Debug|Win32
|
||||
{67154F28-D076-419E-B149-819EF548E670}.TLS.Build.0 = Debug|Win32
|
||||
{67154F28-D076-419E-B149-819EF548E670}.TLS_DEBUG.ActiveCfg = Debug|Win32
|
||||
{67154F28-D076-419E-B149-819EF548E670}.TLS_DEBUG.Build.0 = Debug|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.classic.ActiveCfg = Debug|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.classic.Build.0 = Debug|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.classic.ActiveCfg = Release|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.classic.Build.0 = Release|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.classic nt.ActiveCfg = Release|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.classic nt.Build.0 = Release|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.Debug.ActiveCfg = Debug|Win32
|
||||
|
|
@ -672,10 +764,6 @@ Global
|
|||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.pro nt.Build.0 = Release|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.Release.ActiveCfg = Release|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.Release.Build.0 = Release|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.TLS.ActiveCfg = Debug|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.TLS.Build.0 = Debug|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.TLS_DEBUG.ActiveCfg = Debug|Win32
|
||||
{26383276-4843-494B-8BE0-8936ED3EBAAB}.TLS_DEBUG.Build.0 = Debug|Win32
|
||||
{62E85884-3ACF-4F4C-873B-60B878147890}.classic.ActiveCfg = classic|Win32
|
||||
{62E85884-3ACF-4F4C-873B-60B878147890}.classic.Build.0 = classic|Win32
|
||||
{62E85884-3ACF-4F4C-873B-60B878147890}.classic nt.ActiveCfg = classic nt|Win32
|
||||
|
|
@ -698,10 +786,6 @@ Global
|
|||
{62E85884-3ACF-4F4C-873B-60B878147890}.pro nt.Build.0 = pro nt|Win32
|
||||
{62E85884-3ACF-4F4C-873B-60B878147890}.Release.ActiveCfg = Release|Win32
|
||||
{62E85884-3ACF-4F4C-873B-60B878147890}.Release.Build.0 = Release|Win32
|
||||
{62E85884-3ACF-4F4C-873B-60B878147890}.TLS.ActiveCfg = Release|Win32
|
||||
{62E85884-3ACF-4F4C-873B-60B878147890}.TLS.Build.0 = Release|Win32
|
||||
{62E85884-3ACF-4F4C-873B-60B878147890}.TLS_DEBUG.ActiveCfg = Release|Win32
|
||||
{62E85884-3ACF-4F4C-873B-60B878147890}.TLS_DEBUG.Build.0 = Release|Win32
|
||||
{37D9BA79-302E-4582-A545-CB5FF7982EA3}.classic.ActiveCfg = classic|Win32
|
||||
{37D9BA79-302E-4582-A545-CB5FF7982EA3}.classic.Build.0 = classic|Win32
|
||||
{37D9BA79-302E-4582-A545-CB5FF7982EA3}.classic nt.ActiveCfg = classic|Win32
|
||||
|
|
@ -724,10 +808,6 @@ Global
|
|||
{37D9BA79-302E-4582-A545-CB5FF7982EA3}.pro nt.Build.0 = pro|Win32
|
||||
{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Release.ActiveCfg = Release|Win32
|
||||
{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Release.Build.0 = Release|Win32
|
||||
{37D9BA79-302E-4582-A545-CB5FF7982EA3}.TLS.ActiveCfg = Release|Win32
|
||||
{37D9BA79-302E-4582-A545-CB5FF7982EA3}.TLS.Build.0 = Release|Win32
|
||||
{37D9BA79-302E-4582-A545-CB5FF7982EA3}.TLS_DEBUG.ActiveCfg = Release|Win32
|
||||
{37D9BA79-302E-4582-A545-CB5FF7982EA3}.TLS_DEBUG.Build.0 = Release|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.classic.ActiveCfg = classic|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.classic.Build.0 = classic|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.classic nt.ActiveCfg = classic|Win32
|
||||
|
|
@ -750,10 +830,6 @@ Global
|
|||
{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.pro 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-B41F5631E92B}.TLS.ActiveCfg = classic|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.TLS.Build.0 = classic|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.TLS_DEBUG.ActiveCfg = classic|Win32
|
||||
{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.TLS_DEBUG.Build.0 = classic|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
|
||||
|
|
@ -776,10 +852,6 @@ Global
|
|||
{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.pro nt.Build.0 = Release|Win32
|
||||
{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.Release.ActiveCfg = Release|Win32
|
||||
{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.Release.Build.0 = Release|Win32
|
||||
{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.TLS.ActiveCfg = classic|Win32
|
||||
{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.TLS.Build.0 = classic|Win32
|
||||
{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.TLS_DEBUG.ActiveCfg = classic|Win32
|
||||
{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.TLS_DEBUG.Build.0 = classic|Win32
|
||||
{94B86159-C581-42CD-825D-C69CBC237E5C}.classic.ActiveCfg = Release|Win32
|
||||
{94B86159-C581-42CD-825D-C69CBC237E5C}.classic.Build.0 = Release|Win32
|
||||
{94B86159-C581-42CD-825D-C69CBC237E5C}.classic nt.ActiveCfg = Release|Win32
|
||||
|
|
@ -802,10 +874,6 @@ Global
|
|||
{94B86159-C581-42CD-825D-C69CBC237E5C}.pro nt.Build.0 = Release|Win32
|
||||
{94B86159-C581-42CD-825D-C69CBC237E5C}.Release.ActiveCfg = Release|Win32
|
||||
{94B86159-C581-42CD-825D-C69CBC237E5C}.Release.Build.0 = Release|Win32
|
||||
{94B86159-C581-42CD-825D-C69CBC237E5C}.TLS.ActiveCfg = Release|Win32
|
||||
{94B86159-C581-42CD-825D-C69CBC237E5C}.TLS.Build.0 = Release|Win32
|
||||
{94B86159-C581-42CD-825D-C69CBC237E5C}.TLS_DEBUG.ActiveCfg = Release|Win32
|
||||
{94B86159-C581-42CD-825D-C69CBC237E5C}.TLS_DEBUG.Build.0 = Release|Win32
|
||||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.classic.ActiveCfg = classic|Win32
|
||||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.classic.Build.0 = classic|Win32
|
||||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.classic nt.ActiveCfg = classic|Win32
|
||||
|
|
@ -828,10 +896,6 @@ Global
|
|||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.pro nt.Build.0 = Release|Win32
|
||||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.Release.ActiveCfg = Release|Win32
|
||||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.Release.Build.0 = Release|Win32
|
||||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.TLS.ActiveCfg = Debug|Win32
|
||||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.TLS.Build.0 = Debug|Win32
|
||||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.TLS_DEBUG.ActiveCfg = Debug|Win32
|
||||
{3737BFE2-EF25-464F-994D-BD28A9F84528}.TLS_DEBUG.Build.0 = Debug|Win32
|
||||
{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.classic.ActiveCfg = Release|Win32
|
||||
{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.classic.Build.0 = Release|Win32
|
||||
{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.classic nt.ActiveCfg = Release|Win32
|
||||
|
|
@ -858,10 +922,6 @@ Global
|
|||
{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.pro nt.Build.0 = Release|Win32
|
||||
{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.Release.ActiveCfg = Release|Win32
|
||||
{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.Release.Build.0 = Release|Win32
|
||||
{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.TLS.ActiveCfg = Release|Win32
|
||||
{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.TLS.Build.0 = Release|Win32
|
||||
{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.TLS_DEBUG.ActiveCfg = Release|Win32
|
||||
{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.TLS_DEBUG.Build.0 = Release|Win32
|
||||
{DB28DE80-837F-4497-9AA9-CC0A20584C98}.classic.ActiveCfg = Release|Win32
|
||||
{DB28DE80-837F-4497-9AA9-CC0A20584C98}.classic.Build.0 = Release|Win32
|
||||
{DB28DE80-837F-4497-9AA9-CC0A20584C98}.classic nt.ActiveCfg = Release|Win32
|
||||
|
|
@ -869,9 +929,13 @@ Global
|
|||
{DB28DE80-837F-4497-9AA9-CC0A20584C98}.Debug.ActiveCfg = Debug|Win32
|
||||
{DB28DE80-837F-4497-9AA9-CC0A20584C98}.Debug.Build.0 = Debug|Win32
|
||||
{DB28DE80-837F-4497-9AA9-CC0A20584C98}.Embedded_Classic.ActiveCfg = Release|Win32
|
||||
{DB28DE80-837F-4497-9AA9-CC0A20584C98}.Embedded_Classic.Build.0 = Release|Win32
|
||||
{DB28DE80-837F-4497-9AA9-CC0A20584C98}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{DB28DE80-837F-4497-9AA9-CC0A20584C98}.Embedded_Debug.Build.0 = Debug|Win32
|
||||
{DB28DE80-837F-4497-9AA9-CC0A20584C98}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
{DB28DE80-837F-4497-9AA9-CC0A20584C98}.Embedded_Pro.Build.0 = Release|Win32
|
||||
{DB28DE80-837F-4497-9AA9-CC0A20584C98}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{DB28DE80-837F-4497-9AA9-CC0A20584C98}.Embedded_Release.Build.0 = Release|Win32
|
||||
{DB28DE80-837F-4497-9AA9-CC0A20584C98}.Max.ActiveCfg = Release|Win32
|
||||
{DB28DE80-837F-4497-9AA9-CC0A20584C98}.Max.Build.0 = Release|Win32
|
||||
{DB28DE80-837F-4497-9AA9-CC0A20584C98}.Max nt.ActiveCfg = Release|Win32
|
||||
|
|
@ -884,10 +948,6 @@ Global
|
|||
{DB28DE80-837F-4497-9AA9-CC0A20584C98}.pro nt.Build.0 = Release|Win32
|
||||
{DB28DE80-837F-4497-9AA9-CC0A20584C98}.Release.ActiveCfg = Release|Win32
|
||||
{DB28DE80-837F-4497-9AA9-CC0A20584C98}.Release.Build.0 = Release|Win32
|
||||
{DB28DE80-837F-4497-9AA9-CC0A20584C98}.TLS.ActiveCfg = Release|Win32
|
||||
{DB28DE80-837F-4497-9AA9-CC0A20584C98}.TLS.Build.0 = Release|Win32
|
||||
{DB28DE80-837F-4497-9AA9-CC0A20584C98}.TLS_DEBUG.ActiveCfg = Release|Win32
|
||||
{DB28DE80-837F-4497-9AA9-CC0A20584C98}.TLS_DEBUG.Build.0 = Release|Win32
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.classic.ActiveCfg = TLS|Win32
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.classic.Build.0 = TLS|Win32
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.classic nt.ActiveCfg = Release|Win32
|
||||
|
|
@ -914,10 +974,6 @@ Global
|
|||
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro nt.Build.0 = Release|Win32
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Release.ActiveCfg = Release|Win32
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Release.Build.0 = Release|Win32
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.TLS.ActiveCfg = TLS|Win32
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.TLS.Build.0 = TLS|Win32
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.TLS_DEBUG.ActiveCfg = TLS_DEBUG|Win32
|
||||
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.TLS_DEBUG.Build.0 = TLS_DEBUG|Win32
|
||||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.classic.ActiveCfg = classic|Win32
|
||||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.classic.Build.0 = classic|Win32
|
||||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.classic nt.ActiveCfg = classic|Win32
|
||||
|
|
@ -940,10 +996,6 @@ Global
|
|||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.pro nt.Build.0 = Release|Win32
|
||||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.Release.ActiveCfg = Release|Win32
|
||||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.Release.Build.0 = Release|Win32
|
||||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.TLS.ActiveCfg = Debug|Win32
|
||||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.TLS.Build.0 = Debug|Win32
|
||||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.TLS_DEBUG.ActiveCfg = Debug|Win32
|
||||
{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.TLS_DEBUG.Build.0 = Debug|Win32
|
||||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.classic.ActiveCfg = Release|Win32
|
||||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.classic.Build.0 = Release|Win32
|
||||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.classic nt.ActiveCfg = Release|Win32
|
||||
|
|
@ -970,10 +1022,6 @@ Global
|
|||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.pro nt.Build.0 = Release|Win32
|
||||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.Release.ActiveCfg = Release|Win32
|
||||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.Release.Build.0 = Release|Win32
|
||||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.TLS.ActiveCfg = Release|Win32
|
||||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.TLS.Build.0 = Release|Win32
|
||||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.TLS_DEBUG.ActiveCfg = Release|Win32
|
||||
{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.TLS_DEBUG.Build.0 = Release|Win32
|
||||
{16699B52-ECC6-4A96-A99F-A043059BA2E7}.classic.ActiveCfg = classic|Win32
|
||||
{16699B52-ECC6-4A96-A99F-A043059BA2E7}.classic.Build.0 = classic|Win32
|
||||
{16699B52-ECC6-4A96-A99F-A043059BA2E7}.classic nt.ActiveCfg = classic|Win32
|
||||
|
|
@ -996,18 +1044,14 @@ Global
|
|||
{16699B52-ECC6-4A96-A99F-A043059BA2E7}.pro nt.Build.0 = Release|Win32
|
||||
{16699B52-ECC6-4A96-A99F-A043059BA2E7}.Release.ActiveCfg = Release|Win32
|
||||
{16699B52-ECC6-4A96-A99F-A043059BA2E7}.Release.Build.0 = Release|Win32
|
||||
{16699B52-ECC6-4A96-A99F-A043059BA2E7}.TLS.ActiveCfg = classic|Win32
|
||||
{16699B52-ECC6-4A96-A99F-A043059BA2E7}.TLS.Build.0 = classic|Win32
|
||||
{16699B52-ECC6-4A96-A99F-A043059BA2E7}.TLS_DEBUG.ActiveCfg = classic|Win32
|
||||
{16699B52-ECC6-4A96-A99F-A043059BA2E7}.TLS_DEBUG.Build.0 = classic|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.classic.ActiveCfg = Debug|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.classic.Build.0 = Debug|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.classic.ActiveCfg = Release|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.classic.Build.0 = Release|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.classic nt.ActiveCfg = Release|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.classic nt.Build.0 = Release|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.Debug.ActiveCfg = Debug|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.Debug.Build.0 = Debug|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.Embedded_Classic.ActiveCfg = Debug|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.Embedded_Classic.Build.0 = Debug|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.Embedded_Classic.ActiveCfg = Release|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.Embedded_Classic.Build.0 = Release|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.Embedded_Debug.Build.0 = Debug|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.Embedded_Pro.ActiveCfg = Release|Win32
|
||||
|
|
@ -1026,12 +1070,8 @@ Global
|
|||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.pro nt.Build.0 = Release|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.Release.ActiveCfg = Release|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.Release.Build.0 = Release|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.TLS.ActiveCfg = Debug|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.TLS.Build.0 = Debug|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.TLS_DEBUG.ActiveCfg = Debug|Win32
|
||||
{EEC1300B-85A5-497C-B3E1-F708021DF859}.TLS_DEBUG.Build.0 = Debug|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.classic.ActiveCfg = Debug|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.classic.Build.0 = Debug|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}.Debug.ActiveCfg = Debug|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.Debug.Build.0 = Debug|Win32
|
||||
|
|
@ -1046,12 +1086,7 @@ Global
|
|||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.pro nt.ActiveCfg = Debug|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.Release.ActiveCfg = Release|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.Release.Build.0 = Release|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.TLS.ActiveCfg = Debug|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.TLS.Build.0 = Debug|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.TLS_DEBUG.ActiveCfg = Debug|Win32
|
||||
{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.TLS_DEBUG.Build.0 = Debug|Win32
|
||||
{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.classic.ActiveCfg = Release|Win32
|
||||
{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.classic.Build.0 = Release|Win32
|
||||
{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.classic nt.ActiveCfg = Release|Win32
|
||||
{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.Debug.ActiveCfg = Release|Win32
|
||||
{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.Embedded_Classic.ActiveCfg = Release|Win32
|
||||
|
|
@ -1060,16 +1095,10 @@ Global
|
|||
{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}.Max nt.Build.0 = 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}.Release.ActiveCfg = Release|Win32
|
||||
{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.Release.Build.0 = Release|Win32
|
||||
{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.TLS.ActiveCfg = Release|Win32
|
||||
{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.TLS.Build.0 = Release|Win32
|
||||
{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.TLS_DEBUG.ActiveCfg = Release|Win32
|
||||
{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.TLS_DEBUG.Build.0 = Release|Win32
|
||||
{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.classic.ActiveCfg = Release|Win32
|
||||
{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.classic.Build.0 = Release|Win32
|
||||
{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.classic nt.ActiveCfg = Release|Win32
|
||||
|
|
@ -1092,20 +1121,20 @@ Global
|
|||
{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.pro nt.Build.0 = Release|Win32
|
||||
{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.Release.ActiveCfg = Release|Win32
|
||||
{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.Release.Build.0 = Release|Win32
|
||||
{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.TLS.ActiveCfg = Release|Win32
|
||||
{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.TLS.Build.0 = Release|Win32
|
||||
{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.TLS_DEBUG.ActiveCfg = Release|Win32
|
||||
{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.TLS_DEBUG.Build.0 = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.classic.ActiveCfg = Debug|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.classic.Build.0 = Debug|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.classic.ActiveCfg = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.classic.Build.0 = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.classic nt.ActiveCfg = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.classic nt.Build.0 = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.Debug.ActiveCfg = Debug|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.Debug.Build.0 = Debug|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.Embedded_Classic.ActiveCfg = Debug|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.Embedded_Classic.ActiveCfg = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.Embedded_Classic.Build.0 = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.Embedded_Pro.ActiveCfg = Debug|Win32
|
||||
{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_Release.ActiveCfg = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.Embedded_Release.Build.0 = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.Max.ActiveCfg = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.Max.Build.0 = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.Max nt.ActiveCfg = Release|Win32
|
||||
|
|
@ -1118,10 +1147,6 @@ Global
|
|||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.pro nt.Build.0 = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.Release.ActiveCfg = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.Release.Build.0 = Release|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.TLS.ActiveCfg = Debug|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.TLS.Build.0 = Debug|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.TLS_DEBUG.ActiveCfg = Debug|Win32
|
||||
{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.TLS_DEBUG.Build.0 = Debug|Win32
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.classic.ActiveCfg = Release|Win32
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.classic.Build.0 = Release|Win32
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.classic nt.ActiveCfg = Release|Win32
|
||||
|
|
@ -1131,6 +1156,7 @@ Global
|
|||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.Embedded_Classic.ActiveCfg = Release|Win32
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.Embedded_Classic.Build.0 = Release|Win32
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{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_Release.ActiveCfg = Release|Win32
|
||||
|
|
@ -1147,10 +1173,6 @@ Global
|
|||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.pro nt.Build.0 = Release|Win32
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.Release.ActiveCfg = Release|Win32
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.Release.Build.0 = Release|Win32
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.TLS.ActiveCfg = Release|Win32
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.TLS.Build.0 = Release|Win32
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.TLS_DEBUG.ActiveCfg = Release|Win32
|
||||
{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.TLS_DEBUG.Build.0 = Release|Win32
|
||||
{8961F149-C68A-4154-A499-A2AB39E607E8}.classic.ActiveCfg = classic|Win32
|
||||
{8961F149-C68A-4154-A499-A2AB39E607E8}.classic.Build.0 = classic|Win32
|
||||
{8961F149-C68A-4154-A499-A2AB39E607E8}.classic nt.ActiveCfg = classic|Win32
|
||||
|
|
@ -1173,12 +1195,8 @@ Global
|
|||
{8961F149-C68A-4154-A499-A2AB39E607E8}.pro nt.Build.0 = Release|Win32
|
||||
{8961F149-C68A-4154-A499-A2AB39E607E8}.Release.ActiveCfg = Release|Win32
|
||||
{8961F149-C68A-4154-A499-A2AB39E607E8}.Release.Build.0 = Release|Win32
|
||||
{8961F149-C68A-4154-A499-A2AB39E607E8}.TLS.ActiveCfg = Debug|Win32
|
||||
{8961F149-C68A-4154-A499-A2AB39E607E8}.TLS.Build.0 = Debug|Win32
|
||||
{8961F149-C68A-4154-A499-A2AB39E607E8}.TLS_DEBUG.ActiveCfg = Debug|Win32
|
||||
{8961F149-C68A-4154-A499-A2AB39E607E8}.TLS_DEBUG.Build.0 = Debug|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.classic.ActiveCfg = Debug|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.classic.Build.0 = Debug|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.classic.ActiveCfg = Release|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.classic.Build.0 = Release|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.classic nt.ActiveCfg = Release|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.classic nt.Build.0 = Release|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.Debug.ActiveCfg = Debug|Win32
|
||||
|
|
@ -1190,7 +1208,6 @@ Global
|
|||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.Max.ActiveCfg = Release|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.Max.Build.0 = Release|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.Max nt.ActiveCfg = Release|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.Max nt.Build.0 = Release|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.nt.ActiveCfg = Release|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.nt.Build.0 = Release|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.pro.ActiveCfg = Release|Win32
|
||||
|
|
@ -1199,10 +1216,6 @@ Global
|
|||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.pro nt.Build.0 = Release|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.Release.ActiveCfg = Release|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.Release.Build.0 = Release|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.TLS.ActiveCfg = Debug|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.TLS.Build.0 = Debug|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.TLS_DEBUG.ActiveCfg = Debug|Win32
|
||||
{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.TLS_DEBUG.Build.0 = Debug|Win32
|
||||
{6189F838-21C6-42A1-B2D0-9146316573F7}.classic.ActiveCfg = Release|Win32
|
||||
{6189F838-21C6-42A1-B2D0-9146316573F7}.classic.Build.0 = Release|Win32
|
||||
{6189F838-21C6-42A1-B2D0-9146316573F7}.classic nt.ActiveCfg = Release|Win32
|
||||
|
|
@ -1251,160 +1264,6 @@ Global
|
|||
{6D524B3E-210A-4FCD-8D41-FEC0D21E83AC}.pro nt.Build.0 = Release|Win32
|
||||
{6D524B3E-210A-4FCD-8D41-FEC0D21E83AC}.Release.ActiveCfg = Release|Win32
|
||||
{6D524B3E-210A-4FCD-8D41-FEC0D21E83AC}.Release.Build.0 = Release|Win32
|
||||
{6189F838-21C6-42A1-B2D0-9146316573F7}.TLS.ActiveCfg = Release|Win32
|
||||
{6189F838-21C6-42A1-B2D0-9146316573F7}.TLS.Build.0 = Release|Win32
|
||||
{6189F838-21C6-42A1-B2D0-9146316573F7}.TLS_DEBUG.ActiveCfg = Release|Win32
|
||||
{6189F838-21C6-42A1-B2D0-9146316573F7}.TLS_DEBUG.Build.0 = Release|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.classic.ActiveCfg = Debug|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.classic.Build.0 = Debug|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.classic nt.ActiveCfg = Debug|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.classic nt.Build.0 = Debug|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.Debug.ActiveCfg = Debug|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.Debug.Build.0 = Debug|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.Embedded_Classic.ActiveCfg = Debug|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.Embedded_Classic.Build.0 = Debug|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.Embedded_Debug.Build.0 = Debug|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.Embedded_Pro.ActiveCfg = Debug|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.Embedded_Pro.Build.0 = Debug|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.Embedded_Release.ActiveCfg = Debug|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.Embedded_Release.Build.0 = Debug|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.Max.ActiveCfg = Max|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.Max.Build.0 = Max|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.Max nt.ActiveCfg = Max|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.Max nt.Build.0 = Max|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.nt.ActiveCfg = Debug|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.nt.Build.0 = Debug|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.pro.ActiveCfg = Debug|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.pro.Build.0 = Debug|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.pro nt.ActiveCfg = Debug|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.pro nt.Build.0 = Debug|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.Release.ActiveCfg = Debug|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.Release.Build.0 = Debug|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.TLS.ActiveCfg = Debug|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.TLS.Build.0 = Debug|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.TLS_DEBUG.ActiveCfg = Debug|Win32
|
||||
{FB168572-FFF4-4503-9331-4E958459DC9D}.TLS_DEBUG.Build.0 = Debug|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.classic.ActiveCfg = Debug|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.classic.Build.0 = Debug|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.classic nt.ActiveCfg = Debug|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.classic nt.Build.0 = Debug|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Debug.ActiveCfg = Debug|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Debug.Build.0 = Debug|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Embedded_Classic.ActiveCfg = Debug|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Embedded_Classic.Build.0 = Debug|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Embedded_Debug.Build.0 = Debug|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Embedded_Pro.ActiveCfg = Debug|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Embedded_Pro.Build.0 = Debug|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Embedded_Release.Build.0 = Release|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Max.ActiveCfg = Debug|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Max.Build.0 = Debug|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Max nt.ActiveCfg = Debug|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Max nt.Build.0 = Debug|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.nt.ActiveCfg = Debug|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.nt.Build.0 = Debug|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.pro.ActiveCfg = Debug|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.pro.Build.0 = Debug|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.pro nt.ActiveCfg = Debug|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.pro nt.Build.0 = Debug|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Release.ActiveCfg = Release|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Release.Build.0 = Release|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.TLS.ActiveCfg = TLS|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.TLS.Build.0 = TLS|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.TLS_DEBUG.ActiveCfg = TLS_DEBUG|Win32
|
||||
{603E5567-F3CD-4547-9F2B-E0082B702B0D}.TLS_DEBUG.Build.0 = TLS_DEBUG|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.classic.ActiveCfg = nt|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.classic.Build.0 = nt|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.classic nt.ActiveCfg = nt|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.classic nt.Build.0 = nt|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Debug.ActiveCfg = Debug|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Debug.Build.0 = Debug|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Embedded_Classic.ActiveCfg = nt|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Embedded_Classic.Build.0 = nt|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Embedded_Debug.Build.0 = Debug|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Embedded_Pro.ActiveCfg = nt|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Embedded_Pro.Build.0 = nt|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Embedded_Release.Build.0 = Release|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Max.ActiveCfg = Max nt|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Max.Build.0 = Max nt|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Max nt.ActiveCfg = Max nt|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Max nt.Build.0 = Max nt|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.nt.ActiveCfg = nt|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.nt.Build.0 = nt|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.pro.ActiveCfg = nt|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.pro.Build.0 = nt|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.pro nt.ActiveCfg = nt|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.pro nt.Build.0 = nt|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Release.ActiveCfg = Release|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Release.Build.0 = Release|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.TLS.ActiveCfg = nt|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.TLS.Build.0 = nt|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.TLS_DEBUG.ActiveCfg = nt|Win32
|
||||
{AEFFF9CA-3387-4027-B569-33D5D26887D1}.TLS_DEBUG.Build.0 = nt|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.classic.ActiveCfg = TLS_DEBUG|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.classic.Build.0 = TLS_DEBUG|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.classic nt.ActiveCfg = TLS_DEBUG|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.classic nt.Build.0 = TLS_DEBUG|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.Debug.ActiveCfg = Debug|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.Debug.Build.0 = Debug|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.Embedded_Classic.ActiveCfg = TLS_DEBUG|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.Embedded_Classic.Build.0 = TLS_DEBUG|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.Embedded_Debug.Build.0 = Debug|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.Embedded_Pro.ActiveCfg = TLS_DEBUG|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.Embedded_Pro.Build.0 = TLS_DEBUG|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.Embedded_Release.Build.0 = Release|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.Max.ActiveCfg = TLS_DEBUG|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.Max.Build.0 = TLS_DEBUG|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.Max nt.ActiveCfg = TLS_DEBUG|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.Max nt.Build.0 = TLS_DEBUG|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.nt.ActiveCfg = TLS_DEBUG|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.nt.Build.0 = TLS_DEBUG|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.pro.ActiveCfg = TLS_DEBUG|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.pro.Build.0 = TLS_DEBUG|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.pro nt.ActiveCfg = TLS_DEBUG|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.pro nt.Build.0 = TLS_DEBUG|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.Release.ActiveCfg = Release|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.Release.Build.0 = Release|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.TLS.ActiveCfg = TLS|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.TLS.Build.0 = TLS|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.TLS_DEBUG.ActiveCfg = TLS_DEBUG|Win32
|
||||
{E85E5D80-641E-44C7-B909-3805A8D3167B}.TLS_DEBUG.Build.0 = TLS_DEBUG|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.classic.ActiveCfg = Debug|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.classic.Build.0 = Debug|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.classic nt.ActiveCfg = Debug|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.classic nt.Build.0 = Debug|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.Debug.ActiveCfg = Debug|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.Debug.Build.0 = Debug|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.Embedded_Classic.ActiveCfg = Debug|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.Embedded_Classic.Build.0 = Debug|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.Embedded_Debug.ActiveCfg = Debug|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.Embedded_Debug.Build.0 = Debug|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.Embedded_Pro.ActiveCfg = Debug|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.Embedded_Pro.Build.0 = Debug|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.Embedded_Release.ActiveCfg = Release|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.Embedded_Release.Build.0 = Release|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.Max.ActiveCfg = Debug|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.Max.Build.0 = Debug|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.Max nt.ActiveCfg = Debug|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.Max nt.Build.0 = Debug|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.nt.ActiveCfg = Debug|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.nt.Build.0 = Debug|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.pro.ActiveCfg = Debug|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.pro.Build.0 = Debug|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.pro nt.ActiveCfg = Debug|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.pro nt.Build.0 = Debug|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.Release.ActiveCfg = Release|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.Release.Build.0 = Release|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.TLS.ActiveCfg = TLS|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.TLS.Build.0 = TLS|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.TLS_DEBUG.ActiveCfg = TLS_DEBUG|Win32
|
||||
{91B7E9AD-5F85-4236-9A28-B032543B123E}.TLS_DEBUG.Build.0 = TLS_DEBUG|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
EndGlobalSection
|
||||
|
|
|
|||
0
VC++Files/mysqlbinlog/mysqlbinlog.vcproj
Executable file → Normal file
0
VC++Files/mysqlbinlog/mysqlbinlog.vcproj
Executable file → Normal file
0
VC++Files/mysqlcheck/mysqlcheck.vcproj
Executable file → Normal file
0
VC++Files/mysqlcheck/mysqlcheck.vcproj
Executable file → Normal file
0
VC++Files/mysqldemb/mysqldemb.vcproj
Executable file → Normal file
0
VC++Files/mysqldemb/mysqldemb.vcproj
Executable file → Normal file
0
VC++Files/mysqlserver/dummy.cpp
Normal file
0
VC++Files/mysqlserver/dummy.cpp
Normal file
11
VC++Files/mysqlserver/mysqlserver.vcproj
Executable file → Normal file
11
VC++Files/mysqlserver/mysqlserver.vcproj
Executable file → Normal file
|
|
@ -12,7 +12,7 @@
|
|||
<Configurations>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
OutputDirectory=".\Debug"
|
||||
OutputDirectory="..\lib_debug"
|
||||
IntermediateDirectory=".\Debug"
|
||||
ConfigurationType="4"
|
||||
UseOfMFC="0"
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile=".\Debug\mysqlserver.lib"
|
||||
OutputFile="$(OutDir)\mysqlserver.lib"
|
||||
SuppressStartupBanner="TRUE"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"/>
|
||||
|
|
@ -63,7 +63,7 @@
|
|||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory=".\release"
|
||||
OutputDirectory="..\lib_release"
|
||||
IntermediateDirectory=".\release"
|
||||
ConfigurationType="4"
|
||||
UseOfMFC="0"
|
||||
|
|
@ -90,7 +90,7 @@
|
|||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile=".\release\mysqlserver.lib"
|
||||
OutputFile="$(OutDir)\mysqlserver.lib"
|
||||
SuppressStartupBanner="TRUE"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"/>
|
||||
|
|
@ -117,6 +117,9 @@
|
|||
<References>
|
||||
</References>
|
||||
<Files>
|
||||
<File
|
||||
RelativePath=".\dummy.cpp">
|
||||
</File>
|
||||
</Files>
|
||||
<Globals>
|
||||
</Globals>
|
||||
|
|
|
|||
|
|
@ -369,6 +369,10 @@ SOURCE=.\my_compress.c
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\my_conio.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\my_copy.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
|
|
|||
43
VC++Files/mysys/mysys.vcproj
Executable file → Normal file
43
VC++Files/mysys/mysys.vcproj
Executable file → Normal file
|
|
@ -2200,6 +2200,49 @@
|
|||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="my_conio.c">
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Max|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="TLS_DEBUG|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="TLS|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="my_copy.c">
|
||||
<FileConfiguration
|
||||
|
|
|
|||
|
|
@ -362,6 +362,10 @@ SOURCE=.\my_compress.c
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\my_conio.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\my_copy.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
|
|
|||
0
VC++Files/perror/perror.vcproj
Executable file → Normal file
0
VC++Files/perror/perror.vcproj
Executable file → Normal file
0
VC++Files/regex/regex.vcproj
Executable file → Normal file
0
VC++Files/regex/regex.vcproj
Executable file → Normal file
0
VC++Files/replace/replace.vcproj
Executable file → Normal file
0
VC++Files/replace/replace.vcproj
Executable file → Normal file
86
VC++Files/sql/mysqld.vcproj
Executable file → Normal file
86
VC++Files/sql/mysqld.vcproj
Executable file → Normal file
|
|
@ -335,7 +335,7 @@
|
|||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
OptimizeForProcessor="2"
|
||||
AdditionalIncludeDirectories="../storage/bdb/build_win32,../include,../regex,../extra/yassl/include,../zlib"
|
||||
AdditionalIncludeDirectories="../bdb/build_win32,../include,../regex,../extra/yassl/include,../zlib"
|
||||
PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"
|
||||
RuntimeLibrary="1"
|
||||
PrecompiledHeaderFile=".\debug/mysqld.pch"
|
||||
|
|
@ -1252,7 +1252,7 @@
|
|||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="examples\ha_archive.cpp">
|
||||
RelativePath="ha_archive.cpp">
|
||||
<FileConfiguration
|
||||
Name="classic nt|Win32">
|
||||
<Tool
|
||||
|
|
@ -3745,7 +3745,79 @@
|
|||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\storage\myisammrg\myrg_rnext_same.c">
|
||||
RelativePath="..\myisammrg\myrg_rnext_same.c">
|
||||
<FileConfiguration
|
||||
Name="classic nt|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Max|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Max nt|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="nt|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="pro nt|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="pro|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="classic|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="mysqld.cpp">
|
||||
|
|
@ -4506,7 +4578,7 @@
|
|||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="protocol_cursor.cpp">
|
||||
RelativePath="sql_cursor.cpp">
|
||||
<FileConfiguration
|
||||
Name="classic nt|Win32">
|
||||
<Tool
|
||||
|
|
@ -4731,9 +4803,6 @@
|
|||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\rpl_filter.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="set_var.cpp">
|
||||
<FileConfiguration
|
||||
|
|
@ -6923,9 +6992,6 @@
|
|||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\sql_partition.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="sql_prepare.cpp">
|
||||
<FileConfiguration
|
||||
|
|
|
|||
0
VC++Files/strings/strings.vcproj
Executable file → Normal file
0
VC++Files/strings/strings.vcproj
Executable file → Normal file
0
VC++Files/test1/test1.vcproj
Executable file → Normal file
0
VC++Files/test1/test1.vcproj
Executable file → Normal file
6
VC++Files/tests/mysql_client_test.vcproj
Executable file → Normal file
6
VC++Files/tests/mysql_client_test.vcproj
Executable file → Normal file
|
|
@ -25,7 +25,7 @@
|
|||
AdditionalIncludeDirectories="../include,../"
|
||||
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT;__WIN__;_WIN32"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="1"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="TRUE"
|
||||
PrecompiledHeaderFile=".\Release/mysql_client_test.pch"
|
||||
AssemblerListingLocation=".\Release/"
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib mysqlclient.lib mysys.lib regex.lib ..\extra\yassl\Release\yassl.lib"
|
||||
AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib"
|
||||
OutputFile="..\client_release\mysql_client_test.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
|
|
@ -98,7 +98,7 @@
|
|||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib ..\extra\yassl\Debug\yassl.lib"
|
||||
AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib"
|
||||
OutputFile="..\client_debug\mysql_client_test.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
|
|
|
|||
0
VC++Files/thr_test/thr_test.vcproj
Executable file → Normal file
0
VC++Files/thr_test/thr_test.vcproj
Executable file → Normal file
0
VC++Files/vio/vio.vcproj
Executable file → Normal file
0
VC++Files/vio/vio.vcproj
Executable file → Normal file
0
VC++Files/zlib/zlib.vcproj
Executable file → Normal file
0
VC++Files/zlib/zlib.vcproj
Executable file → Normal file
|
|
@ -959,10 +959,15 @@ static int get_options(int argc, char **argv)
|
|||
|
||||
static int read_and_execute(bool interactive)
|
||||
{
|
||||
#if defined( __WIN__) || defined(OS2) || defined(__NETWARE__)
|
||||
#if defined(OS2) || defined(__NETWARE__)
|
||||
char linebuffer[254];
|
||||
String buffer;
|
||||
#endif
|
||||
#if defined(__WIN__)
|
||||
String tmpbuf;
|
||||
String buffer;
|
||||
#endif
|
||||
|
||||
char *line;
|
||||
char in_string=0;
|
||||
ulong line_number=0;
|
||||
|
|
@ -993,7 +998,7 @@ static int read_and_execute(bool interactive)
|
|||
|
||||
#if defined( __WIN__) || defined(OS2) || defined(__NETWARE__)
|
||||
tee_fputs(prompt, stdout);
|
||||
#ifdef __NETWARE__
|
||||
#if defined(__NETWARE__)
|
||||
line=fgets(linebuffer, sizeof(linebuffer)-1, stdin);
|
||||
/* Remove the '\n' */
|
||||
if (line)
|
||||
|
|
@ -1002,7 +1007,22 @@ static int read_and_execute(bool interactive)
|
|||
if (p != NULL)
|
||||
*p = '\0';
|
||||
}
|
||||
#else
|
||||
#elif defined(__WIN__)
|
||||
if (!tmpbuf.is_alloced())
|
||||
tmpbuf.alloc(65535);
|
||||
buffer.length(0);
|
||||
unsigned long clen;
|
||||
do
|
||||
{
|
||||
line= my_cgets((char*)tmpbuf.ptr(), tmpbuf.alloced_length()-1, &clen);
|
||||
buffer.append(line, clen);
|
||||
/*
|
||||
if we got buffer fully filled than there is a chance that
|
||||
something else is still in console input buffer
|
||||
*/
|
||||
} while (tmpbuf.alloced_length() <= clen);
|
||||
line= buffer.c_ptr();
|
||||
#else /* OS2 */
|
||||
buffer.length(0);
|
||||
/* _cgets() expects the buffer size - 3 as the first byte */
|
||||
linebuffer[0]= (char) sizeof(linebuffer) - 3;
|
||||
|
|
@ -1078,9 +1098,14 @@ static int read_and_execute(bool interactive)
|
|||
status.exit_status=0;
|
||||
}
|
||||
}
|
||||
|
||||
#if defined( __WIN__) || defined(OS2) || defined(__NETWARE__)
|
||||
buffer.free();
|
||||
#endif
|
||||
#if defined( __WIN__)
|
||||
tmpbuf.free();
|
||||
#endif
|
||||
|
||||
return status.exit_status;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1434,7 +1434,7 @@ int main(int argc, char** argv)
|
|||
of transaction.
|
||||
*/
|
||||
fprintf(result_file,
|
||||
"ROLLBACK;\n"
|
||||
"# End of log file\nROLLBACK /* added by mysqlbinlog */;\n"
|
||||
"/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;\n");
|
||||
if (disable_log_bin)
|
||||
fprintf(result_file, "/*!32316 SET SQL_LOG_BIN=@OLD_SQL_LOG_BIN*/;\n");
|
||||
|
|
|
|||
|
|
@ -70,6 +70,11 @@
|
|||
/* Size of buffer for dump's select query */
|
||||
#define QUERY_LENGTH 1536
|
||||
|
||||
/* ignore table flags */
|
||||
#define IGNORE_NONE 0x00 /* no ignore */
|
||||
#define IGNORE_DATA 0x01 /* don't dump data for this table */
|
||||
#define IGNORE_INSERT_DELAYED 0x02 /* table doesn't support INSERT DELAYED */
|
||||
|
||||
static char *add_load_option(char *ptr, const char *object,
|
||||
const char *statement);
|
||||
static ulong find_set(TYPELIB *lib, const char *x, uint length,
|
||||
|
|
@ -209,9 +214,7 @@ static struct my_option my_long_options[] =
|
|||
{"default-character-set", OPT_DEFAULT_CHARSET,
|
||||
"Set the default character set.", (gptr*) &default_charset,
|
||||
(gptr*) &default_charset, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
|
||||
{"delayed-insert", OPT_DELAYED, "Insert rows with INSERT DELAYED; "
|
||||
"currently ignored because of http://bugs.mysql.com/bug.php?id=7815 "
|
||||
"but will be re-enabled later",
|
||||
{"delayed-insert", OPT_DELAYED, "Insert rows with INSERT DELAYED; ",
|
||||
(gptr*) &opt_delayed, (gptr*) &opt_delayed, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,
|
||||
0, 0},
|
||||
{"delete-master-logs", OPT_DELETE_MASTER_LOGS,
|
||||
|
|
@ -411,7 +414,7 @@ static int init_dumping(char *);
|
|||
static int dump_databases(char **);
|
||||
static int dump_all_databases();
|
||||
static char *quote_name(const char *name, char *buff, my_bool force);
|
||||
static const char *check_if_ignore_table(const char *table_name);
|
||||
char check_if_ignore_table(const char *table_name, char *table_type);
|
||||
static char *primary_key_fields(const char *table_name);
|
||||
static my_bool get_view_structure(char *table, char* db);
|
||||
static my_bool dump_all_views_in_db(char *database);
|
||||
|
|
@ -720,25 +723,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
|
|||
}
|
||||
break;
|
||||
}
|
||||
#ifndef REMOVE_THIS_CODE_WHEN_FIX_BUG_7815
|
||||
case (int) OPT_DELAYED:
|
||||
/*
|
||||
Because of http://bugs.mysql.com/bug.php?id=7815, we disable
|
||||
--delayed-insert; when the bug gets fixed by checking the storage engine
|
||||
(using the table definition cache) before printing INSERT DELAYED, we
|
||||
can correct the option's description and re-enable it again (scheduled
|
||||
for later 5.0 or 5.1 versions).
|
||||
It's ok to do the if() below as get_one_option is called after
|
||||
opt_delayed is set.
|
||||
*/
|
||||
if (opt_delayed)
|
||||
{
|
||||
fprintf(stderr, "Warning: ignoring --delayed-insert (as explained "
|
||||
"in the output of 'mysqldump --help').\n");
|
||||
opt_delayed= 0;
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1280,19 +1264,27 @@ static uint dump_routines_for_db (char *db)
|
|||
}
|
||||
|
||||
/*
|
||||
getTableStructure -- retrievs database structure, prints out corresponding
|
||||
CREATE statement and fills out insert_pat.
|
||||
get_table_structure -- retrievs database structure, prints out corresponding
|
||||
CREATE statement and fills out insert_pat if the table is the type we will
|
||||
be dumping.
|
||||
|
||||
ARGS
|
||||
table - table name
|
||||
db - db name
|
||||
table_type - table type ie "InnoDB"
|
||||
ignore_flag - what we must particularly ignore - see IGNORE_ defines above
|
||||
|
||||
RETURN
|
||||
number of fields in table, 0 if error
|
||||
*/
|
||||
|
||||
static uint get_table_structure(char *table, char *db)
|
||||
static uint get_table_structure(char *table, char *db, char *table_type,
|
||||
char *ignore_flag)
|
||||
{
|
||||
MYSQL_RES *tableRes;
|
||||
MYSQL_ROW row;
|
||||
my_bool init=0;
|
||||
uint numFields;
|
||||
uint num_fields;
|
||||
char *result_table, *opt_quoted_table;
|
||||
const char *insert_option;
|
||||
char name_buff[NAME_LEN+3],table_buff[NAME_LEN*2+3];
|
||||
|
|
@ -1300,18 +1292,30 @@ static uint get_table_structure(char *table, char *db)
|
|||
char query_buff[512];
|
||||
FILE *sql_file = md_result_file;
|
||||
int len;
|
||||
|
||||
DBUG_ENTER("get_table_structure");
|
||||
DBUG_PRINT("enter", ("db: %s, table: %s", db, table));
|
||||
|
||||
if (!insert_pat_inited)
|
||||
{
|
||||
insert_pat_inited= init_dynamic_string(&insert_pat, "", 1024, 1024);
|
||||
}
|
||||
else
|
||||
dynstr_set(&insert_pat, "");
|
||||
*ignore_flag= check_if_ignore_table(table, table_type);
|
||||
|
||||
insert_option= ((opt_delayed && opt_ignore) ? " DELAYED IGNORE " :
|
||||
opt_delayed ? " DELAYED " :
|
||||
if (opt_delayed && (*ignore_flag & IGNORE_INSERT_DELAYED))
|
||||
if (verbose)
|
||||
fprintf(stderr,
|
||||
"-- Unable to use delayed inserts for table '%s' because it's of\
|
||||
type %s\n", table, table_type);
|
||||
|
||||
if (!(*ignore_flag & IGNORE_DATA))
|
||||
{
|
||||
if (!insert_pat_inited)
|
||||
insert_pat_inited= init_dynamic_string(&insert_pat, "", 1024, 1024);
|
||||
else
|
||||
dynstr_set(&insert_pat, "");
|
||||
}
|
||||
|
||||
insert_option= ((opt_delayed && opt_ignore &&
|
||||
!(*ignore_flag & IGNORE_INSERT_DELAYED)) ?
|
||||
" DELAYED IGNORE " :
|
||||
opt_delayed && !(*ignore_flag & IGNORE_INSERT_DELAYED) ? " DELAYED " :
|
||||
opt_ignore ? " IGNORE " : "");
|
||||
|
||||
if (verbose)
|
||||
|
|
@ -1321,7 +1325,8 @@ static uint get_table_structure(char *table, char *db)
|
|||
"SET OPTION SQL_QUOTE_SHOW_CREATE=%d",
|
||||
(opt_quoted || opt_keywords));
|
||||
if (!create_options)
|
||||
strmov(query_buff+len, "/*!40102 ,SQL_MODE=concat(@@sql_mode, _utf8 ',NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS') */");
|
||||
strmov(query_buff+len,
|
||||
"/*!40102 ,SQL_MODE=concat(@@sql_mode, _utf8 ',NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS') */");
|
||||
|
||||
result_table= quote_name(table, table_buff, 1);
|
||||
opt_quoted_table= quote_name(table, table_buff2, 0);
|
||||
|
|
@ -1442,34 +1447,42 @@ static uint get_table_structure(char *table, char *db)
|
|||
DBUG_RETURN(0);
|
||||
}
|
||||
|
||||
dynstr_append_mem(&insert_pat, "INSERT ", 7);
|
||||
dynstr_append(&insert_pat, insert_option);
|
||||
dynstr_append_mem(&insert_pat, "INTO ", 5);
|
||||
dynstr_append(&insert_pat, opt_quoted_table);
|
||||
if (opt_complete_insert)
|
||||
/*
|
||||
if *ignore_flag & IGNORE_DATA is true, then we don't build up insert statements
|
||||
for the table's data. Note: in subsequent lines of code, this test will
|
||||
have to be performed each time we are appending to insert_pat.
|
||||
*/
|
||||
if (!(*ignore_flag & IGNORE_DATA))
|
||||
{
|
||||
dynstr_append_mem(&insert_pat, " (", 2);
|
||||
}
|
||||
else
|
||||
{
|
||||
dynstr_append_mem(&insert_pat, " VALUES ", 8);
|
||||
if (!extended_insert)
|
||||
dynstr_append_mem(&insert_pat, "(", 1);
|
||||
dynstr_append_mem(&insert_pat, "INSERT ", 7);
|
||||
dynstr_append(&insert_pat, insert_option);
|
||||
dynstr_append_mem(&insert_pat, "INTO ", 5);
|
||||
dynstr_append(&insert_pat, opt_quoted_table);
|
||||
if (opt_complete_insert)
|
||||
{
|
||||
dynstr_append_mem(&insert_pat, " (", 2);
|
||||
}
|
||||
else
|
||||
{
|
||||
dynstr_append_mem(&insert_pat, " VALUES ", 8);
|
||||
if (!extended_insert)
|
||||
dynstr_append_mem(&insert_pat, "(", 1);
|
||||
}
|
||||
}
|
||||
|
||||
while ((row=mysql_fetch_row(tableRes)))
|
||||
{
|
||||
if (init)
|
||||
{
|
||||
if (opt_complete_insert)
|
||||
if (opt_complete_insert && !(*ignore_flag & IGNORE_DATA))
|
||||
dynstr_append_mem(&insert_pat, ", ", 2);
|
||||
}
|
||||
init=1;
|
||||
if (opt_complete_insert)
|
||||
if (opt_complete_insert && !(*ignore_flag & IGNORE_DATA))
|
||||
dynstr_append(&insert_pat,
|
||||
quote_name(row[SHOW_FIELDNAME], name_buff, 0));
|
||||
}
|
||||
numFields = (uint) mysql_num_rows(tableRes);
|
||||
num_fields= (uint) mysql_num_rows(tableRes);
|
||||
mysql_free_result(tableRes);
|
||||
}
|
||||
else
|
||||
|
|
@ -1515,19 +1528,20 @@ static uint get_table_structure(char *table, char *db)
|
|||
check_io(sql_file);
|
||||
}
|
||||
|
||||
dynstr_append_mem(&insert_pat, "INSERT ", 7);
|
||||
dynstr_append(&insert_pat, insert_option);
|
||||
dynstr_append_mem(&insert_pat, "INTO ", 5);
|
||||
dynstr_append(&insert_pat, result_table);
|
||||
if (opt_complete_insert)
|
||||
if (!(*ignore_flag & IGNORE_DATA))
|
||||
{
|
||||
dynstr_append_mem(&insert_pat, " (", 2);
|
||||
}
|
||||
else
|
||||
{
|
||||
dynstr_append_mem(&insert_pat, " VALUES ", 8);
|
||||
if (!extended_insert)
|
||||
dynstr_append_mem(&insert_pat, "(", 1);
|
||||
dynstr_append_mem(&insert_pat, "INSERT ", 7);
|
||||
dynstr_append(&insert_pat, insert_option);
|
||||
dynstr_append_mem(&insert_pat, "INTO ", 5);
|
||||
dynstr_append(&insert_pat, result_table);
|
||||
if (opt_complete_insert)
|
||||
dynstr_append_mem(&insert_pat, " (", 2);
|
||||
else
|
||||
{
|
||||
dynstr_append_mem(&insert_pat, " VALUES ", 8);
|
||||
if (!extended_insert)
|
||||
dynstr_append_mem(&insert_pat, "(", 1);
|
||||
}
|
||||
}
|
||||
|
||||
while ((row=mysql_fetch_row(tableRes)))
|
||||
|
|
@ -1540,11 +1554,11 @@ static uint get_table_structure(char *table, char *db)
|
|||
fputs(",\n",sql_file);
|
||||
check_io(sql_file);
|
||||
}
|
||||
if (opt_complete_insert)
|
||||
if (opt_complete_insert && !(*ignore_flag & IGNORE_DATA))
|
||||
dynstr_append_mem(&insert_pat, ", ", 2);
|
||||
}
|
||||
init=1;
|
||||
if (opt_complete_insert)
|
||||
if (opt_complete_insert && !(*ignore_flag & IGNORE_DATA))
|
||||
dynstr_append(&insert_pat,
|
||||
quote_name(row[SHOW_FIELDNAME], name_buff, 0));
|
||||
if (!tFlag)
|
||||
|
|
@ -1575,7 +1589,7 @@ static uint get_table_structure(char *table, char *db)
|
|||
check_io(sql_file);
|
||||
}
|
||||
}
|
||||
numFields = (uint) mysql_num_rows(tableRes);
|
||||
num_fields = (uint) mysql_num_rows(tableRes);
|
||||
mysql_free_result(tableRes);
|
||||
if (!tFlag)
|
||||
{
|
||||
|
|
@ -1627,7 +1641,7 @@ static uint get_table_structure(char *table, char *db)
|
|||
print_xml_row(sql_file, "key", tableRes, &row);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
if (atoi(row[3]) == 1)
|
||||
{
|
||||
if (keynr++)
|
||||
|
|
@ -1684,9 +1698,7 @@ static uint get_table_structure(char *table, char *db)
|
|||
else
|
||||
{
|
||||
if (opt_xml)
|
||||
{
|
||||
print_xml_row(sql_file, "options", tableRes, &row);
|
||||
}
|
||||
else
|
||||
{
|
||||
fputs("/*!",sql_file);
|
||||
|
|
@ -1707,7 +1719,7 @@ continue_xml:
|
|||
check_io(sql_file);
|
||||
}
|
||||
}
|
||||
if (opt_complete_insert)
|
||||
if (opt_complete_insert && !(*ignore_flag & IGNORE_DATA))
|
||||
{
|
||||
dynstr_append_mem(&insert_pat, ") VALUES ", 9);
|
||||
if (!extended_insert)
|
||||
|
|
@ -1719,7 +1731,7 @@ continue_xml:
|
|||
write_footer(sql_file);
|
||||
my_fclose(sql_file, MYF(MY_WME));
|
||||
}
|
||||
DBUG_RETURN(numFields);
|
||||
DBUG_RETURN(num_fields);
|
||||
} /* get_table_structure */
|
||||
|
||||
|
||||
|
|
@ -1844,20 +1856,40 @@ static char *alloc_query_str(ulong size)
|
|||
|
||||
|
||||
/*
|
||||
** dump_table saves database contents as a series of INSERT statements.
|
||||
|
||||
SYNOPSIS
|
||||
dump_table()
|
||||
|
||||
dump_table saves database contents as a series of INSERT statements.
|
||||
|
||||
ARGS
|
||||
table - table name
|
||||
db - db name
|
||||
|
||||
RETURNS
|
||||
void
|
||||
*/
|
||||
|
||||
static void dump_table(uint numFields, char *table)
|
||||
static void dump_table(char *table, char *db)
|
||||
{
|
||||
char ignore_flag;
|
||||
char query_buf[QUERY_LENGTH], *end, buff[256],table_buff[NAME_LEN+3];
|
||||
char table_type[NAME_LEN];
|
||||
char *result_table, table_buff2[NAME_LEN*2+3], *opt_quoted_table;
|
||||
char *query= query_buf;
|
||||
int error= 0;
|
||||
ulong rownr, row_break, total_length, init_length;
|
||||
uint num_fields;
|
||||
MYSQL_RES *res;
|
||||
MYSQL_FIELD *field;
|
||||
MYSQL_ROW row;
|
||||
ulong rownr, row_break, total_length, init_length;
|
||||
const char *table_type;
|
||||
int error= 0;
|
||||
DBUG_ENTER("dump_table");
|
||||
|
||||
/*
|
||||
Make sure you get the create table info before the following check for
|
||||
--no-data flag below. Otherwise, the create table info won't be printed.
|
||||
*/
|
||||
num_fields= get_table_structure(table, db, (char *)&table_type, &ignore_flag);
|
||||
|
||||
/* Check --no-data flag */
|
||||
if (dFlag)
|
||||
|
|
@ -1866,31 +1898,35 @@ static void dump_table(uint numFields, char *table)
|
|||
fprintf(stderr,
|
||||
"-- Skipping dump data for table '%s', --no-data was used\n",
|
||||
table);
|
||||
return;
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
||||
/* Check that there are any fields in the table */
|
||||
if (numFields == 0)
|
||||
{
|
||||
if (verbose)
|
||||
fprintf(stderr,
|
||||
"-- Skipping dump data for table '%s', it has no fields\n",
|
||||
table);
|
||||
return;
|
||||
}
|
||||
|
||||
result_table= quote_name(table,table_buff, 1);
|
||||
opt_quoted_table= quote_name(table, table_buff2, 0);
|
||||
|
||||
/* Check table type */
|
||||
if ((table_type= check_if_ignore_table(table)))
|
||||
DBUG_PRINT("info", ("ignore_flag %x num_fields %d", ignore_flag, num_fields));
|
||||
/*
|
||||
If the table type is a merge table or any type that has to be
|
||||
_completely_ ignored and no data dumped
|
||||
*/
|
||||
if (ignore_flag & IGNORE_DATA)
|
||||
{
|
||||
if (verbose)
|
||||
fprintf(stderr,
|
||||
"-- Skipping data for table '%s' because it's of type %s\n",
|
||||
table, table_type);
|
||||
return;
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
/* Check that there are any fields in the table */
|
||||
if (num_fields == 0)
|
||||
{
|
||||
if (verbose)
|
||||
fprintf(stderr,
|
||||
"-- Skipping dump data for table '%s', it has no fields\n",
|
||||
table);
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
||||
result_table= quote_name(table,table_buff, 1);
|
||||
opt_quoted_table= quote_name(table, table_buff2, 0);
|
||||
|
||||
|
||||
if (verbose)
|
||||
fprintf(stderr, "-- Sending SELECT query...\n");
|
||||
|
|
@ -1934,7 +1970,7 @@ static void dump_table(uint numFields, char *table)
|
|||
if (mysql_real_query(sock, query, (uint) (end - query)))
|
||||
{
|
||||
DB_error(sock, "when executing 'SELECT INTO OUTFILE'");
|
||||
return;
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
@ -1989,7 +2025,7 @@ static void dump_table(uint numFields, char *table)
|
|||
DB_error(sock, "when retrieving data from server");
|
||||
if (verbose)
|
||||
fprintf(stderr, "-- Retrieving rows...\n");
|
||||
if (mysql_num_fields(res) != numFields)
|
||||
if (mysql_num_fields(res) != num_fields)
|
||||
{
|
||||
fprintf(stderr,"%s: Error in field count for table: %s ! Aborting.\n",
|
||||
my_progname, result_table);
|
||||
|
|
@ -2052,7 +2088,7 @@ static void dump_table(uint numFields, char *table)
|
|||
error= EX_CONSCHECK;
|
||||
goto err;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
63 is my_charset_bin. If charsetnr is not 63,
|
||||
we have not a BLOB but a TEXT column.
|
||||
|
|
@ -2287,14 +2323,14 @@ static void dump_table(uint numFields, char *table)
|
|||
mysql_free_result(res);
|
||||
if (query != query_buf)
|
||||
my_free(query, MYF(MY_ALLOW_ZERO_PTR));
|
||||
}
|
||||
return;
|
||||
}
|
||||
DBUG_VOID_RETURN;
|
||||
|
||||
err:
|
||||
if (query != query_buf)
|
||||
my_free(query, MYF(MY_ALLOW_ZERO_PTR));
|
||||
safe_exit(error);
|
||||
return;
|
||||
DBUG_VOID_RETURN;
|
||||
} /* dump_table */
|
||||
|
||||
|
||||
|
|
@ -2495,8 +2531,7 @@ static int dump_all_tables_in_db(char *database)
|
|||
char *end= strmov(afterdot, table);
|
||||
if (include_table(hash_key, end - hash_key))
|
||||
{
|
||||
numrows = get_table_structure(table, database);
|
||||
dump_table(numrows,table);
|
||||
dump_table(table,database);
|
||||
my_free(order_by, MYF(MY_ALLOW_ZERO_PTR));
|
||||
order_by= 0;
|
||||
if (opt_dump_triggers && ! opt_xml &&
|
||||
|
|
@ -2630,7 +2665,7 @@ static int get_actual_table_name(const char *old_table_name,
|
|||
|
||||
static int dump_selected_tables(char *db, char **table_names, int tables)
|
||||
{
|
||||
uint numrows, i;
|
||||
uint i;
|
||||
char table_buff[NAME_LEN*+3];
|
||||
char new_table_name[NAME_LEN];
|
||||
DYNAMIC_STRING lock_tables_query;
|
||||
|
|
@ -2699,8 +2734,7 @@ static int dump_selected_tables(char *db, char **table_names, int tables)
|
|||
{
|
||||
table_name= hash_element(&dump_tables, i);
|
||||
DBUG_PRINT("info",("Dumping table %s", table_name));
|
||||
numrows= get_table_structure(table_name, db);
|
||||
dump_table(numrows, table_name);
|
||||
dump_table(table_name,db);
|
||||
if (opt_dump_triggers &&
|
||||
mysql_get_server_version(sock) >= 50009)
|
||||
dump_triggers_for_table(table_name, db);
|
||||
|
|
@ -2899,28 +2933,37 @@ static void print_value(FILE *file, MYSQL_RES *result, MYSQL_ROW row,
|
|||
|
||||
|
||||
/*
|
||||
Check if we the table is one of the table types that should be ignored:
|
||||
MRG_ISAM, MRG_MYISAM
|
||||
|
||||
SYNOPSIS
|
||||
|
||||
Check if we the table is one of the table types that should be ignored:
|
||||
MRG_ISAM, MRG_MYISAM, if opt_delayed, if that table supports delayed inserts.
|
||||
If the table should be altogether ignored, it returns a TRUE, FALSE if it
|
||||
should not be ignored. If the user has selected to use INSERT DELAYED, it
|
||||
sets the value of the bool pointer supports_delayed_inserts to 0 if not
|
||||
supported, 1 if it is supported.
|
||||
|
||||
ARGS
|
||||
|
||||
check_if_ignore_table()
|
||||
table_name Table name to check
|
||||
table_type Type of table
|
||||
|
||||
GLOBAL VARIABLES
|
||||
sock MySQL socket
|
||||
verbose Write warning messages
|
||||
|
||||
RETURN
|
||||
0 Table should be backuped
|
||||
# Type of table (that should be skipped)
|
||||
char (bit value) See IGNORE_ values at top
|
||||
*/
|
||||
|
||||
static const char *check_if_ignore_table(const char *table_name)
|
||||
char check_if_ignore_table(const char *table_name, char *table_type)
|
||||
{
|
||||
char result= IGNORE_NONE;
|
||||
char buff[FN_REFLEN+80], show_name_buff[FN_REFLEN];
|
||||
MYSQL_RES *res;
|
||||
MYSQL_ROW row;
|
||||
const char *result= 0;
|
||||
DBUG_ENTER("check_if_ignore_table");
|
||||
|
||||
/* Check memory for quote_for_like() */
|
||||
DBUG_ASSERT(2*sizeof(table_name) < sizeof(show_name_buff));
|
||||
|
|
@ -2934,7 +2977,7 @@ static const char *check_if_ignore_table(const char *table_name)
|
|||
fprintf(stderr,
|
||||
"-- Warning: Couldn't get status information for table %s (%s)\n",
|
||||
table_name,mysql_error(sock));
|
||||
return 0; /* assume table is ok */
|
||||
DBUG_RETURN(result); /* assume table is ok */
|
||||
}
|
||||
}
|
||||
if (!(row= mysql_fetch_row(res)))
|
||||
|
|
@ -2943,18 +2986,38 @@ static const char *check_if_ignore_table(const char *table_name)
|
|||
"Error: Couldn't read status information for table %s (%s)\n",
|
||||
table_name, mysql_error(sock));
|
||||
mysql_free_result(res);
|
||||
return 0; /* assume table is ok */
|
||||
DBUG_RETURN(result); /* assume table is ok */
|
||||
}
|
||||
if (!(row[1]))
|
||||
result= "VIEW";
|
||||
strmake(table_type,"VIEW", NAME_LEN-1);
|
||||
else
|
||||
{
|
||||
if (strcmp(row[1], (result= "MRG_MyISAM")) &&
|
||||
strcmp(row[1], (result= "MRG_ISAM")))
|
||||
result= 0;
|
||||
/*
|
||||
If the table type matches any of these, we do support delayed inserts.
|
||||
Note: we do not want to skip dumping this table if if is not one of
|
||||
these types, but we do want to use delayed inserts in the dump if
|
||||
the table type is _NOT_ one of these types
|
||||
*/
|
||||
strmake(table_type, row[1], NAME_LEN-1);
|
||||
if (opt_delayed)
|
||||
{
|
||||
if (strcmp(table_type,"MyISAM") &&
|
||||
strcmp(table_type,"ISAM") &&
|
||||
strcmp(table_type,"ARCHIVE") &&
|
||||
strcmp(table_type,"HEAP") &&
|
||||
strcmp(table_type,"MEMORY"))
|
||||
result= IGNORE_INSERT_DELAYED;
|
||||
}
|
||||
|
||||
/*
|
||||
If these two types, we do want to skip dumping the table
|
||||
*/
|
||||
if (!dFlag &&
|
||||
(!strcmp(table_type,"MRG_MyISAM") || !strcmp(table_type,"MRG_ISAM")))
|
||||
result= IGNORE_DATA;
|
||||
}
|
||||
mysql_free_result(res);
|
||||
return result;
|
||||
DBUG_RETURN(result);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -59,12 +59,16 @@
|
|||
#include <stdarg.h>
|
||||
#include <sys/stat.h>
|
||||
#include <violite.h>
|
||||
#include <regex.h> /* Our own version of lib */
|
||||
#include "my_regex.h" /* Our own version of lib */
|
||||
#ifdef HAVE_SYS_WAIT_H
|
||||
#include <sys/wait.h>
|
||||
#endif
|
||||
#ifndef WEXITSTATUS
|
||||
# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
|
||||
# ifdef __WIN__
|
||||
# define WEXITSTATUS(stat_val) (stat_val)
|
||||
# else
|
||||
# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
|
||||
# endif
|
||||
#endif
|
||||
/* MAX_QUERY is 256K -- there is a test in sp-big that is >128K */
|
||||
#define MAX_QUERY (256*1024)
|
||||
|
|
@ -98,6 +102,10 @@
|
|||
#define DEFAULT_DELIMITER ";"
|
||||
#define MAX_DELIMITER 16
|
||||
|
||||
#define RESULT_OK 0
|
||||
#define RESULT_CONTENT_MISMATCH 1
|
||||
#define RESULT_LENGTH_MISMATCH 2
|
||||
|
||||
enum {OPT_MANAGER_USER=256,OPT_MANAGER_HOST,OPT_MANAGER_PASSWD,
|
||||
OPT_MANAGER_PORT,OPT_MANAGER_WAIT_TIMEOUT, OPT_SKIP_SAFEMALLOC,
|
||||
OPT_SSL_SSL, OPT_SSL_KEY, OPT_SSL_CERT, OPT_SSL_CA, OPT_SSL_CAPATH,
|
||||
|
|
@ -204,7 +212,7 @@ static int got_end_timer= FALSE;
|
|||
static void timer_output(void);
|
||||
static ulonglong timer_now(void);
|
||||
|
||||
static regex_t ps_re; /* Holds precompiled re for valid PS statements */
|
||||
static my_regex_t ps_re; /* Holds precompiled re for valid PS statements */
|
||||
static void ps_init_re(void);
|
||||
static int ps_match_re(char *);
|
||||
static char *ps_eprint(int);
|
||||
|
|
@ -545,7 +553,7 @@ static void close_cons()
|
|||
static void close_files()
|
||||
{
|
||||
DBUG_ENTER("close_files");
|
||||
for (; cur_file != (file_stack-1) ; cur_file--)
|
||||
for (; cur_file >= file_stack; cur_file--)
|
||||
{
|
||||
DBUG_PRINT("info", ("file_name: %s", cur_file->file_name));
|
||||
if (cur_file->file && cur_file->file != stdin)
|
||||
|
|
@ -605,7 +613,8 @@ static void die(const char *fmt, ...)
|
|||
if (cur_file && cur_file != file_stack)
|
||||
fprintf(stderr, "In included file \"%s\": ",
|
||||
cur_file->file_name);
|
||||
fprintf(stderr, "At line %u: ", start_lineno);
|
||||
if (start_lineno != 0)
|
||||
fprintf(stderr, "At line %u: ", start_lineno);
|
||||
vfprintf(stderr, fmt, args);
|
||||
fprintf(stderr, "\n");
|
||||
fflush(stderr);
|
||||
|
|
@ -638,7 +647,9 @@ static void verbose_msg(const char *fmt, ...)
|
|||
|
||||
va_start(args, fmt);
|
||||
|
||||
fprintf(stderr, "mysqltest: At line %u: ", start_lineno);
|
||||
fprintf(stderr, "mysqltest: ");
|
||||
if (start_lineno > 0)
|
||||
fprintf(stderr, "At line %u: ", start_lineno);
|
||||
vfprintf(stderr, fmt, args);
|
||||
fprintf(stderr, "\n");
|
||||
va_end(args);
|
||||
|
|
@ -679,7 +690,7 @@ int dyn_string_cmp(DYNAMIC_STRING* ds, const char *fname)
|
|||
DBUG_PRINT("info",("Size differs: result size: %u file size: %u",
|
||||
ds->length, stat_info.st_size));
|
||||
DBUG_PRINT("info",("result: '%s'", ds->str));
|
||||
DBUG_RETURN(2);
|
||||
DBUG_RETURN(RESULT_LENGTH_MISMATCH);
|
||||
}
|
||||
if (!(tmp = (char*) my_malloc(stat_info.st_size + 1, MYF(MY_WME))))
|
||||
die(NullS);
|
||||
|
|
@ -696,7 +707,7 @@ int dyn_string_cmp(DYNAMIC_STRING* ds, const char *fname)
|
|||
res_ptr = res_ds.str;
|
||||
if ((res_len = res_ds.length) != ds->length)
|
||||
{
|
||||
res = 2;
|
||||
res= RESULT_LENGTH_MISMATCH;
|
||||
goto err;
|
||||
}
|
||||
}
|
||||
|
|
@ -706,7 +717,8 @@ int dyn_string_cmp(DYNAMIC_STRING* ds, const char *fname)
|
|||
res_len = stat_info.st_size;
|
||||
}
|
||||
|
||||
res = (memcmp(res_ptr, ds->str, res_len)) ? 1 : 0;
|
||||
res= (memcmp(res_ptr, ds->str, res_len)) ?
|
||||
RESULT_CONTENT_MISMATCH : RESULT_OK;
|
||||
|
||||
err:
|
||||
if (res && eval_result)
|
||||
|
|
@ -723,22 +735,23 @@ err:
|
|||
static int check_result(DYNAMIC_STRING* ds, const char *fname,
|
||||
my_bool require_option)
|
||||
{
|
||||
int error = 0;
|
||||
int res=dyn_string_cmp(ds, fname);
|
||||
int error= RESULT_OK;
|
||||
int res= dyn_string_cmp(ds, fname);
|
||||
|
||||
DBUG_ENTER("check_result");
|
||||
|
||||
if (res && require_option)
|
||||
abort_not_supported_test();
|
||||
switch (res) {
|
||||
case 0:
|
||||
case RESULT_OK:
|
||||
break; /* ok */
|
||||
case 2:
|
||||
case RESULT_LENGTH_MISMATCH:
|
||||
verbose_msg("Result length mismatch");
|
||||
error = 1;
|
||||
error= RESULT_LENGTH_MISMATCH;
|
||||
break;
|
||||
case 1:
|
||||
case RESULT_CONTENT_MISMATCH:
|
||||
verbose_msg("Result content mismatch");
|
||||
error = 1;
|
||||
error= RESULT_CONTENT_MISMATCH;
|
||||
break;
|
||||
default: /* impossible */
|
||||
die("Unknown error code from dyn_string_cmp()");
|
||||
|
|
@ -1091,8 +1104,8 @@ static void do_exec(struct st_query *query)
|
|||
(query->expected_errno[i].code.errnum == status))
|
||||
{
|
||||
ok= 1;
|
||||
verbose_msg("command \"%s\" failed with expected error: %d",
|
||||
cmd, status);
|
||||
DBUG_PRINT("info", ("command \"%s\" failed with expected error: %d",
|
||||
cmd, status));
|
||||
}
|
||||
}
|
||||
if (!ok)
|
||||
|
|
@ -1377,9 +1390,7 @@ int do_sync_with_master2(long offset)
|
|||
int rpl_parse;
|
||||
|
||||
if (!master_pos.file[0])
|
||||
{
|
||||
die("Line %u: Calling 'sync_with_master' without calling 'save_master_pos'", start_lineno);
|
||||
}
|
||||
die("Calling 'sync_with_master' without calling 'save_master_pos'");
|
||||
rpl_parse= mysql_rpl_parse_enabled(mysql);
|
||||
mysql_disable_rpl_parse(mysql);
|
||||
|
||||
|
|
@ -1389,14 +1400,13 @@ int do_sync_with_master2(long offset)
|
|||
wait_for_position:
|
||||
|
||||
if (mysql_query(mysql, query_buf))
|
||||
die("line %u: failed in %s: %d: %s", start_lineno, query_buf,
|
||||
mysql_errno(mysql), mysql_error(mysql));
|
||||
die("failed in %s: %d: %s", query_buf, mysql_errno(mysql),
|
||||
mysql_error(mysql));
|
||||
|
||||
if (!(last_result= res= mysql_store_result(mysql)))
|
||||
die("line %u: mysql_store_result() returned NULL for '%s'", start_lineno,
|
||||
query_buf);
|
||||
die("mysql_store_result() returned NULL for '%s'", query_buf);
|
||||
if (!(row= mysql_fetch_row(res)))
|
||||
die("line %u: empty result in %s", start_lineno, query_buf);
|
||||
die("empty result in %s", query_buf);
|
||||
if (!row[0])
|
||||
{
|
||||
/*
|
||||
|
|
@ -1404,10 +1414,7 @@ wait_for_position:
|
|||
SLAVE has been issued ?
|
||||
*/
|
||||
if (tries++ == 3)
|
||||
{
|
||||
die("line %u: could not sync with master ('%s' returned NULL)",
|
||||
start_lineno, query_buf);
|
||||
}
|
||||
die("could not sync with master ('%s' returned NULL)", query_buf);
|
||||
sleep(1); /* So at most we will wait 3 seconds and make 4 tries */
|
||||
mysql_free_result(res);
|
||||
goto wait_for_position;
|
||||
|
|
@ -1453,10 +1460,9 @@ int do_save_master_pos()
|
|||
mysql_errno(mysql), mysql_error(mysql));
|
||||
|
||||
if (!(last_result =res = mysql_store_result(mysql)))
|
||||
die("line %u: mysql_store_result() retuned NULL for '%s'", start_lineno,
|
||||
query);
|
||||
die("mysql_store_result() retuned NULL for '%s'", query);
|
||||
if (!(row = mysql_fetch_row(res)))
|
||||
die("line %u: empty result in show master status", start_lineno);
|
||||
die("empty result in show master status");
|
||||
strnmov(master_pos.file, row[0], sizeof(master_pos.file)-1);
|
||||
master_pos.pos = strtoul(row[1], (char**) 0, 10);
|
||||
mysql_free_result(res); last_result=0;
|
||||
|
|
@ -2762,7 +2768,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
|
|||
fn_format(buff, argument, "", "", 4);
|
||||
DBUG_ASSERT(cur_file == file_stack && cur_file->file == 0);
|
||||
if (!(cur_file->file=
|
||||
my_fopen(buff, O_RDONLY | FILE_BINARY, MYF(MY_WME))))
|
||||
my_fopen(buff, O_RDONLY | FILE_BINARY, MYF(0))))
|
||||
die("Could not open %s: errno = %d", buff, errno);
|
||||
cur_file->file_name= my_strdup(buff, MYF(MY_FAE));
|
||||
break;
|
||||
|
|
@ -2868,7 +2874,7 @@ void str_to_file(const char *fname, char *str, int size)
|
|||
fname=buff;
|
||||
}
|
||||
fn_format(buff,fname,"","",4);
|
||||
|
||||
|
||||
if ((fd = my_open(buff, O_WRONLY | O_CREAT | O_TRUNC,
|
||||
MYF(MY_WME | MY_FFNF))) < 0)
|
||||
die("Could not open %s: errno = %d", buff, errno);
|
||||
|
|
@ -3149,7 +3155,7 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags)
|
|||
goto end;
|
||||
}
|
||||
|
||||
// If we come here the query is both executed and read successfully
|
||||
/* If we come here the query is both executed and read successfully */
|
||||
if (handle_no_error(q))
|
||||
{
|
||||
error= 1;
|
||||
|
|
@ -3725,12 +3731,13 @@ static void ps_init_re(void)
|
|||
"[[:space:]]*UPDATE[[:space:]]+MULTI[[:space:]]|"
|
||||
"[[:space:]]*INSERT[[:space:]]+SELECT[[:space:]])";
|
||||
|
||||
int err= regcomp(&ps_re, ps_re_str, (REG_EXTENDED | REG_ICASE | REG_NOSUB),
|
||||
&my_charset_latin1);
|
||||
int err= my_regcomp(&ps_re, ps_re_str,
|
||||
(REG_EXTENDED | REG_ICASE | REG_NOSUB),
|
||||
&my_charset_latin1);
|
||||
if (err)
|
||||
{
|
||||
char erbuf[100];
|
||||
int len= regerror(err, &ps_re, erbuf, sizeof(erbuf));
|
||||
int len= my_regerror(err, &ps_re, erbuf, sizeof(erbuf));
|
||||
fprintf(stderr, "error %s, %d/%d `%s'\n",
|
||||
ps_eprint(err), len, (int)sizeof(erbuf), erbuf);
|
||||
exit(1);
|
||||
|
|
@ -3740,7 +3747,7 @@ static void ps_init_re(void)
|
|||
|
||||
static int ps_match_re(char *stmt_str)
|
||||
{
|
||||
int err= regexec(&ps_re, stmt_str, (size_t)0, NULL, 0);
|
||||
int err= my_regexec(&ps_re, stmt_str, (size_t)0, NULL, 0);
|
||||
|
||||
if (err == 0)
|
||||
return 1;
|
||||
|
|
@ -3749,7 +3756,7 @@ static int ps_match_re(char *stmt_str)
|
|||
else
|
||||
{
|
||||
char erbuf[100];
|
||||
int len= regerror(err, &ps_re, erbuf, sizeof(erbuf));
|
||||
int len= my_regerror(err, &ps_re, erbuf, sizeof(erbuf));
|
||||
fprintf(stderr, "error %s, %d/%d `%s'\n",
|
||||
ps_eprint(err), len, (int)sizeof(erbuf), erbuf);
|
||||
exit(1);
|
||||
|
|
@ -3759,7 +3766,7 @@ static int ps_match_re(char *stmt_str)
|
|||
static char *ps_eprint(int err)
|
||||
{
|
||||
static char epbuf[100];
|
||||
size_t len= regerror(REG_ITOA|err, (regex_t *)NULL, epbuf, sizeof(epbuf));
|
||||
size_t len= my_regerror(REG_ITOA|err, (my_regex_t *)NULL, epbuf, sizeof(epbuf));
|
||||
assert(len <= sizeof(epbuf));
|
||||
return(epbuf);
|
||||
}
|
||||
|
|
@ -3767,7 +3774,7 @@ static char *ps_eprint(int err)
|
|||
|
||||
static void ps_free_reg(void)
|
||||
{
|
||||
regfree(&ps_re);
|
||||
my_regfree(&ps_re);
|
||||
}
|
||||
|
||||
/****************************************************************************/
|
||||
|
|
@ -3908,8 +3915,10 @@ int main(int argc, char **argv)
|
|||
{
|
||||
int error = 0;
|
||||
struct st_query *q;
|
||||
my_bool require_file=0, q_send_flag=0, abort_flag= 0;
|
||||
my_bool require_file=0, q_send_flag=0, abort_flag= 0,
|
||||
query_executed= 0;
|
||||
char save_file[FN_REFLEN];
|
||||
MY_STAT res_info;
|
||||
MY_INIT(argv[0]);
|
||||
|
||||
/* Use all time until exit if no explicit 'start_timer' */
|
||||
|
|
@ -4081,6 +4090,7 @@ int main(int argc, char **argv)
|
|||
error|= run_query(&cur_con->mysql, q, QUERY_REAP|QUERY_SEND);
|
||||
display_result_vertically= old_display_result_vertically;
|
||||
q->last_argument= q->end;
|
||||
query_executed= 1;
|
||||
break;
|
||||
}
|
||||
case Q_QUERY:
|
||||
|
|
@ -4105,6 +4115,7 @@ int main(int argc, char **argv)
|
|||
save_file[0]=0;
|
||||
}
|
||||
error |= run_query(&cur_con->mysql, q, flags);
|
||||
query_executed= 1;
|
||||
q->last_argument= q->end;
|
||||
break;
|
||||
}
|
||||
|
|
@ -4125,6 +4136,7 @@ int main(int argc, char **argv)
|
|||
is given on this connection.
|
||||
*/
|
||||
error |= run_query(&cur_con->mysql, q, QUERY_SEND);
|
||||
query_executed= 1;
|
||||
q->last_argument= q->end;
|
||||
break;
|
||||
case Q_RESULT:
|
||||
|
|
@ -4165,6 +4177,7 @@ int main(int argc, char **argv)
|
|||
break;
|
||||
case Q_EXEC:
|
||||
do_exec(q);
|
||||
query_executed= 1;
|
||||
break;
|
||||
case Q_START_TIMER:
|
||||
/* Overwrite possible earlier start of timer */
|
||||
|
|
@ -4244,12 +4257,32 @@ int main(int argc, char **argv)
|
|||
parser.current_line += current_line_inc;
|
||||
}
|
||||
|
||||
if (result_file && ds_res.length && !error)
|
||||
if (!query_executed && result_file && my_stat(result_file, &res_info, 0))
|
||||
{
|
||||
if (!record)
|
||||
error |= check_result(&ds_res, result_file, q->require_file);
|
||||
/*
|
||||
my_stat() successful on result file. Check if we have not run a
|
||||
single query, but we do have a result file that contains data.
|
||||
Note that we don't care, if my_stat() fails. For example for
|
||||
non-existing or non-readable file we assume it's fine to have
|
||||
no query output from the test file, e.g. regarded as no error.
|
||||
*/
|
||||
if (res_info.st_size)
|
||||
error|= (RESULT_CONTENT_MISMATCH | RESULT_LENGTH_MISMATCH);
|
||||
}
|
||||
if (ds_res.length && !error)
|
||||
{
|
||||
if (result_file)
|
||||
{
|
||||
if (!record)
|
||||
error |= check_result(&ds_res, result_file, q->require_file);
|
||||
else
|
||||
str_to_file(result_file, ds_res.str, ds_res.length);
|
||||
}
|
||||
else
|
||||
str_to_file(result_file, ds_res.str, ds_res.length);
|
||||
{
|
||||
/* Print the result to stdout */
|
||||
printf("%s", ds_res.str);
|
||||
}
|
||||
}
|
||||
dynstr_free(&ds_res);
|
||||
|
||||
|
|
|
|||
|
|
@ -21,10 +21,18 @@
|
|||
59 Temple Place, Suite 330, Boston, MA 02111 USA. */
|
||||
#define READLINE_LIBRARY
|
||||
|
||||
#ifndef _XOPEN_SOURCE
|
||||
#define _XOPEN_SOURCE 500
|
||||
#endif
|
||||
|
||||
#include "config_readline.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
|
||||
/* To get SuSE 9.3 to define wcwidth() (in wchar.h) */
|
||||
|
||||
#include <fcntl.h>
|
||||
|
||||
#if defined (HAVE_SYS_FILE_H)
|
||||
# include <sys/file.h>
|
||||
#endif
|
||||
|
|
@ -1149,7 +1157,8 @@ compute_lcd_of_matches (match_list, matches, text)
|
|||
rl_completion_found_quote &&
|
||||
rl_filename_quoting_desired)
|
||||
{
|
||||
dtext = (*rl_filename_dequoting_function) (text, rl_completion_quote_character);
|
||||
dtext = (*rl_filename_dequoting_function)
|
||||
((char*) text, rl_completion_quote_character);
|
||||
text = dtext;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,10 +21,16 @@
|
|||
59 Temple Place, Suite 330, Boston, MA 02111 USA. */
|
||||
#define READLINE_LIBRARY
|
||||
|
||||
#ifndef _XOPEN_SOURCE
|
||||
#define _XOPEN_SOURCE 500
|
||||
#endif
|
||||
|
||||
#include "config_readline.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
|
||||
/* To get SuSE 9.3 to define wcwidth() (in wchar.h) */
|
||||
|
||||
#if defined (HAVE_UNISTD_H)
|
||||
# include <unistd.h>
|
||||
#endif /* HAVE_UNISTD_H */
|
||||
|
|
|
|||
|
|
@ -21,9 +21,16 @@
|
|||
59 Temple Place, Suite 330, Boston, MA 02111 USA. */
|
||||
#define READLINE_LIBRARY
|
||||
|
||||
#ifndef _XOPEN_SOURCE
|
||||
#define _XOPEN_SOURCE 500
|
||||
#endif
|
||||
|
||||
#include "config_readline.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
|
||||
/* To get SuSE 9.3 to define wcwidth() (in wchar.h) */
|
||||
|
||||
#include <fcntl.h>
|
||||
#include "posixjmp.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -59,3 +59,42 @@ AC_DEFUN([MYSQL_CHECK_NEW_RL_INTERFACE], [
|
|||
)
|
||||
)
|
||||
])
|
||||
|
||||
dnl
|
||||
dnl check for availability of multibyte characters and functions
|
||||
dnl (Based on BASH_CHECK_MULTIBYTE in aclocal.m4 of readline-5.0)
|
||||
dnl
|
||||
AC_DEFUN([MYSQL_CHECK_MULTIBYTE],
|
||||
[
|
||||
AC_CHECK_HEADERS(wctype.h)
|
||||
AC_CHECK_HEADERS(wchar.h)
|
||||
AC_CHECK_HEADERS(langinfo.h)
|
||||
|
||||
AC_CHECK_FUNC(mbsrtowcs, AC_DEFINE([HAVE_MBSRTOWCS],[],[Define if you have mbsrtowcs]))
|
||||
AC_CHECK_FUNC(mbrtowc, AC_DEFINE([HAVE_MBRTOWC],[],[Define if you have mbrtowc]))
|
||||
AC_CHECK_FUNC(mbrlen, AC_DEFINE([HAVE_MBRLEN],[],[Define if you have mbrlen]))
|
||||
AC_CHECK_FUNC(wctomb, AC_DEFINE([HAVE_WCTOMB],[],[Define if you have wctomb]))
|
||||
AC_CHECK_FUNC(wcwidth, AC_DEFINE([HAVE_WCWIDTH],[],[Define if you have wcwidth]))
|
||||
AC_CHECK_FUNC(wcsdup, AC_DEFINE([HAVE_WCSDUP],[],[Define if you check wcsdup]))
|
||||
|
||||
AC_CACHE_CHECK([for mbstate_t], mysql_cv_have_mbstate_t,
|
||||
[AC_TRY_COMPILE([
|
||||
#include <wchar.h>], [
|
||||
mbstate_t ps;
|
||||
mbstate_t *psp;
|
||||
psp = (mbstate_t *)0;
|
||||
], mysql_cv_have_mbstate_t=yes, mysql_cv_have_mbstate_t=no)])
|
||||
if test $mysql_cv_have_mbstate_t = yes; then
|
||||
AC_DEFINE([HAVE_MBSTATE_T],[],[Define if mysql_cv_have_mbstate_t=yes])
|
||||
fi
|
||||
|
||||
AC_CACHE_CHECK([for nl_langinfo and CODESET], mysql_cv_langinfo_codeset,
|
||||
[AC_TRY_LINK(
|
||||
[#include <langinfo.h>],
|
||||
[char* cs = nl_langinfo(CODESET);],
|
||||
mysql_cv_langinfo_codeset=yes, mysql_cv_langinfo_codeset=no)])
|
||||
if test $mysql_cv_langinfo_codeset = yes; then
|
||||
AC_DEFINE([HAVE_LANGINFO_CODESET],[],[Define if mysql_cv_langinfo_codeset=yes])
|
||||
fi
|
||||
|
||||
])
|
||||
|
|
|
|||
|
|
@ -23,13 +23,14 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [
|
|||
|
||||
# System specific checks
|
||||
yassl_integer_extra_cxxflags=""
|
||||
case $SYSTEM_TYPE--$CXX_VERSION in
|
||||
sparc*solaris*--*Sun*C++*5.6*)
|
||||
case $host_cpu--$CXX_VERSION in
|
||||
sparc*--*Sun*C++*5.6*)
|
||||
# Disable inlining when compiling taocrypt/src/integer.cpp
|
||||
yassl_integer_extra_cxxflags="+d"
|
||||
AC_MSG_NOTICE([disabling inlining for yassl/taocrypt/src/integer.cpp])
|
||||
;;
|
||||
esac
|
||||
AC_SUBST([yassl_integer_extra_cxxflags])
|
||||
AC_SUBST([yassl_integer_extra_cxxflags])
|
||||
|
||||
else
|
||||
yassl_dir=""
|
||||
|
|
|
|||
|
|
@ -1821,6 +1821,7 @@ MYSQL_HAVE_TIOCSTAT
|
|||
MYSQL_STRUCT_DIRENT_D_INO
|
||||
MYSQL_STRUCT_DIRENT_D_NAMLEN
|
||||
MYSQL_TYPE_SIGHANDLER
|
||||
MYSQL_CHECK_MULTIBYTE
|
||||
if test "$with_named_curses" = "no"
|
||||
then
|
||||
MYSQL_CHECK_LIB_TERMCAP
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
#endif
|
||||
|
||||
#include <my_global.h> /* This includes dbug.h */
|
||||
#include <my_pthread.h>
|
||||
|
||||
int main (argc, argv)
|
||||
int argc;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
$(top_builddir)/include/mysqld_error.h: comp_err$(EXEEXT)
|
||||
$(top_builddir)/extra/comp_err \
|
||||
--charset=$(top_srcdir)/sql/share/charsets \
|
||||
--out-dir=$(top_builddir)/sql/share/ \
|
||||
|
|
|
|||
|
|
@ -131,7 +131,8 @@ static struct languages *parse_charset_string(char *str);
|
|||
static struct errors *parse_error_string(char *ptr, int er_count);
|
||||
static struct message *parse_message_string(struct message *new_message,
|
||||
char *str);
|
||||
static struct message *find_message(struct errors *err, const char *lang);
|
||||
static struct message *find_message(struct errors *err, const char *lang,
|
||||
my_bool no_default);
|
||||
static int parse_input_file(const char *file_name, struct errors **top_error,
|
||||
struct languages **top_language);
|
||||
static int get_options(int *argc, char ***argv);
|
||||
|
|
@ -305,7 +306,7 @@ static int create_sys_files(struct languages *lang_head,
|
|||
for (tmp_error= error_head; tmp_error; tmp_error= tmp_error->next_error)
|
||||
{
|
||||
/* dealing with messages */
|
||||
tmp= find_message(tmp_error, tmp_lang->lang_short_name);
|
||||
tmp= find_message(tmp_error, tmp_lang->lang_short_name, FALSE);
|
||||
|
||||
if (!tmp)
|
||||
{
|
||||
|
|
@ -450,6 +451,13 @@ static int parse_input_file(const char *file_name, struct errors **top_error,
|
|||
current_error->er_name);
|
||||
DBUG_RETURN(0);
|
||||
}
|
||||
if (find_message(current_error, current_message.lang_short_name, TRUE))
|
||||
{
|
||||
fprintf(stderr, "Duplicate message string for error '%s'"
|
||||
" in language '%s'\n",
|
||||
current_error->er_name, current_message.lang_short_name);
|
||||
DBUG_RETURN(0);
|
||||
}
|
||||
if (insert_dynamic(¤t_error->msg, (byte *) & current_message))
|
||||
DBUG_RETURN(0);
|
||||
continue;
|
||||
|
|
@ -556,11 +564,19 @@ static char *parse_default_language(char *str)
|
|||
|
||||
|
||||
/*
|
||||
For given error, finds message in given language; if does not exist,
|
||||
returns english.
|
||||
*/
|
||||
Find the message in a particular language
|
||||
|
||||
static struct message *find_message(struct errors *err, const char *lang)
|
||||
SYNOPSIS
|
||||
find_message()
|
||||
err Error to find message for
|
||||
lang Language of message to find
|
||||
no_default Don't return default (English) if does not exit
|
||||
|
||||
RETURN VALUE
|
||||
Returns the message structure if one is found, or NULL if not.
|
||||
*/
|
||||
static struct message *find_message(struct errors *err, const char *lang,
|
||||
my_bool no_default)
|
||||
{
|
||||
struct message *tmp, *return_val= 0;
|
||||
uint i, count;
|
||||
|
|
@ -579,7 +595,7 @@ static struct message *find_message(struct errors *err, const char *lang)
|
|||
return_val= tmp;
|
||||
}
|
||||
}
|
||||
DBUG_RETURN(return_val);
|
||||
DBUG_RETURN(no_default ? NULL : return_val);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -45,7 +45,8 @@ struct vector_base {
|
|||
vector_base() : start_(0), finish_(0), end_of_storage_(0) {}
|
||||
vector_base(size_t n)
|
||||
{
|
||||
start_ = static_cast<T*>(malloc(n * sizeof(T)));
|
||||
// Don't allow malloc(0), if n is 0 use 1
|
||||
start_ = static_cast<T*>(malloc((n ? n : 1) * sizeof(T)));
|
||||
if (!start_) abort();
|
||||
finish_ = start_;
|
||||
end_of_storage_ = start_ + n;
|
||||
|
|
|
|||
|
|
@ -56,12 +56,12 @@ private:
|
|||
T mac_;
|
||||
|
||||
// MSVC 6 HACK, gives compiler error if calculated in array
|
||||
enum { BSIZE = T::BLOCK_SIZE / sizeof(word32),
|
||||
DSIZE = T::DIGEST_SIZE / sizeof(word32) };
|
||||
enum { HMAC_BSIZE = T::BLOCK_SIZE / sizeof(word32),
|
||||
HMAC_DSIZE = T::DIGEST_SIZE / sizeof(word32) };
|
||||
|
||||
word32 ip_[BSIZE]; // align ipad_ on word32
|
||||
word32 op_[BSIZE]; // align opad_ on word32
|
||||
word32 innerH_[DSIZE]; // align innerHash_ on word32
|
||||
word32 ip_[HMAC_BSIZE]; // align ipad_ on word32
|
||||
word32 op_[HMAC_BSIZE]; // align opad_ on word32
|
||||
word32 innerH_[HMAC_DSIZE]; // align innerHash_ on word32
|
||||
|
||||
void KeyInnerHash();
|
||||
|
||||
|
|
|
|||
|
|
@ -95,7 +95,11 @@ OS_Seed::OS_Seed()
|
|||
{
|
||||
fd_ = open("/dev/urandom",O_RDONLY);
|
||||
if (fd_ == -1)
|
||||
{
|
||||
fd_ = open("/dev/random",O_RDONLY);
|
||||
if (fd_ == -1)
|
||||
error_.SetError(OPEN_RAN_E);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -326,7 +326,7 @@ C_MODE_END
|
|||
|
||||
|
||||
/* Fix a bug in gcc 2.8.0 on IRIX 6.2 */
|
||||
#if SIZEOF_LONG == 4 && defined(__LONG_MAX__)
|
||||
#if SIZEOF_LONG == 4 && defined(__LONG_MAX__) && (__GNUC__ == 2 && __GNUC_MINOR__ == 8)
|
||||
#undef __LONG_MAX__ /* Is a longlong value in gcc 2.8.0 ??? */
|
||||
#define __LONG_MAX__ 2147483647
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@ extern int pthread_mutex_destroy (pthread_mutex_t *);
|
|||
#define pthread_kill(A,B) raise(B)
|
||||
#define pthread_exit(A) pthread_dummy()
|
||||
#else
|
||||
#define pthread_mutex_init(A,B) InitializeCriticalSection(A)
|
||||
#define pthread_mutex_init(A,B) (InitializeCriticalSection(A),0)
|
||||
#define pthread_mutex_lock(A) (EnterCriticalSection(A),0)
|
||||
#define pthread_mutex_trylock(A) (WaitForSingleObject((A), 0) == WAIT_TIMEOUT)
|
||||
#define pthread_mutex_unlock(A) LeaveCriticalSection(A)
|
||||
|
|
|
|||
|
|
@ -262,6 +262,7 @@ extern char wild_many,wild_one,wild_prefix;
|
|||
extern const char *charsets_dir;
|
||||
extern char *defaults_extra_file;
|
||||
extern const char *defaults_group_suffix;
|
||||
extern const char *defaults_file;
|
||||
|
||||
extern my_bool timed_mutexes;
|
||||
|
||||
|
|
@ -280,7 +281,7 @@ enum loglevel {
|
|||
|
||||
enum cache_type
|
||||
{
|
||||
READ_CACHE,WRITE_CACHE,
|
||||
TYPE_NOT_SET= 0, READ_CACHE, WRITE_CACHE,
|
||||
SEQ_READ_APPEND /* sequential read or append */,
|
||||
READ_FIFO, READ_NET,WRITE_NET};
|
||||
|
||||
|
|
@ -775,6 +776,7 @@ extern void my_free_lock(byte *ptr,myf flags);
|
|||
extern void init_alloc_root(MEM_ROOT *mem_root, uint block_size,
|
||||
uint pre_alloc_size);
|
||||
extern gptr alloc_root(MEM_ROOT *mem_root,unsigned int Size);
|
||||
extern gptr multi_alloc_root(MEM_ROOT *mem_root, ...);
|
||||
extern void free_root(MEM_ROOT *root, myf MyFLAGS);
|
||||
extern void set_prealloc_root(MEM_ROOT *root, char *ptr);
|
||||
extern void reset_root_defaults(MEM_ROOT *mem_root, uint block_size,
|
||||
|
|
@ -887,6 +889,9 @@ int my_security_attr_create(SECURITY_ATTRIBUTES **psa, const char **perror,
|
|||
|
||||
void my_security_attr_free(SECURITY_ATTRIBUTES *sa);
|
||||
|
||||
/* implemented in my_conio.c */
|
||||
char* my_cgets(char *string, unsigned long clen, unsigned long* plen);
|
||||
|
||||
#endif
|
||||
#ifdef __NETWARE__
|
||||
void netware_reg_user(const char *ip, const char *user,
|
||||
|
|
|
|||
|
|
@ -381,6 +381,20 @@ typedef struct st_sort_key_blocks /* Used when sorting */
|
|||
} SORT_KEY_BLOCKS;
|
||||
|
||||
|
||||
/*
|
||||
MyISAM supports several statistics collection methods. Currently statistics
|
||||
collection method is not stored in MyISAM file and has to be specified for
|
||||
each table analyze/repair operation in MI_CHECK::stats_method.
|
||||
*/
|
||||
|
||||
typedef enum
|
||||
{
|
||||
/* Treat NULLs as inequal when collecting statistics (default for 4.1/5.0) */
|
||||
MI_STATS_METHOD_NULLS_NOT_EQUAL,
|
||||
/* Treat NULLs as equal when collecting statistics (like 4.0 did) */
|
||||
MI_STATS_METHOD_NULLS_EQUAL
|
||||
} enum_mi_stats_method;
|
||||
|
||||
typedef struct st_mi_check_param
|
||||
{
|
||||
ulonglong auto_increment_value;
|
||||
|
|
@ -411,6 +425,7 @@ typedef struct st_mi_check_param
|
|||
void *thd;
|
||||
const char *db_name, *table_name;
|
||||
const char *op_name;
|
||||
enum_mi_stats_method stats_method;
|
||||
} MI_CHECK;
|
||||
|
||||
typedef struct st_sort_ft_buf
|
||||
|
|
|
|||
|
|
@ -411,6 +411,7 @@ my_bool check_scramble(const char *reply, const char *message,
|
|||
const unsigned char *hash_stage2);
|
||||
void get_salt_from_password(unsigned char *res, const char *password);
|
||||
void make_password_from_salt(char *to, const unsigned char *hash_stage2);
|
||||
void octet2hex(char *to, const unsigned char *str, unsigned int len);
|
||||
|
||||
/* end of password.c */
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ SUBDIRS = . examples
|
|||
libmysqld_sources= libmysqld.c lib_sql.cc emb_qcache.cc
|
||||
libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \
|
||||
my_time.c
|
||||
sqlexamplessources = ha_example.cc ha_archive.cc ha_tina.cc
|
||||
sqlexamplessources = ha_example.cc ha_tina.cc
|
||||
|
||||
noinst_HEADERS = embedded_priv.h emb_qcache.h
|
||||
|
||||
|
|
@ -60,10 +60,10 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
|
|||
sql_string.cc sql_table.cc sql_test.cc sql_udf.cc \
|
||||
sql_update.cc sql_yacc.cc table.cc thr_malloc.cc time.cc \
|
||||
unireg.cc uniques.cc stacktrace.c sql_union.cc hash_filo.cc \
|
||||
spatial.cc gstream.cc sql_help.cc tztime.cc protocol_cursor.cc \
|
||||
spatial.cc gstream.cc sql_help.cc tztime.cc sql_cursor.cc \
|
||||
sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \
|
||||
parse_file.cc rpl_filter.cc sql_view.cc sql_trigger.cc my_decimal.cc \
|
||||
ha_blackhole.cc sql_partition.cc ha_partition.cc
|
||||
parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \
|
||||
ha_blackhole.cc ha_archive.cc sql_partition.cc ha_partition.cc
|
||||
|
||||
libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) $(sqlexamplessources)
|
||||
libmysqld_a_SOURCES=
|
||||
|
|
|
|||
|
|
@ -423,9 +423,9 @@ int init_embedded_server(int argc, char **argv, char **groups)
|
|||
|
||||
acl_error= 0;
|
||||
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
||||
if (!(acl_error= acl_init((THD *)0, opt_noacl)) &&
|
||||
if (!(acl_error= acl_init(opt_noacl)) &&
|
||||
!opt_noacl)
|
||||
(void) grant_init((THD *)0);
|
||||
(void) grant_init();
|
||||
#endif
|
||||
if (acl_error || my_tz_init((THD *)0, default_tz_name, opt_bootstrap))
|
||||
{
|
||||
|
|
@ -514,8 +514,8 @@ void *create_embedded_thd(int client_flag, char *db)
|
|||
thd->db= db;
|
||||
thd->db_length= db ? strip_sp(db) : 0;
|
||||
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
||||
thd->db_access= DB_ACLS;
|
||||
thd->master_access= ~NO_ACCESS;
|
||||
thd->security_ctx->db_access= DB_ACLS;
|
||||
thd->security_ctx->master_access= ~NO_ACCESS;
|
||||
#endif
|
||||
thd->net.query_cache_query= 0;
|
||||
|
||||
|
|
@ -532,10 +532,9 @@ err:
|
|||
int check_embedded_connection(MYSQL *mysql)
|
||||
{
|
||||
THD *thd= (THD*)mysql->thd;
|
||||
thd->host= (char*)my_localhost;
|
||||
thd->host_or_ip= thd->host;
|
||||
thd->user= my_strdup(mysql->user, MYF(0));
|
||||
thd->priv_user= thd->user;
|
||||
Security_context *sctx= thd->security_ctx;
|
||||
sctx->host_or_ip= sctx->host= (char*)my_localhost;
|
||||
sctx->priv_user= sctx->user= my_strdup(mysql->user, MYF(0));
|
||||
return check_user(thd, COM_CONNECT, NULL, 0, thd->db, true);
|
||||
}
|
||||
|
||||
|
|
@ -543,26 +542,27 @@ int check_embedded_connection(MYSQL *mysql)
|
|||
int check_embedded_connection(MYSQL *mysql)
|
||||
{
|
||||
THD *thd= (THD*)mysql->thd;
|
||||
Security_context *sctx= thd->security_ctx;
|
||||
int result;
|
||||
char scramble_buff[SCRAMBLE_LENGTH];
|
||||
int passwd_len;
|
||||
|
||||
if (mysql->options.client_ip)
|
||||
{
|
||||
thd->host= my_strdup(mysql->options.client_ip, MYF(0));
|
||||
thd->ip= my_strdup(thd->host, MYF(0));
|
||||
sctx->host= my_strdup(mysql->options.client_ip, MYF(0));
|
||||
sctx->ip= my_strdup(sctx->host, MYF(0));
|
||||
}
|
||||
else
|
||||
thd->host= (char*)my_localhost;
|
||||
thd->host_or_ip= thd->host;
|
||||
sctx->host= (char*)my_localhost;
|
||||
sctx->host_or_ip= sctx->host;
|
||||
|
||||
if (acl_check_host(thd->host,thd->ip))
|
||||
if (acl_check_host(sctx->host, sctx->ip))
|
||||
{
|
||||
result= ER_HOST_NOT_PRIVILEGED;
|
||||
goto err;
|
||||
}
|
||||
|
||||
thd->user= my_strdup(mysql->user, MYF(0));
|
||||
sctx->user= my_strdup(mysql->user, MYF(0));
|
||||
if (mysql->passwd && mysql->passwd[0])
|
||||
{
|
||||
memset(thd->scramble, 55, SCRAMBLE_LENGTH); // dummy scramble
|
||||
|
|
|
|||
54
man/which.2
54
man/which.2
|
|
@ -1,54 +0,0 @@
|
|||
.TH WHICH 1 "20 December 2000"
|
||||
.SH NAME
|
||||
which - Jani please supply one.
|
||||
.SH USAGE
|
||||
which [options] [--] programname [...]
|
||||
.SH SYNOPSIS
|
||||
.B which
|
||||
.RB [ \-\-version | \-[vV] ]
|
||||
.RB [ \-\-skip\-dot ]
|
||||
.RB [ \-\-skip\-tilde ]
|
||||
.RB [ \-\-show\-dot ]
|
||||
.RB [ \-\-show\-tilde ]
|
||||
.RB [ \-\-tty\-only ]
|
||||
.RB [ \-\-all | \-a ]
|
||||
.RB [ \-\-read\-alias | \-i ]
|
||||
.RB [ \-\-skip\-alias ]
|
||||
.SH DESCRIPTION
|
||||
.TP
|
||||
.BR which
|
||||
supports by executing
|
||||
.TP
|
||||
.BR \-\-version | \-[vV]
|
||||
Print version and exit successfully.
|
||||
.TP
|
||||
.BR \-\-skip\-dot
|
||||
Skip directories in PATH that start with a dot.
|
||||
.TP
|
||||
.BR \-\-skip\-tilde
|
||||
Skip directories in PATH that start with a tilde.
|
||||
.TP
|
||||
.BR \-\-show\-dot
|
||||
Don\'t expand a dot to current directory in output.
|
||||
.TP
|
||||
.BR \-\-show\-tilde
|
||||
Output a tilde for HOME directory for non-root.
|
||||
.TP
|
||||
.BR \-\-tty\-only
|
||||
Stop processing options on the right if not on tty.
|
||||
.TP
|
||||
.BR \-\-all | \-a
|
||||
Print all matches in PATH, not just the first
|
||||
.TP
|
||||
.BR \-\-read\-alias | \-i
|
||||
Read list of aliases from stdin.
|
||||
.TP
|
||||
.BR \-\-skip\-alias
|
||||
Ignore option
|
||||
.BR --read-alias;
|
||||
don\'t read stdin.
|
||||
.SH "SEE ALSO"
|
||||
isamchk (1), isamlog (1), mysqlaccess (1), mysqladmin (1), mysqlbug (1), mysqld (1), mysqldump (1), mysqlshow (1), msql2mysql (1), perror (1), replace (1), mysqld_safe (1), which1 (1), zap (1),
|
||||
.SH AUTHOR
|
||||
Ver 1.0, distribution 3.23.29a Michael (Monty) Widenius (monty@tcx.se), TCX Datakonsult AB (http://www.tcx.se). This software comes with no warranty. Manual page by L. (Kill-9) Pedersen (kill-9@kill-9.dk), Mercurmedia Data Model Architect / system developer (http://www.mercurmedia.com)
|
||||
.\" end of man page
|
||||
7
mysql-test/include/im_check_os.inc
Normal file
7
mysql-test/include/im_check_os.inc
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
--connect (dflt_server_con,localhost,root,,mysql,$IM_MYSQLD1_PORT,$IM_MYSQLD1_SOCK)
|
||||
--connection dflt_server_con
|
||||
|
||||
--source include/not_windows.inc
|
||||
|
||||
--connection default
|
||||
--disconnect dflt_server_con
|
||||
|
|
@ -62,7 +62,7 @@ comment='Host privileges; Merged with database privileges';
|
|||
CREATE TABLE user (
|
||||
Host char(60) binary DEFAULT '' NOT NULL,
|
||||
User char(16) binary DEFAULT '' NOT NULL,
|
||||
Password char(41) binary DEFAULT '' NOT NULL,
|
||||
Password binary(41) DEFAULT '' NOT NULL,
|
||||
Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
|
||||
Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
|
||||
Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
|
||||
|
|
|
|||
|
|
@ -61,22 +61,6 @@ sub collect_test_cases ($) {
|
|||
$elem= $tname;
|
||||
$tname =~ s/\.imtest$//;
|
||||
$component_id= 'im';
|
||||
|
||||
if ( $::glob_use_embedded_server )
|
||||
{
|
||||
mtr_report(
|
||||
"Instance Manager's tests are not available in embedded mode." .
|
||||
"Test case '$tname' is skipped.");
|
||||
next;
|
||||
}
|
||||
|
||||
unless ( $::exe_im )
|
||||
{
|
||||
mtr_report(
|
||||
"Instance Manager executable is unavailable. " .
|
||||
"Test case '$tname' is skipped.");
|
||||
next;
|
||||
}
|
||||
}
|
||||
|
||||
# If target component is known, check that the specified test case
|
||||
|
|
@ -115,7 +99,7 @@ sub collect_test_cases ($) {
|
|||
$component_id= 'im';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
collect_one_test_case($testdir,$resdir,$tname,$elem,$cases,{},
|
||||
$component_id);
|
||||
}
|
||||
|
|
@ -403,6 +387,34 @@ sub collect_one_test_case($$$$$$$) {
|
|||
$tinfo->{'comment'}= mtr_fromfile($disabled_file);
|
||||
}
|
||||
|
||||
if ( $component_id eq 'im' )
|
||||
{
|
||||
if ( $::glob_use_embedded_server )
|
||||
{
|
||||
$tinfo->{'skip'}= 1;
|
||||
|
||||
mtr_report(
|
||||
"Instance Manager tests are not available in embedded mode. " .
|
||||
"Test case '$tname' is skipped.");
|
||||
}
|
||||
elsif ( $::opt_ps_protocol )
|
||||
{
|
||||
$tinfo->{'skip'}= 1;
|
||||
|
||||
mtr_report(
|
||||
"Instance Manager tests are not run with --ps-protocol. " .
|
||||
"Test case '$tname' is skipped.");
|
||||
}
|
||||
elsif ( !$::exe_im )
|
||||
{
|
||||
$tinfo->{'skip'}= 1;
|
||||
|
||||
mtr_report(
|
||||
"Instance Manager executable is unavailable." .
|
||||
"Test case '$tname' is skipped.");
|
||||
}
|
||||
}
|
||||
|
||||
# We can't restart a running server that may be in use
|
||||
|
||||
if ( $::glob_use_running_server and
|
||||
|
|
|
|||
|
|
@ -680,7 +680,8 @@ sub mtr_mysqladmin_shutdown {
|
|||
mtr_add_arg($args, "shutdown");
|
||||
# We don't wait for termination of mysqladmin
|
||||
my $pid= mtr_spawn($::exe_mysqladmin, $args,
|
||||
"", $::path_manager_log, $::path_manager_log, "");
|
||||
"", $::path_manager_log, $::path_manager_log, "",
|
||||
{ append_log_file => 1 });
|
||||
$mysql_admin_pids{$pid}= 1;
|
||||
}
|
||||
|
||||
|
|
@ -847,14 +848,16 @@ sub sleep_until_file_created ($$$) {
|
|||
sub mtr_kill_processes ($) {
|
||||
my $pids = shift;
|
||||
|
||||
foreach my $sig (15,9)
|
||||
foreach my $sig (15, 9)
|
||||
{
|
||||
my $retries= 20; # FIXME 20 seconds, this is silly!
|
||||
kill($sig, @{$pids});
|
||||
while ( $retries-- and kill(0, @{$pids}) )
|
||||
my $retries= 10;
|
||||
while (1)
|
||||
{
|
||||
mtr_debug("Sleep 1 second waiting for processes to die");
|
||||
sleep(1) # Wait one second
|
||||
kill($sig, @{$pids});
|
||||
last unless kill (0, @{$pids}) and $retries--;
|
||||
|
||||
mtr_debug("Sleep 2 second waiting for processes to die");
|
||||
sleep(2);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -257,11 +257,11 @@ sub mtr_print_header () {
|
|||
print "\n";
|
||||
if ( $::opt_timer )
|
||||
{
|
||||
print "TEST RESULT TIME (ms)\n";
|
||||
print "TEST RESULT TIME (ms)\n";
|
||||
}
|
||||
else
|
||||
{
|
||||
print "TEST RESULT\n";
|
||||
print "TEST RESULT\n";
|
||||
}
|
||||
mtr_print_line();
|
||||
print "\n";
|
||||
|
|
|
|||
|
|
@ -2,37 +2,35 @@
|
|||
# -*- cperl -*-
|
||||
|
||||
# This is a transformation of the "mysql-test-run" Bourne shell script
|
||||
# to Perl. This is just an intermediate step, the goal is to rewrite
|
||||
# the Perl script to C. The complexity of the mysql-test-run script
|
||||
# makes it a bit hard to write and debug it as a C program directly,
|
||||
# so this is considered a prototype.
|
||||
# to Perl. There are reasons this rewrite is not the prettiest Perl
|
||||
# you have seen
|
||||
#
|
||||
# Because of this the Perl coding style may in some cases look a bit
|
||||
# funny. The rules used are
|
||||
# - The original script is huge and for most part uncommented,
|
||||
# not even a usage description of the flags.
|
||||
#
|
||||
# - The coding style is as close as possible to the C/C++ MySQL
|
||||
# coding standard.
|
||||
# - There has been an attempt to write a replacement in C for the
|
||||
# original Bourne shell script. It was kind of working but lacked
|
||||
# lot of functionality to really be a replacement. Not to redo
|
||||
# that mistake and catch all the obscure features of the original
|
||||
# script, the rewrite in Perl is more close to the original script
|
||||
# meaning it also share some of the ugly parts as well.
|
||||
#
|
||||
# - Where NULL is to be returned, the undefined value is used.
|
||||
# - The original intention was that this script was to be a prototype
|
||||
# to be the base for a new C version with full functionality. Since
|
||||
# then it was decided that the Perl version should replace the
|
||||
# Bourne shell version, but the Perl style still reflects the wish
|
||||
# to make the Perl to C step easy.
|
||||
#
|
||||
# - Regexp comparisons are simple and can be translated to strcmp
|
||||
# and other string functions. To ease this transformation matching
|
||||
# is done in the lib "lib/mtr_match.pl", i.e. regular expressions
|
||||
# should be avoided in the main program.
|
||||
# Some coding style from the original intent has been kept
|
||||
#
|
||||
# - The "unless" construct is not to be used. It is the same as "if !".
|
||||
#
|
||||
# - opendir/readdir/closedir is used instead of glob()/<*>.
|
||||
# - To make this Perl script easy to alter even for those that not
|
||||
# code Perl that often, the coding style is as close as possible to
|
||||
# the C/C++ MySQL coding standard.
|
||||
#
|
||||
# - All lists of arguments to send to commands are Perl lists/arrays,
|
||||
# not strings we append args to. Within reason, most string
|
||||
# concatenation for arguments should be avoided.
|
||||
#
|
||||
# - sprintf() is to be used, within reason, for all string creation.
|
||||
# This mtr_add_arg() function is also based on sprintf(), i.e. you
|
||||
# use a format string and put the variable argument in the argument
|
||||
# list.
|
||||
#
|
||||
# - Functions defined in the main program are not to be prefixed,
|
||||
# functions in "library files" are to be prefixed with "mtr_" (for
|
||||
# Mysql-Test-Run). There are some exceptions, code that fits best in
|
||||
|
|
@ -241,8 +239,10 @@ our $opt_ps_protocol;
|
|||
|
||||
our $opt_sleep_time_after_restart= 1;
|
||||
our $opt_sleep_time_for_delete= 10;
|
||||
our $opt_testcase_timeout= 5; # 5 min max
|
||||
our $opt_suite_timeout= 120; # 2 hours max
|
||||
our $opt_testcase_timeout;
|
||||
our $opt_suite_timeout;
|
||||
my $default_testcase_timeout= 10; # 10 min max
|
||||
my $default_suite_timeout= 120; # 2 hours max
|
||||
|
||||
our $opt_socket;
|
||||
|
||||
|
|
@ -260,6 +260,7 @@ our $opt_user;
|
|||
our $opt_user_test;
|
||||
|
||||
our $opt_valgrind;
|
||||
our $opt_valgrind_mysqltest;
|
||||
our $opt_valgrind_all;
|
||||
our $opt_valgrind_options;
|
||||
|
||||
|
|
@ -473,6 +474,7 @@ sub command_line_setup () {
|
|||
# Read the command line
|
||||
# Note: Keep list, and the order, in sync with usage at end of this file
|
||||
|
||||
Getopt::Long::Configure("pass_through");
|
||||
GetOptions(
|
||||
# Control what engine/variation to run
|
||||
'embedded-server' => \$opt_embedded_server,
|
||||
|
|
@ -521,8 +523,9 @@ sub command_line_setup () {
|
|||
# Coverage, profiling etc
|
||||
'gcov' => \$opt_gcov,
|
||||
'gprof' => \$opt_gprof,
|
||||
'valgrind' => \$opt_valgrind,
|
||||
'valgrind-all' => \$opt_valgrind_all,
|
||||
'valgrind:s' => \$opt_valgrind,
|
||||
'valgrind-mysqltest:s' => \$opt_valgrind_mysqltest,
|
||||
'valgrind-all:s' => \$opt_valgrind_all,
|
||||
'valgrind-options=s' => \$opt_valgrind_options,
|
||||
|
||||
# Misc
|
||||
|
|
@ -562,7 +565,21 @@ sub command_line_setup () {
|
|||
usage("");
|
||||
}
|
||||
|
||||
@opt_cases= @ARGV;
|
||||
foreach my $arg ( @ARGV )
|
||||
{
|
||||
if ( $arg =~ /^--skip-/ )
|
||||
{
|
||||
push(@opt_extra_mysqld_opt, $arg);
|
||||
}
|
||||
elsif ( $arg =~ /^-/ )
|
||||
{
|
||||
usage("Invalid option \"$arg\"");
|
||||
}
|
||||
else
|
||||
{
|
||||
push(@opt_cases, $arg);
|
||||
}
|
||||
}
|
||||
|
||||
# --------------------------------------------------------------------------
|
||||
# Set the "var/" directory, as it is the base for everything else
|
||||
|
|
@ -654,11 +671,6 @@ sub command_line_setup () {
|
|||
mtr_error("Coverage test needs the source - please use source dist");
|
||||
}
|
||||
|
||||
if ( $glob_use_embedded_server and ! $opt_source_dist )
|
||||
{
|
||||
mtr_error("Embedded server needs source tree - please use source dist");
|
||||
}
|
||||
|
||||
if ( $opt_gdb )
|
||||
{
|
||||
$opt_wait_timeout= 300;
|
||||
|
|
@ -700,29 +712,42 @@ sub command_line_setup () {
|
|||
$opt_with_ndbcluster= 0;
|
||||
}
|
||||
|
||||
# FIXME
|
||||
# The ":s" in the argument spec, means we have three different cases
|
||||
#
|
||||
# undefined option not set
|
||||
# "" option set with no argument
|
||||
# "somestring" option is name/path of valgrind executable
|
||||
|
||||
#if ( $opt_valgrind or $opt_valgrind_all )
|
||||
#{
|
||||
# VALGRIND=`which valgrind` # this will print an error if not found FIXME
|
||||
# Give good warning to the user and stop
|
||||
# if ( ! $VALGRIND )
|
||||
# {
|
||||
# print "You need to have the 'valgrind' program in your PATH to run mysql-test-run with option --valgrind. Valgrind's home page is http://valgrind.kde.org.\n"
|
||||
# exit 1
|
||||
# }
|
||||
# Take executable path from any of them, if any
|
||||
$opt_valgrind= $opt_valgrind_mysqltest if $opt_valgrind_mysqltest;
|
||||
$opt_valgrind= $opt_valgrind_all if $opt_valgrind_all;
|
||||
|
||||
# If valgrind flag not defined, define if other valgrind flags are
|
||||
unless ( defined $opt_valgrind )
|
||||
{
|
||||
$opt_valgrind= ""
|
||||
if defined $opt_valgrind_mysqltest or defined $opt_valgrind_all;
|
||||
}
|
||||
|
||||
if ( ! $opt_testcase_timeout )
|
||||
{
|
||||
$opt_testcase_timeout= $default_testcase_timeout;
|
||||
$opt_testcase_timeout*= 10 if defined $opt_valgrind;
|
||||
}
|
||||
|
||||
if ( ! $opt_suite_timeout )
|
||||
{
|
||||
$opt_suite_timeout= $default_suite_timeout;
|
||||
$opt_suite_timeout*= 4 if defined $opt_valgrind;
|
||||
}
|
||||
|
||||
if ( defined $opt_valgrind )
|
||||
{
|
||||
$opt_sleep_time_after_restart= 10;
|
||||
$opt_sleep_time_for_delete= 60;
|
||||
# >=2.1.2 requires the --tool option, some versions write to stdout, some to stderr
|
||||
# valgrind --help 2>&1 | grep "\-\-tool" > /dev/null && VALGRIND="$VALGRIND --tool=memcheck"
|
||||
# VALGRIND="$VALGRIND --alignment=8 --leak-check=yes --num-callers=16"
|
||||
# $opt_extra_mysqld_opt.= " --skip-safemalloc --skip-bdb";
|
||||
# SLEEP_TIME_AFTER_RESTART=10
|
||||
# $opt_sleep_time_for_delete= 60
|
||||
# $glob_use_running_server= ""
|
||||
# if ( "$1"= "--valgrind-all" )
|
||||
# {
|
||||
# VALGRIND="$VALGRIND -v --show-reachable=yes"
|
||||
# }
|
||||
#}
|
||||
# valgrind --help 2>&1 | grep "\-\-tool" > /dev/null && VALGRIND="$VALGRIND --tool=memcheck"
|
||||
}
|
||||
|
||||
if ( ! $opt_user )
|
||||
{
|
||||
|
|
@ -738,78 +763,96 @@ sub command_line_setup () {
|
|||
|
||||
# Put this into a hash, will be a C struct
|
||||
|
||||
$master->[0]->{'path_myddir'}= "$opt_vardir/master-data";
|
||||
$master->[0]->{'path_myerr'}= "$opt_vardir/log/master.err";
|
||||
$master->[0]->{'path_mylog'}= "$opt_vardir/log/master.log";
|
||||
$master->[0]->{'path_mypid'}= "$opt_vardir/run/master.pid";
|
||||
$master->[0]->{'path_mysock'}= "$opt_tmpdir/master.sock";
|
||||
$master->[0]->{'path_myport'}= $opt_master_myport;
|
||||
$master->[0]->{'start_timeout'}= 400; # enough time create innodb tables
|
||||
$master->[0]=
|
||||
{
|
||||
path_myddir => "$opt_vardir/master-data",
|
||||
path_myerr => "$opt_vardir/log/master.err",
|
||||
path_mylog => "$opt_vardir/log/master.log",
|
||||
path_mypid => "$opt_vardir/run/master.pid",
|
||||
path_mysock => "$opt_tmpdir/master.sock",
|
||||
path_myport => $opt_master_myport,
|
||||
start_timeout => 400, # enough time create innodb tables
|
||||
|
||||
$master->[0]->{'ndbcluster'}= 1; # ndbcluster not started
|
||||
ndbcluster => 1, # ndbcluster not started
|
||||
};
|
||||
|
||||
$master->[1]->{'path_myddir'}= "$opt_vardir/master1-data";
|
||||
$master->[1]->{'path_myerr'}= "$opt_vardir/log/master1.err";
|
||||
$master->[1]->{'path_mylog'}= "$opt_vardir/log/master1.log";
|
||||
$master->[1]->{'path_mypid'}= "$opt_vardir/run/master1.pid";
|
||||
$master->[1]->{'path_mysock'}= "$opt_tmpdir/master1.sock";
|
||||
$master->[1]->{'path_myport'}= $opt_master_myport + 1;
|
||||
$master->[1]->{'start_timeout'}= 400; # enough time create innodb tables
|
||||
$master->[1]=
|
||||
{
|
||||
path_myddir => "$opt_vardir/master1-data",
|
||||
path_myerr => "$opt_vardir/log/master1.err",
|
||||
path_mylog => "$opt_vardir/log/master1.log",
|
||||
path_mypid => "$opt_vardir/run/master1.pid",
|
||||
path_mysock => "$opt_tmpdir/master1.sock",
|
||||
path_myport => $opt_master_myport + 1,
|
||||
start_timeout => 400, # enough time create innodb tables
|
||||
};
|
||||
|
||||
$slave->[0]->{'path_myddir'}= "$opt_vardir/slave-data";
|
||||
$slave->[0]->{'path_myerr'}= "$opt_vardir/log/slave.err";
|
||||
$slave->[0]->{'path_mylog'}= "$opt_vardir/log/slave.log";
|
||||
$slave->[0]->{'path_mypid'}= "$opt_vardir/run/slave.pid";
|
||||
$slave->[0]->{'path_mysock'}= "$opt_tmpdir/slave.sock";
|
||||
$slave->[0]->{'path_myport'}= $opt_slave_myport;
|
||||
$slave->[0]->{'start_timeout'}= 400;
|
||||
$slave->[0]=
|
||||
{
|
||||
path_myddir => "$opt_vardir/slave-data",
|
||||
path_myerr => "$opt_vardir/log/slave.err",
|
||||
path_mylog => "$opt_vardir/log/slave.log",
|
||||
path_mypid => "$opt_vardir/run/slave.pid",
|
||||
path_mysock => "$opt_tmpdir/slave.sock",
|
||||
path_myport => $opt_slave_myport,
|
||||
start_timeout => 400,
|
||||
};
|
||||
|
||||
$slave->[1]->{'path_myddir'}= "$opt_vardir/slave1-data";
|
||||
$slave->[1]->{'path_myerr'}= "$opt_vardir/log/slave1.err";
|
||||
$slave->[1]->{'path_mylog'}= "$opt_vardir/log/slave1.log";
|
||||
$slave->[1]->{'path_mypid'}= "$opt_vardir/run/slave1.pid";
|
||||
$slave->[1]->{'path_mysock'}= "$opt_tmpdir/slave1.sock";
|
||||
$slave->[1]->{'path_myport'}= $opt_slave_myport + 1;
|
||||
$slave->[1]->{'start_timeout'}= 300;
|
||||
$slave->[1]=
|
||||
{
|
||||
path_myddir => "$opt_vardir/slave1-data",
|
||||
path_myerr => "$opt_vardir/log/slave1.err",
|
||||
path_mylog => "$opt_vardir/log/slave1.log",
|
||||
path_mypid => "$opt_vardir/run/slave1.pid",
|
||||
path_mysock => "$opt_tmpdir/slave1.sock",
|
||||
path_myport => $opt_slave_myport + 1,
|
||||
start_timeout => 300,
|
||||
};
|
||||
|
||||
$slave->[2]->{'path_myddir'}= "$opt_vardir/slave2-data";
|
||||
$slave->[2]->{'path_myerr'}= "$opt_vardir/log/slave2.err";
|
||||
$slave->[2]->{'path_mylog'}= "$opt_vardir/log/slave2.log";
|
||||
$slave->[2]->{'path_mypid'}= "$opt_vardir/run/slave2.pid";
|
||||
$slave->[2]->{'path_mysock'}= "$opt_tmpdir/slave2.sock";
|
||||
$slave->[2]->{'path_myport'}= $opt_slave_myport + 2;
|
||||
$slave->[2]->{'start_timeout'}= 300;
|
||||
$slave->[2]=
|
||||
{
|
||||
path_myddir => "$opt_vardir/slave2-data",
|
||||
path_myerr => "$opt_vardir/log/slave2.err",
|
||||
path_mylog => "$opt_vardir/log/slave2.log",
|
||||
path_mypid => "$opt_vardir/run/slave2.pid",
|
||||
path_mysock => "$opt_tmpdir/slave2.sock",
|
||||
path_myport => $opt_slave_myport + 2,
|
||||
start_timeout => 300,
|
||||
};
|
||||
|
||||
$instance_manager->{'path_err'}= "$opt_vardir/log/im.err";
|
||||
$instance_manager->{'path_log'}= "$opt_vardir/log/im.log";
|
||||
$instance_manager->{'path_pid'}= "$opt_vardir/run/im.pid";
|
||||
$instance_manager->{'path_sock'}= "$opt_tmpdir/im.sock";
|
||||
$instance_manager->{'port'}= $im_port;
|
||||
$instance_manager->{'start_timeout'}= $master->[0]->{'start_timeout'};
|
||||
$instance_manager->{'admin_login'}= 'im_admin';
|
||||
$instance_manager->{'admin_password'}= 'im_admin_secret';
|
||||
$instance_manager->{'admin_sha1'}= '*598D51AD2DFF7792045D6DF3DDF9AA1AF737B295';
|
||||
$instance_manager->{'password_file'}= "$opt_vardir/im.passwd";
|
||||
$instance_manager->{'defaults_file'}= "$opt_vardir/im.cnf";
|
||||
|
||||
$instance_manager->{'instances'}->[0]->{'server_id'}= 1;
|
||||
$instance_manager->{'instances'}->[0]->{'port'}= $im_mysqld1_port;
|
||||
$instance_manager->{'instances'}->[0]->{'path_datadir'}=
|
||||
"$opt_vardir/im_mysqld_1.data";
|
||||
$instance_manager->{'instances'}->[0]->{'path_sock'}=
|
||||
"$opt_vardir/mysqld_1.sock";
|
||||
$instance_manager->{'instances'}->[0]->{'path_pid'}=
|
||||
"$opt_vardir/mysqld_1.pid";
|
||||
$instance_manager=
|
||||
{
|
||||
path_err => "$opt_vardir/log/im.err",
|
||||
path_log => "$opt_vardir/log/im.log",
|
||||
path_pid => "$opt_vardir/run/im.pid",
|
||||
path_sock => "$opt_tmpdir/im.sock",
|
||||
port => $im_port,
|
||||
start_timeout => $master->[0]->{'start_timeout'},
|
||||
admin_login => 'im_admin',
|
||||
admin_password => 'im_admin_secret',
|
||||
admin_sha1 => '*598D51AD2DFF7792045D6DF3DDF9AA1AF737B295',
|
||||
password_file => "$opt_vardir/im.passwd",
|
||||
defaults_file => "$opt_vardir/im.cnf",
|
||||
};
|
||||
|
||||
$instance_manager->{'instances'}->[1]->{'server_id'}= 2;
|
||||
$instance_manager->{'instances'}->[1]->{'port'}= $im_mysqld2_port;
|
||||
$instance_manager->{'instances'}->[1]->{'path_datadir'}=
|
||||
"$opt_vardir/im_mysqld_2.data";
|
||||
$instance_manager->{'instances'}->[1]->{'path_sock'}=
|
||||
"$opt_vardir/mysqld_2.sock";
|
||||
$instance_manager->{'instances'}->[1]->{'path_pid'}=
|
||||
"$opt_vardir/mysqld_2.pid";
|
||||
$instance_manager->{'instances'}->[1]->{'nonguarded'}= 1;
|
||||
$instance_manager->{'instances'}->[0]=
|
||||
{
|
||||
server_id => 1,
|
||||
port => $im_mysqld1_port,
|
||||
path_datadir => "$opt_vardir/im_mysqld_1.data",
|
||||
path_sock => "$opt_vardir/mysqld_1.sock",
|
||||
path_pid => "$opt_vardir/mysqld_1.pid",
|
||||
};
|
||||
|
||||
$instance_manager->{'instances'}->[1]=
|
||||
{
|
||||
server_id => 2,
|
||||
port => $im_mysqld2_port,
|
||||
path_datadir => "$opt_vardir/im_mysqld_2.data",
|
||||
path_sock => "$opt_vardir/mysqld_2.sock",
|
||||
path_pid => "$opt_vardir/mysqld_2.pid",
|
||||
nonguarded => 1,
|
||||
};
|
||||
|
||||
if ( $opt_extern )
|
||||
{
|
||||
|
|
@ -854,7 +897,7 @@ sub executable_setup () {
|
|||
if ( $glob_use_embedded_server )
|
||||
{
|
||||
my $path_examples= "$glob_basedir/libmysqld/examples";
|
||||
$exe_mysqltest= mtr_exe_exists("$path_examples/mysqltest");
|
||||
$exe_mysqltest= mtr_exe_exists("$path_examples/mysqltest_embedded");
|
||||
$exe_mysql_client_test=
|
||||
mtr_exe_exists("$path_examples/mysql_client_test_embedded",
|
||||
"/usr/bin/false");
|
||||
|
|
@ -881,7 +924,6 @@ sub executable_setup () {
|
|||
else
|
||||
{
|
||||
$path_client_bindir= mtr_path_exists("$glob_basedir/bin");
|
||||
$exe_mysqltest= mtr_exe_exists("$path_client_bindir/mysqltest");
|
||||
$exe_mysqldump= mtr_exe_exists("$path_client_bindir/mysqldump");
|
||||
$exe_mysqlshow= mtr_exe_exists("$path_client_bindir/mysqlshow");
|
||||
$exe_mysqlbinlog= mtr_exe_exists("$path_client_bindir/mysqlbinlog");
|
||||
|
|
@ -975,10 +1017,14 @@ sub environment_setup () {
|
|||
# $ENV{'MYSQL_TCP_PORT'}= '@MYSQL_TCP_PORT@'; # FIXME
|
||||
$ENV{'MYSQL_TCP_PORT'}= 3306;
|
||||
|
||||
$ENV{'IM_PATH_PID'}= $instance_manager->{path_pid};
|
||||
|
||||
$ENV{'IM_MYSQLD1_SOCK'}= $instance_manager->{instances}->[0]->{path_sock};
|
||||
$ENV{'IM_MYSQLD1_PORT'}= $instance_manager->{instances}->[0]->{port};
|
||||
$ENV{'IM_MYSQLD1_PATH_PID'}=$instance_manager->{instances}->[0]->{path_pid};
|
||||
$ENV{'IM_MYSQLD2_SOCK'}= $instance_manager->{instances}->[1]->{path_sock};
|
||||
$ENV{'IM_MYSQLD2_PORT'}= $instance_manager->{instances}->[1]->{port};
|
||||
$ENV{'IM_MYSQLD2_PATH_PID'}=$instance_manager->{instances}->[1]->{path_pid};
|
||||
|
||||
if ( $glob_cygwin_perl )
|
||||
{
|
||||
|
|
@ -1883,7 +1929,7 @@ sub mysqld_arguments ($$$$$) {
|
|||
mtr_add_arg($args, "%s--language=%s", $prefix, $path_language);
|
||||
mtr_add_arg($args, "%s--tmpdir=$opt_tmpdir", $prefix);
|
||||
|
||||
if ( $opt_valgrind )
|
||||
if ( defined $opt_valgrind )
|
||||
{
|
||||
mtr_add_arg($args, "%s--skip-safemalloc", $prefix);
|
||||
mtr_add_arg($args, "%s--skip-bdb", $prefix);
|
||||
|
|
@ -2109,29 +2155,9 @@ sub mysqld_start ($$$$) {
|
|||
|
||||
mtr_init_args(\$args);
|
||||
|
||||
if ( $opt_valgrind )
|
||||
if ( defined $opt_valgrind )
|
||||
{
|
||||
|
||||
mtr_add_arg($args, "--tool=memcheck");
|
||||
mtr_add_arg($args, "--alignment=8");
|
||||
mtr_add_arg($args, "--leak-check=yes");
|
||||
mtr_add_arg($args, "--num-callers=16");
|
||||
|
||||
if ( $opt_valgrind_all )
|
||||
{
|
||||
mtr_add_arg($args, "-v");
|
||||
mtr_add_arg($args, "--show-reachable=yes");
|
||||
}
|
||||
|
||||
if ( $opt_valgrind_options )
|
||||
{
|
||||
# FIXME split earlier and put into @glob_valgrind_*
|
||||
mtr_add_arg($args, split(' ', $opt_valgrind_options));
|
||||
}
|
||||
|
||||
mtr_add_arg($args, $exe);
|
||||
|
||||
$exe= $opt_valgrind;
|
||||
valgrind_arguments($args, \$exe);
|
||||
}
|
||||
|
||||
mysqld_arguments($args,$type,$idx,$extra_opt,$slave_master_info);
|
||||
|
|
@ -2140,7 +2166,9 @@ sub mysqld_start ($$$$) {
|
|||
{
|
||||
if ( $pid= mtr_spawn($exe, $args, "",
|
||||
$master->[$idx]->{'path_myerr'},
|
||||
$master->[$idx]->{'path_myerr'}, "") )
|
||||
$master->[$idx]->{'path_myerr'},
|
||||
"",
|
||||
{ append_log_file => 1 }) )
|
||||
{
|
||||
return sleep_until_file_created($master->[$idx]->{'path_mypid'},
|
||||
$master->[$idx]->{'start_timeout'}, $pid);
|
||||
|
|
@ -2151,7 +2179,9 @@ sub mysqld_start ($$$$) {
|
|||
{
|
||||
if ( $pid= mtr_spawn($exe, $args, "",
|
||||
$slave->[$idx]->{'path_myerr'},
|
||||
$slave->[$idx]->{'path_myerr'}, "") )
|
||||
$slave->[$idx]->{'path_myerr'},
|
||||
"",
|
||||
{ append_log_file => 1 }) )
|
||||
{
|
||||
return sleep_until_file_created($slave->[$idx]->{'path_mypid'},
|
||||
$master->[$idx]->{'start_timeout'}, $pid);
|
||||
|
|
@ -2291,6 +2321,12 @@ sub im_stop($) {
|
|||
return;
|
||||
}
|
||||
|
||||
# Re-read pid from the file, since during tests Instance Manager could have
|
||||
# been restarted, so its pid could have been changed.
|
||||
|
||||
$instance_manager->{'pid'} =
|
||||
mtr_get_pid_from_file($instance_manager->{'path_pid'});
|
||||
|
||||
# Inspired from mtr_stop_mysqld_servers().
|
||||
|
||||
start_reap_all();
|
||||
|
|
@ -2403,6 +2439,11 @@ sub run_mysqltest ($) {
|
|||
|
||||
mtr_init_args(\$args);
|
||||
|
||||
if ( defined $opt_valgrind_mysqltest )
|
||||
{
|
||||
valgrind_arguments($args, \$exe);
|
||||
}
|
||||
|
||||
mtr_add_arg($args, "--no-defaults");
|
||||
mtr_add_arg($args, "--silent");
|
||||
mtr_add_arg($args, "-v");
|
||||
|
|
@ -2448,11 +2489,6 @@ sub run_mysqltest ($) {
|
|||
mtr_add_arg($args, "--big-test");
|
||||
}
|
||||
|
||||
if ( $opt_record )
|
||||
{
|
||||
mtr_add_arg($args, "--record");
|
||||
}
|
||||
|
||||
if ( $opt_compress )
|
||||
{
|
||||
mtr_add_arg($args, "--compress");
|
||||
|
|
@ -2478,9 +2514,6 @@ sub run_mysqltest ($) {
|
|||
$glob_mysql_test_dir);
|
||||
}
|
||||
|
||||
mtr_add_arg($args, "-R");
|
||||
mtr_add_arg($args, $tinfo->{'result_file'});
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# If embedded server, we create server args to give mysqltest to pass on
|
||||
# ----------------------------------------------------------------------
|
||||
|
|
@ -2495,9 +2528,51 @@ sub run_mysqltest ($) {
|
|||
# ----------------------------------------------------------------------
|
||||
$ENV{'MYSQL_TEST'}= "$exe_mysqltest " . join(" ", @$args);
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Add arguments that should not go into the MYSQL_TEST env var
|
||||
# ----------------------------------------------------------------------
|
||||
|
||||
mtr_add_arg($args, "-R");
|
||||
mtr_add_arg($args, $tinfo->{'result_file'});
|
||||
|
||||
if ( $opt_record )
|
||||
{
|
||||
mtr_add_arg($args, "--record");
|
||||
}
|
||||
|
||||
return mtr_run_test($exe,$args,$tinfo->{'path'},"",$path_timefile,"");
|
||||
}
|
||||
|
||||
|
||||
sub valgrind_arguments {
|
||||
my $args= shift;
|
||||
my $exe= shift;
|
||||
|
||||
mtr_add_arg($args, "--tool=memcheck"); # From >= 2.1.2 needs this option
|
||||
mtr_add_arg($args, "--alignment=8");
|
||||
mtr_add_arg($args, "--leak-check=yes");
|
||||
mtr_add_arg($args, "--num-callers=16");
|
||||
mtr_add_arg($args, "--suppressions=%s/valgrind.supp", $glob_mysql_test_dir)
|
||||
if -f "$glob_mysql_test_dir/valgrind.supp";
|
||||
|
||||
if ( defined $opt_valgrind_all )
|
||||
{
|
||||
mtr_add_arg($args, "-v");
|
||||
mtr_add_arg($args, "--show-reachable=yes");
|
||||
}
|
||||
|
||||
if ( $opt_valgrind_options )
|
||||
{
|
||||
# FIXME split earlier and put into @glob_valgrind_*
|
||||
mtr_add_arg($args, split(' ', $opt_valgrind_options));
|
||||
}
|
||||
|
||||
mtr_add_arg($args, $$exe);
|
||||
|
||||
$$exe= $opt_valgrind || "valgrind";
|
||||
}
|
||||
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
# Usage
|
||||
|
|
@ -2562,8 +2637,11 @@ Options for coverage, profiling etc
|
|||
|
||||
gcov FIXME
|
||||
gprof FIXME
|
||||
valgrind FIXME
|
||||
valgrind-all FIXME
|
||||
valgrind[=EXE] Run the "mysqltest" executable as well as the "mysqld"
|
||||
server using valgrind, optionally specifying the
|
||||
executable path/name
|
||||
valgrind-mysqltest[=EXE] In addition, run the "mysqltest" executable with valgrind
|
||||
valgrind-all[=EXE] Adds verbose flag, and --show-reachable to valgrind
|
||||
valgrind-options=ARGS Extra options to give valgrind
|
||||
|
||||
Misc options
|
||||
|
|
|
|||
|
|
@ -1429,10 +1429,10 @@ id select_type table type possible_keys key key_len ref rows Extra
|
|||
1 SIMPLE t1 range v v 13 NULL # Using where
|
||||
explain select count(*) from t1 where v between 'a' and 'a ';
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 range v v 13 NULL # Using where
|
||||
1 SIMPLE t1 ref v v 13 const # Using where
|
||||
explain select count(*) from t1 where v between 'a' and 'a ' and v between 'a ' and 'b\n';
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 range v v 13 NULL # Using where
|
||||
1 SIMPLE t1 ref v v 13 const # Using where
|
||||
alter table t1 add unique(v);
|
||||
ERROR 23000: Duplicate entry '{ ' for key 1
|
||||
alter table t1 add key(v);
|
||||
|
|
@ -1622,10 +1622,10 @@ id select_type table type possible_keys key key_len ref rows Extra
|
|||
1 SIMPLE t1 range v v 258 NULL # Using where
|
||||
explain select count(*) from t1 where v between 'a' and 'a ';
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 range v v 258 NULL # Using where
|
||||
1 SIMPLE t1 ref v v 258 const # Using where
|
||||
explain select count(*) from t1 where v between 'a' and 'a ' and v between 'a ' and 'b\n';
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 range v v 258 NULL # Using where
|
||||
1 SIMPLE t1 ref v v 258 const # Using where
|
||||
explain select * from t1 where v='a';
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 ref v v 258 const # Using where
|
||||
|
|
@ -1702,10 +1702,10 @@ id select_type table type possible_keys key key_len ref rows Extra
|
|||
1 SIMPLE t1 range v v 33 NULL # Using where
|
||||
explain select count(*) from t1 where v between 'a' and 'a ';
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 range v v 33 NULL # Using where
|
||||
1 SIMPLE t1 ref v v 33 const # Using where
|
||||
explain select count(*) from t1 where v between 'a' and 'a ' and v between 'a ' and 'b\n';
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 range v v 33 NULL # Using where
|
||||
1 SIMPLE t1 ref v v 33 const # Using where
|
||||
explain select * from t1 where v='a';
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 ref v v 33 const # Using where
|
||||
|
|
|
|||
|
|
@ -103,8 +103,8 @@ t1 CREATE TABLE `t1` (
|
|||
`c2` varchar(1) character set latin1 collate latin1_danish_ci NOT NULL default '',
|
||||
`c3` varbinary(1) NOT NULL default '',
|
||||
`c4` varbinary(1) NOT NULL default '',
|
||||
`c5` varbinary(4) NOT NULL default '',
|
||||
`c6` varbinary(4) NOT NULL default '',
|
||||
`c5` varbinary(3) NOT NULL default '',
|
||||
`c6` varbinary(3) NOT NULL default '',
|
||||
`c7` decimal(2,1) NOT NULL default '0.0',
|
||||
`c8` decimal(2,1) NOT NULL default '0.0',
|
||||
`c9` decimal(2,1) default NULL,
|
||||
|
|
@ -152,11 +152,11 @@ SHOW CREATE TABLE t1;
|
|||
Table Create Table
|
||||
t1 CREATE TABLE `t1` (
|
||||
`COALESCE(1)` int(1) NOT NULL default '0',
|
||||
`COALESCE(1.0)` decimal(2,1) NOT NULL default '0.0',
|
||||
`COALESCE(1.0)` decimal(2,1) unsigned NOT NULL default '0.0',
|
||||
`COALESCE('a')` varchar(1) NOT NULL default '',
|
||||
`COALESCE(1,1.0)` decimal(2,1) NOT NULL default '0.0',
|
||||
`COALESCE(1,'1')` varbinary(1) NOT NULL default '',
|
||||
`COALESCE(1.1,'1')` varbinary(4) NOT NULL default '',
|
||||
`COALESCE(1.1,'1')` varbinary(3) NOT NULL default '',
|
||||
`COALESCE('a' COLLATE latin1_bin,'b')` varchar(1) character set latin1 collate latin1_bin NOT NULL default ''
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||
DROP TABLE t1;
|
||||
|
|
|
|||
|
|
@ -74,6 +74,18 @@ CAST(DATE "2004-01-22 21:45:33" AS BINARY(4))
|
|||
2004
|
||||
Warnings:
|
||||
Warning 1292 Truncated incorrect CHAR(4) value: '2004-01-22 21:45:33'
|
||||
select CAST(0xb3 as signed);
|
||||
CAST(0xb3 as signed)
|
||||
179
|
||||
select CAST(0x8fffffffffffffff as signed);
|
||||
CAST(0x8fffffffffffffff as signed)
|
||||
-8070450532247928833
|
||||
select CAST(0xffffffffffffffff as unsigned);
|
||||
CAST(0xffffffffffffffff as unsigned)
|
||||
18446744073709551615
|
||||
select CAST(0xfffffffffffffffe as signed);
|
||||
CAST(0xfffffffffffffffe as signed)
|
||||
-2
|
||||
select cast('-10a' as signed integer);
|
||||
cast('-10a' as signed integer)
|
||||
-10
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq
|
|||
SET @@session.sql_mode=0;
|
||||
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
|
||||
insert into t2 values (@v);
|
||||
ROLLBACK;
|
||||
# End of log file
|
||||
ROLLBACK /* added by mysqlbinlog */;
|
||||
/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
|
||||
drop table t2;
|
||||
|
|
|
|||
|
|
@ -2271,3 +2271,33 @@ select c1 from t1 where c1 like 'abcde111%' order by c1;
|
|||
c1
|
||||
abcde111
|
||||
drop table t1;
|
||||
DROP TABLE IF EXISTS t1, t2;
|
||||
DROP PROCEDURE IF EXISTS sp1;
|
||||
set names ujis;
|
||||
set character_set_database = ujis;
|
||||
set character_set_server = ujis;
|
||||
CREATE TABLE t1(c1 char(2)) default charset = ujis;
|
||||
CREATE TABLE t2(c2 char(2)) default charset = ujis;
|
||||
INSERT INTO t1 VALUES(_ujis 0xA4A2);
|
||||
CREATE PROCEDURE sp1()
|
||||
BEGIN
|
||||
DECLARE a CHAR(1);
|
||||
DECLARE cur1 CURSOR FOR SELECT c1 FROM t1;
|
||||
OPEN cur1;
|
||||
FETCH cur1 INTO a;
|
||||
INSERT INTO t2 VALUES (a);
|
||||
CLOSE cur1;
|
||||
END|
|
||||
CALL sp1();
|
||||
SELECT c1,c2 FROM t1,t2;
|
||||
c1 c2
|
||||
¤¢ ¤¢
|
||||
SELECT hex(convert(_latin1 0xA4A2 using ujis)),hex(c2) FROM t1,t2;
|
||||
hex(convert(_latin1 0xA4A2 using ujis)) hex(c2)
|
||||
8FA2F0A1F1 A4A2
|
||||
DROP PROCEDURE sp1;
|
||||
DROP TABLE t1;
|
||||
DROP TABLE t2;
|
||||
set names default;
|
||||
set character_set_database=default;
|
||||
set character_set_server=default;
|
||||
|
|
|
|||
|
|
@ -1028,6 +1028,45 @@ xxx
|
|||
yyy
|
||||
DROP TABLE t1;
|
||||
set names utf8;
|
||||
select hex(char(1));
|
||||
hex(char(1))
|
||||
01
|
||||
select char(0xd1,0x8f);
|
||||
char(0xd1,0x8f)
|
||||
Ñ<EFBFBD>
|
||||
select char(0xd18f);
|
||||
char(0xd18f)
|
||||
Ñ<EFBFBD>
|
||||
select char(53647);
|
||||
char(53647)
|
||||
Ñ<EFBFBD>
|
||||
select char(0xff,0x8f);
|
||||
char(0xff,0x8f)
|
||||
ÿ<EFBFBD>
|
||||
Warnings:
|
||||
Warning 1300 Invalid utf8 character string: 'FF8F'
|
||||
set sql_mode=traditional;
|
||||
select char(0xff,0x8f);
|
||||
char(0xff,0x8f)
|
||||
NULL
|
||||
Warnings:
|
||||
Error 1300 Invalid utf8 character string: 'FF8F'
|
||||
select char(195);
|
||||
char(195)
|
||||
NULL
|
||||
Warnings:
|
||||
Error 1300 Invalid utf8 character string: 'C3'
|
||||
select char(196);
|
||||
char(196)
|
||||
NULL
|
||||
Warnings:
|
||||
Error 1300 Invalid utf8 character string: 'C4'
|
||||
select char(2557);
|
||||
char(2557)
|
||||
NULL
|
||||
Warnings:
|
||||
Error 1300 Invalid utf8 character string: 'FD'
|
||||
set names utf8;
|
||||
create table t1 (a char(1)) default character set utf8;
|
||||
create table t2 (a char(1)) default character set utf8;
|
||||
insert into t1 values('a'),('a'),(0xE38182),(0xE38182);
|
||||
|
|
|
|||
|
|
@ -29,38 +29,6 @@ z varchar(20) binary NOT NULL DEFAULT ' ',
|
|||
a1 varchar(30) binary NOT NULL DEFAULT ' ',
|
||||
b1 tinyblob NULL)
|
||||
ENGINE=InnoDB DEFAULT CHARACTER SET = latin1 COLLATE latin1_bin;
|
||||
SHOW CREATE TABLE t1;
|
||||
Table Create Table
|
||||
t1 CREATE TABLE `t1` (
|
||||
`a` varchar(30) collate latin1_bin NOT NULL default ' ',
|
||||
`b` varchar(1) collate latin1_bin NOT NULL default ' ',
|
||||
`c` varchar(4) collate latin1_bin NOT NULL default '0000',
|
||||
`d` tinyblob,
|
||||
`e` tinyblob,
|
||||
`f` tinyblob,
|
||||
`g` tinyblob,
|
||||
`h` tinyblob,
|
||||
`i` tinyblob,
|
||||
`j` tinyblob,
|
||||
`k` tinyblob,
|
||||
`l` tinyblob,
|
||||
`m` tinyblob,
|
||||
`n` tinyblob,
|
||||
`o` tinyblob,
|
||||
`p` tinyblob,
|
||||
`q` varchar(30) collate latin1_bin NOT NULL default ' ',
|
||||
`r` varchar(30) collate latin1_bin NOT NULL default ' ',
|
||||
`s` tinyblob,
|
||||
`t` varchar(4) collate latin1_bin NOT NULL default ' ',
|
||||
`u` varchar(1) collate latin1_bin NOT NULL default ' ',
|
||||
`v` varchar(30) collate latin1_bin NOT NULL default ' ',
|
||||
`w` varchar(30) collate latin1_bin NOT NULL default ' ',
|
||||
`x` tinyblob,
|
||||
`y` varchar(5) collate latin1_bin NOT NULL default ' ',
|
||||
`z` varchar(20) collate latin1_bin NOT NULL default ' ',
|
||||
`a1` varchar(30) collate latin1_bin NOT NULL default ' ',
|
||||
`b1` tinyblob
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_bin
|
||||
INSERT into t1 (b) values ('1');
|
||||
SHOW WARNINGS;
|
||||
Level Code Message
|
||||
|
|
|
|||
|
|
@ -368,3 +368,15 @@ create table t2 (a int);
|
|||
select * from (select * from t1,t2) foo;
|
||||
ERROR 42S21: Duplicate column name 'a'
|
||||
drop table t1,t2;
|
||||
create table t1 (ID int unsigned not null auto_increment,
|
||||
DATA varchar(5) not null, primary key (ID));
|
||||
create table t2 (ID int unsigned not null auto_increment,
|
||||
DATA varchar(5) not null, FID int unsigned not null,
|
||||
primary key (ID));
|
||||
select A.* from (t1 inner join (select * from t2) as A on t1.ID = A.FID);
|
||||
ID DATA FID
|
||||
select t2.* from ((select * from t1) as A inner join t2 on A.ID = t2.FID);
|
||||
ID DATA FID
|
||||
select t2.* from (select * from t1) as A inner join t2 on A.ID = t2.FID;
|
||||
ID DATA FID
|
||||
drop table t1, t2;
|
||||
|
|
|
|||
|
|
@ -1457,6 +1457,32 @@ federated.t1 repair status OK
|
|||
REPAIR TABLE federated.t1 USE_FRM;
|
||||
Table Op Msg_type Msg_text
|
||||
federated.t1 repair status OK
|
||||
DROP TABLE IF EXISTS federated.normal_table;
|
||||
CREATE TABLE federated.normal_table (
|
||||
`id` int(4) NOT NULL,
|
||||
`name` varchar(10) default NULL
|
||||
) DEFAULT CHARSET=latin1;
|
||||
DROP TABLE IF EXISTS federated.alter_me;
|
||||
CREATE TABLE federated.alter_me (
|
||||
`id` int(4) NOT NULL,
|
||||
`name` varchar(10) default NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE="FEDERATED" DEFAULT CHARSET=latin1
|
||||
CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/normal_table';
|
||||
INSERT INTO federated.alter_me (id, name) VALUES (1, 'Monty');
|
||||
INSERT INTO federated.alter_me (id, name) VALUES (2, 'David');
|
||||
SELECT * FROM federated.alter_me;
|
||||
id name
|
||||
1 Monty
|
||||
2 David
|
||||
ALTER TABLE federated.alter_me MODIFY COLUMN id int(16) NOT NULL;
|
||||
ERROR HY000: Table storage engine for 'alter_me' doesn't have this option
|
||||
SELECT * FROM federated.alter_me;
|
||||
id name
|
||||
1 Monty
|
||||
2 David
|
||||
DROP TABLE federated.alter_me;
|
||||
DROP TABLE federated.normal_table;
|
||||
DROP TABLE IF EXISTS federated.t1;
|
||||
DROP DATABASE IF EXISTS federated;
|
||||
DROP TABLE IF EXISTS federated.t1;
|
||||
|
|
|
|||
39
mysql-test/r/federated_bug_13118.result
Normal file
39
mysql-test/r/federated_bug_13118.result
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
stop slave;
|
||||
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
||||
reset master;
|
||||
reset slave;
|
||||
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
||||
start slave;
|
||||
stop slave;
|
||||
DROP DATABASE IF EXISTS federated;
|
||||
CREATE DATABASE federated;
|
||||
DROP DATABASE IF EXISTS federated;
|
||||
CREATE DATABASE federated;
|
||||
DROP TABLE IF EXISTS federated.bug_13118_table;
|
||||
CREATE TABLE federated.bug_13118_table (
|
||||
`foo` integer,
|
||||
`bar` integer
|
||||
);
|
||||
DROP TABLE IF EXISTS federated.t1;
|
||||
CREATE TABLE federated.t1 (
|
||||
`foo` integer,
|
||||
`bar` integer
|
||||
) ENGINE="FEDERATED"
|
||||
CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/bug_13118_table';
|
||||
SELECT * from federated.t1;
|
||||
foo bar
|
||||
INSERT INTO federated.t1 VALUES (1,1);
|
||||
SELECT * FROM federated.t1;
|
||||
foo bar
|
||||
1 1
|
||||
INSERT INTO federated.t1 VALUES (1,1);
|
||||
SELECT * FROM federated.t1;
|
||||
foo bar
|
||||
1 1
|
||||
1 1
|
||||
DROP TABLE federated.t1;
|
||||
DROP TABLE federated.bug_13118_table;
|
||||
DROP TABLE IF EXISTS federated.t1;
|
||||
DROP DATABASE IF EXISTS federated;
|
||||
DROP TABLE IF EXISTS federated.t1;
|
||||
DROP DATABASE IF EXISTS federated;
|
||||
|
|
@ -821,6 +821,142 @@ SELECT MAX(id) FROM t1 WHERE id < 3 AND a=2 AND b=6;
|
|||
MAX(id)
|
||||
NULL
|
||||
DROP TABLE t1;
|
||||
create table t1m (a int) engine=myisam;
|
||||
create table t1i (a int) engine=innodb;
|
||||
create table t2m (a int) engine=myisam;
|
||||
create table t2i (a int) engine=innodb;
|
||||
insert into t2m values (5);
|
||||
insert into t2i values (5);
|
||||
select min(a) from t1m;
|
||||
min(a)
|
||||
NULL
|
||||
select min(7) from t1m;
|
||||
min(7)
|
||||
NULL
|
||||
select min(7) from DUAL;
|
||||
min(7)
|
||||
NULL
|
||||
explain select min(7) from t2m join t1m;
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Select tables optimized away
|
||||
select min(7) from t2m join t1m;
|
||||
min(7)
|
||||
NULL
|
||||
select max(a) from t1m;
|
||||
max(a)
|
||||
NULL
|
||||
select max(7) from t1m;
|
||||
max(7)
|
||||
NULL
|
||||
select max(7) from DUAL;
|
||||
max(7)
|
||||
NULL
|
||||
explain select max(7) from t2m join t1m;
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Select tables optimized away
|
||||
select max(7) from t2m join t1m;
|
||||
max(7)
|
||||
NULL
|
||||
select 1, min(a) from t1m where a=99;
|
||||
1 min(a)
|
||||
1 NULL
|
||||
select 1, min(a) from t1m where 1=99;
|
||||
1 min(a)
|
||||
1 NULL
|
||||
select 1, min(1) from t1m where a=99;
|
||||
1 min(1)
|
||||
select 1, min(1) from t1m where 1=99;
|
||||
1 min(1)
|
||||
1 NULL
|
||||
select 1, max(a) from t1m where a=99;
|
||||
1 max(a)
|
||||
1 NULL
|
||||
select 1, max(a) from t1m where 1=99;
|
||||
1 max(a)
|
||||
1 NULL
|
||||
select 1, max(1) from t1m where a=99;
|
||||
1 max(1)
|
||||
select 1, max(1) from t1m where 1=99;
|
||||
1 max(1)
|
||||
1 NULL
|
||||
select min(a) from t1i;
|
||||
min(a)
|
||||
NULL
|
||||
select min(7) from t1i;
|
||||
min(7)
|
||||
NULL
|
||||
select min(7) from DUAL;
|
||||
min(7)
|
||||
NULL
|
||||
explain select min(7) from t2i join t1i;
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t2i ALL NULL NULL NULL NULL 1
|
||||
1 SIMPLE t1i ALL NULL NULL NULL NULL 1
|
||||
select min(7) from t2i join t1i;
|
||||
min(7)
|
||||
NULL
|
||||
select max(a) from t1i;
|
||||
max(a)
|
||||
NULL
|
||||
select max(7) from t1i;
|
||||
max(7)
|
||||
NULL
|
||||
select max(7) from DUAL;
|
||||
max(7)
|
||||
NULL
|
||||
explain select max(7) from t2i join t1i;
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t2i ALL NULL NULL NULL NULL 1
|
||||
1 SIMPLE t1i ALL NULL NULL NULL NULL 1
|
||||
select max(7) from t2i join t1i;
|
||||
max(7)
|
||||
NULL
|
||||
select 1, min(a) from t1i where a=99;
|
||||
1 min(a)
|
||||
1 NULL
|
||||
select 1, min(a) from t1i where 1=99;
|
||||
1 min(a)
|
||||
1 NULL
|
||||
select 1, min(1) from t1i where a=99;
|
||||
1 min(1)
|
||||
1 NULL
|
||||
select 1, min(1) from t1i where 1=99;
|
||||
1 min(1)
|
||||
1 NULL
|
||||
select 1, max(a) from t1i where a=99;
|
||||
1 max(a)
|
||||
1 NULL
|
||||
select 1, max(a) from t1i where 1=99;
|
||||
1 max(a)
|
||||
1 NULL
|
||||
select 1, max(1) from t1i where a=99;
|
||||
1 max(1)
|
||||
1 NULL
|
||||
select 1, max(1) from t1i where 1=99;
|
||||
1 max(1)
|
||||
1 NULL
|
||||
explain select count(*), min(7), max(7) from t1m, t1i;
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1m system NULL NULL NULL NULL 0 const row not found
|
||||
1 SIMPLE t1i ALL NULL NULL NULL NULL 1
|
||||
select count(*), min(7), max(7) from t1m, t1i;
|
||||
count(*) min(7) max(7)
|
||||
0 NULL NULL
|
||||
explain select count(*), min(7), max(7) from t1m, t2i;
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1m system NULL NULL NULL NULL 0 const row not found
|
||||
1 SIMPLE t2i ALL NULL NULL NULL NULL 1
|
||||
select count(*), min(7), max(7) from t1m, t2i;
|
||||
count(*) min(7) max(7)
|
||||
0 NULL NULL
|
||||
explain select count(*), min(7), max(7) from t2m, t1i;
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t2m system NULL NULL NULL NULL 1
|
||||
1 SIMPLE t1i ALL NULL NULL NULL NULL 1
|
||||
select count(*), min(7), max(7) from t2m, t1i;
|
||||
count(*) min(7) max(7)
|
||||
0 NULL NULL
|
||||
drop table t1m, t1i, t2m, t2i;
|
||||
create table t2 (ff double);
|
||||
insert into t2 values (2.2);
|
||||
select cast(sum(distinct ff) as decimal(5,2)) from t2;
|
||||
|
|
|
|||
|
|
@ -193,6 +193,15 @@ select * from t1 where a in (NULL, 'aa');
|
|||
a
|
||||
aa
|
||||
drop table t1;
|
||||
create table t1 (id int, key(id));
|
||||
insert into t1 values (1),(2),(3);
|
||||
select count(*) from t1 where id not in (1);
|
||||
count(*)
|
||||
2
|
||||
select count(*) from t1 where id not in (1,2);
|
||||
count(*)
|
||||
1
|
||||
drop table t1;
|
||||
CREATE TABLE t1 (a int PRIMARY KEY);
|
||||
INSERT INTO t1 VALUES (44), (45), (46);
|
||||
SELECT * FROM t1 WHERE a IN (45);
|
||||
|
|
|
|||
|
|
@ -1011,3 +1011,9 @@ t
|
|||
1000000
|
||||
1
|
||||
drop table t1;
|
||||
create table t1 (d decimal default null);
|
||||
insert into t1 values (null);
|
||||
select format(d, 2) from t1;
|
||||
format(d, 2)
|
||||
NULL
|
||||
drop table t1;
|
||||
|
|
|
|||
|
|
@ -1972,29 +1972,23 @@ a
|
|||
b
|
||||
c
|
||||
d
|
||||
create table bug12672 (
|
||||
create table t4 (
|
||||
pk_col int auto_increment primary key, a1 char(64), a2 char(64), b char(16), c char(16) not null, d char(16), dummy char(64) default ' '
|
||||
) engine=innodb;
|
||||
insert into bug12672 (a1, a2, b, c, d, dummy) select * from t1;
|
||||
create index idx12672_0 on bug12672 (a1);
|
||||
create index idx12672_1 on bug12672 (a1,a2,b,c);
|
||||
create index idx12672_2 on bug12672 (a1,a2,b);
|
||||
insert into t4 (a1, a2, b, c, d, dummy) select * from t1;
|
||||
create index idx12672_0 on t4 (a1);
|
||||
create index idx12672_1 on t4 (a1,a2,b,c);
|
||||
create index idx12672_2 on t4 (a1,a2,b);
|
||||
analyze table t1;
|
||||
Table Op Msg_type Msg_text
|
||||
test.t1 analyze status Table is already up to date
|
||||
explain select distinct a1 from bug12672 where pk_col not in (1,2,3,4);
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE bug12672 range PRIMARY PRIMARY 4 NULL # Using where; Using temporary
|
||||
select distinct a1 from bug12672 where pk_col not in (1,2,3,4);
|
||||
select distinct a1 from t4 where pk_col not in (1,2,3,4);
|
||||
a1
|
||||
a
|
||||
b
|
||||
c
|
||||
d
|
||||
drop table bug12672;
|
||||
drop table t1;
|
||||
drop table t2;
|
||||
drop table t3;
|
||||
drop table t1,t2,t3,t4;
|
||||
create table t1 (
|
||||
a varchar(30), b varchar(30), primary key(a), key(b)
|
||||
) engine=innodb;
|
||||
|
|
|
|||
|
|
@ -379,10 +379,10 @@ id select_type table type possible_keys key key_len ref rows Extra
|
|||
1 SIMPLE t1 ALL v NULL NULL NULL 271 Using where
|
||||
explain select count(*) from t1 where v between 'a' and 'a ';
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 ALL v NULL NULL NULL 271 Using where
|
||||
1 SIMPLE t1 ref v v 13 const 10 Using where
|
||||
explain select count(*) from t1 where v between 'a' and 'a ' and v between 'a ' and 'b\n';
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 ALL v NULL NULL NULL 271 Using where
|
||||
1 SIMPLE t1 ref v v 13 const 10 Using where
|
||||
alter table t1 add unique(v);
|
||||
ERROR 23000: Duplicate entry '{ ' for key 1
|
||||
select concat('*',v,'*',c,'*',t,'*') as qq from t1 where v='a' order by length(concat('*',v,'*',c,'*',t,'*'));
|
||||
|
|
@ -602,10 +602,10 @@ id select_type table type possible_keys key key_len ref rows Extra
|
|||
1 SIMPLE t1 range v v 13 NULL # Using where
|
||||
explain select count(*) from t1 where v between 'a' and 'a ';
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 range v v 13 NULL # Using where
|
||||
1 SIMPLE t1 ref v v 13 const # Using where
|
||||
explain select count(*) from t1 where v between 'a' and 'a ' and v between 'a ' and 'b\n';
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 range v v 13 NULL # Using where
|
||||
1 SIMPLE t1 ref v v 13 const # Using where
|
||||
alter table t1 add unique(v);
|
||||
ERROR 23000: Duplicate entry '{ ' for key 1
|
||||
select concat('*',v,'*',c,'*',t,'*') as qq from t1 where v='a' order by length(concat('*',v,'*',c,'*',t,'*'));
|
||||
|
|
|
|||
7
mysql-test/r/im_daemon_life_cycle.result
Normal file
7
mysql-test/r/im_daemon_life_cycle.result
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
SHOW INSTANCES;
|
||||
instance_name status
|
||||
mysqld1 online
|
||||
mysqld2 offline
|
||||
Killing the process...
|
||||
Sleeping...
|
||||
Success: the process was restarted.
|
||||
64
mysql-test/r/im_life_cycle.result
Normal file
64
mysql-test/r/im_life_cycle.result
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
SHOW INSTANCES;
|
||||
instance_name status
|
||||
mysqld1 online
|
||||
mysqld2 offline
|
||||
SHOW INSTANCE STATUS mysqld1;
|
||||
instance_name status version
|
||||
mysqld1 online VERSION
|
||||
SHOW INSTANCE STATUS mysqld2;
|
||||
instance_name status version
|
||||
mysqld2 offline VERSION
|
||||
START INSTANCE mysqld2;
|
||||
SHOW INSTANCES;
|
||||
instance_name status
|
||||
mysqld1 online
|
||||
mysqld2 online
|
||||
SHOW INSTANCE STATUS mysqld1;
|
||||
instance_name status version
|
||||
mysqld1 online VERSION
|
||||
SHOW INSTANCE STATUS mysqld2;
|
||||
instance_name status version
|
||||
mysqld2 online VERSION
|
||||
SHOW VARIABLES LIKE 'port';
|
||||
Variable_name Value
|
||||
port 9312
|
||||
STOP INSTANCE mysqld2;
|
||||
SHOW INSTANCES;
|
||||
instance_name status
|
||||
mysqld1 online
|
||||
mysqld2 offline
|
||||
SHOW INSTANCE STATUS mysqld1;
|
||||
instance_name status version
|
||||
mysqld1 online VERSION
|
||||
SHOW INSTANCE STATUS mysqld2;
|
||||
instance_name status version
|
||||
mysqld2 offline VERSION
|
||||
START INSTANCE mysqld3;
|
||||
ERROR HY000: Bad instance name. Check that the instance with such a name exists
|
||||
START INSTANCE mysqld1;
|
||||
ERROR HY000: The instance is already started
|
||||
STOP INSTANCE mysqld3;
|
||||
ERROR HY000: Bad instance name. Check that the instance with such a name exists
|
||||
SHOW INSTANCES;
|
||||
instance_name status
|
||||
mysqld1 online
|
||||
mysqld2 offline
|
||||
Killing the process...
|
||||
Sleeping...
|
||||
Success: the process was restarted.
|
||||
SHOW INSTANCES;
|
||||
instance_name status
|
||||
mysqld1 online
|
||||
mysqld2 offline
|
||||
START INSTANCE mysqld2;
|
||||
SHOW INSTANCES;
|
||||
instance_name status
|
||||
mysqld1 online
|
||||
mysqld2 online
|
||||
Killing the process...
|
||||
Sleeping...
|
||||
Success: the process was killed.
|
||||
SHOW INSTANCES;
|
||||
instance_name status
|
||||
mysqld1 online
|
||||
mysqld2 offline
|
||||
20
mysql-test/r/im_options_set.result
Normal file
20
mysql-test/r/im_options_set.result
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
server_id =1
|
||||
server_id =2
|
||||
SHOW VARIABLES LIKE 'server_id';
|
||||
Variable_name Value
|
||||
server_id 1
|
||||
SET mysqld1.server_id = 11;
|
||||
server_id =11
|
||||
server_id =2
|
||||
SHOW VARIABLES LIKE 'server_id';
|
||||
Variable_name Value
|
||||
server_id 1
|
||||
SET mysqld2.server_id = 12;
|
||||
server_id =11
|
||||
server_id =12
|
||||
FLUSH INSTANCES;
|
||||
server_id =11
|
||||
server_id =12
|
||||
SHOW VARIABLES LIKE 'server_id';
|
||||
Variable_name Value
|
||||
server_id 1
|
||||
15
mysql-test/r/im_options_unset.result
Normal file
15
mysql-test/r/im_options_unset.result
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
server_id =1
|
||||
server_id =2
|
||||
SHOW VARIABLES LIKE 'server_id';
|
||||
Variable_name Value
|
||||
server_id 1
|
||||
UNSET mysqld1.server_id;
|
||||
server_id =2
|
||||
SHOW VARIABLES LIKE 'server_id';
|
||||
Variable_name Value
|
||||
server_id 1
|
||||
UNSET mysqld2.server_id;
|
||||
FLUSH INSTANCES;
|
||||
SHOW VARIABLES LIKE 'server_id';
|
||||
Variable_name Value
|
||||
server_id 1
|
||||
91
mysql-test/r/im_utils.result
Normal file
91
mysql-test/r/im_utils.result
Normal file
|
|
@ -0,0 +1,91 @@
|
|||
SHOW INSTANCES;
|
||||
instance_name status
|
||||
mysqld1 online
|
||||
mysqld2 offline
|
||||
SHOW INSTANCE OPTIONS mysqld1;
|
||||
option_name value
|
||||
instance_name VALUE
|
||||
mysqld-path VALUE
|
||||
socket VALUE
|
||||
pid-file VALUE
|
||||
port VALUE
|
||||
datadir VALUE
|
||||
log VALUE
|
||||
log-error VALUE
|
||||
log-slow-queries VALUE
|
||||
language VALUE
|
||||
character-sets-dir VALUE
|
||||
basedir VALUE
|
||||
server_id VALUE
|
||||
skip-stack-trace VALUE
|
||||
skip-innodb VALUE
|
||||
skip-bdb VALUE
|
||||
skip-ndbcluster VALUE
|
||||
SHOW INSTANCE OPTIONS mysqld2;
|
||||
option_name value
|
||||
instance_name VALUE
|
||||
mysqld-path VALUE
|
||||
nonguarded VALUE
|
||||
socket VALUE
|
||||
pid-file VALUE
|
||||
port VALUE
|
||||
datadir VALUE
|
||||
log VALUE
|
||||
log-error VALUE
|
||||
log-slow-queries VALUE
|
||||
language VALUE
|
||||
character-sets-dir VALUE
|
||||
basedir VALUE
|
||||
server_id VALUE
|
||||
skip-stack-trace VALUE
|
||||
skip-innodb VALUE
|
||||
skip-bdb VALUE
|
||||
skip-ndbcluster VALUE
|
||||
START INSTANCE mysqld2;
|
||||
STOP INSTANCE mysqld2;
|
||||
SHOW mysqld1 LOG FILES;
|
||||
Logfile Path File size
|
||||
ERROR LOG PATH FILE_SIZE
|
||||
GENERAL LOG PATH FILE_SIZE
|
||||
SLOW LOG PATH FILE_SIZE
|
||||
SHOW mysqld2 LOG FILES;
|
||||
Logfile Path File size
|
||||
ERROR LOG PATH FILE_SIZE
|
||||
GENERAL LOG PATH FILE_SIZE
|
||||
SLOW LOG PATH FILE_SIZE
|
||||
SHOW mysqld1 LOG ERROR 10;
|
||||
Log
|
||||
LOG_DATA
|
||||
SHOW mysqld1 LOG SLOW 10;
|
||||
Log
|
||||
LOG_DATA
|
||||
SHOW mysqld1 LOG GENERAL 10;
|
||||
Log
|
||||
LOG_DATA
|
||||
SHOW mysqld1 LOG ERROR 10, 2;
|
||||
Log
|
||||
LOG_DATA
|
||||
SHOW mysqld1 LOG SLOW 10, 2;
|
||||
Log
|
||||
LOG_DATA
|
||||
SHOW mysqld1 LOG GENERAL 10, 2;
|
||||
Log
|
||||
LOG_DATA
|
||||
SHOW mysqld2 LOG ERROR 10;
|
||||
Log
|
||||
LOG_DATA
|
||||
SHOW mysqld2 LOG SLOW 10;
|
||||
Log
|
||||
LOG_DATA
|
||||
SHOW mysqld2 LOG GENERAL 10;
|
||||
Log
|
||||
LOG_DATA
|
||||
SHOW mysqld2 LOG ERROR 10, 2;
|
||||
Log
|
||||
LOG_DATA
|
||||
SHOW mysqld2 LOG SLOW 10, 2;
|
||||
Log
|
||||
LOG_DATA
|
||||
SHOW mysqld2 LOG GENERAL 10, 2;
|
||||
Log
|
||||
LOG_DATA
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
DROP TABLE IF EXISTS t0,t1,t2,t3,t5;
|
||||
DROP TABLE IF EXISTS t0,t1,t2,t3,t4,t5;
|
||||
DROP VIEW IF EXISTS v1;
|
||||
show variables where variable_name like "skip_show_database";
|
||||
Variable_name Value
|
||||
skip_show_database OFF
|
||||
|
|
@ -361,11 +362,11 @@ show keys from v4;
|
|||
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
|
||||
select * from information_schema.views where TABLE_NAME like "v%";
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE
|
||||
NULL test v0 select sql_no_cache `schemata`.`SCHEMA_NAME` AS `c` from `information_schema`.`schemata` NONE NO root@localhos DEFINER
|
||||
NULL test v1 select sql_no_cache `tables`.`TABLE_NAME` AS `c` from `information_schema`.`tables` where (`tables`.`TABLE_NAME` = _utf8'v1') NONE NO root@localhos DEFINER
|
||||
NULL test v2 select sql_no_cache `columns`.`COLUMN_NAME` AS `c` from `information_schema`.`columns` where (`columns`.`TABLE_NAME` = _utf8'v2') NONE NO root@localhos DEFINER
|
||||
NULL test v3 select sql_no_cache `character_sets`.`CHARACTER_SET_NAME` AS `c` from `information_schema`.`character_sets` where (`character_sets`.`CHARACTER_SET_NAME` like _utf8'latin1%') NONE NO root@localhos DEFINER
|
||||
NULL test v4 select sql_no_cache `collations`.`COLLATION_NAME` AS `c` from `information_schema`.`collations` where (`collations`.`COLLATION_NAME` like _utf8'latin1%') NONE NO root@localhos DEFINER
|
||||
NULL test v0 select sql_no_cache `schemata`.`SCHEMA_NAME` AS `c` from `information_schema`.`schemata` NONE NO root@localhost DEFINER
|
||||
NULL test v1 select sql_no_cache `tables`.`TABLE_NAME` AS `c` from `information_schema`.`tables` where (`tables`.`TABLE_NAME` = _utf8'v1') NONE NO root@localhost DEFINER
|
||||
NULL test v2 select sql_no_cache `columns`.`COLUMN_NAME` AS `c` from `information_schema`.`columns` where (`columns`.`TABLE_NAME` = _utf8'v2') NONE NO root@localhost DEFINER
|
||||
NULL test v3 select sql_no_cache `character_sets`.`CHARACTER_SET_NAME` AS `c` from `information_schema`.`character_sets` where (`character_sets`.`CHARACTER_SET_NAME` like _utf8'latin1%') NONE NO root@localhost DEFINER
|
||||
NULL test v4 select sql_no_cache `collations`.`COLLATION_NAME` AS `c` from `information_schema`.`collations` where (`collations`.`COLLATION_NAME` like _utf8'latin1%') NONE NO root@localhost DEFINER
|
||||
drop view v0, v1, v2, v3, v4;
|
||||
create table t1 (a int);
|
||||
grant select,update,insert on t1 to mysqltest_1@localhost;
|
||||
|
|
@ -456,9 +457,9 @@ create view v2 (c) as select a from t1 WITH LOCAL CHECK OPTION;
|
|||
create view v3 (c) as select a from t1 WITH CASCADED CHECK OPTION;
|
||||
select * from information_schema.views;
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE
|
||||
NULL test v1 select `test`.`t1`.`a` AS `c` from `test`.`t1` CASCADED YES root@localhos DEFINER
|
||||
NULL test v2 select `test`.`t1`.`a` AS `c` from `test`.`t1` LOCAL YES root@localhos DEFINER
|
||||
NULL test v3 select `test`.`t1`.`a` AS `c` from `test`.`t1` CASCADED YES root@localhos DEFINER
|
||||
NULL test v1 select `test`.`t1`.`a` AS `c` from `test`.`t1` CASCADED YES root@localhost DEFINER
|
||||
NULL test v2 select `test`.`t1`.`a` AS `c` from `test`.`t1` LOCAL YES root@localhost DEFINER
|
||||
NULL test v3 select `test`.`t1`.`a` AS `c` from `test`.`t1` CASCADED YES root@localhost DEFINER
|
||||
grant select (a) on test.t1 to joe@localhost with grant option;
|
||||
select * from INFORMATION_SCHEMA.COLUMN_PRIVILEGES;
|
||||
GRANTEE TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME PRIVILEGE_TYPE IS_GRANTABLE
|
||||
|
|
@ -638,8 +639,8 @@ use test;
|
|||
create function sub1(i int) returns int
|
||||
return i+1;
|
||||
create table t1(f1 int);
|
||||
create view t2 (c) as select f1 from t1;
|
||||
create view t3 (c) as select sub1(1);
|
||||
create view v2 (c) as select f1 from t1;
|
||||
create view v3 (c) as select sub1(1);
|
||||
create table t4(f1 int, KEY f1_key (f1));
|
||||
drop table t1;
|
||||
drop function sub1;
|
||||
|
|
@ -647,29 +648,29 @@ select table_name from information_schema.views
|
|||
where table_schema='test';
|
||||
table_name
|
||||
Warnings:
|
||||
Warning 1356 View 'test.t2' references invalid table(s) or column(s) or function(s)
|
||||
Warning 1356 View 'test.t3' references invalid table(s) or column(s) or function(s)
|
||||
Warning 1356 View 'test.v2' references invalid table(s) or column(s) or function(s)
|
||||
Warning 1356 View 'test.v3' references invalid table(s) or column(s) or function(s)
|
||||
select table_name from information_schema.views
|
||||
where table_schema='test';
|
||||
table_name
|
||||
Warnings:
|
||||
Warning 1356 View 'test.t2' references invalid table(s) or column(s) or function(s)
|
||||
Warning 1356 View 'test.t3' references invalid table(s) or column(s) or function(s)
|
||||
Warning 1356 View 'test.v2' references invalid table(s) or column(s) or function(s)
|
||||
Warning 1356 View 'test.v3' references invalid table(s) or column(s) or function(s)
|
||||
select column_name from information_schema.columns
|
||||
where table_schema='test';
|
||||
column_name
|
||||
f1
|
||||
Warnings:
|
||||
Warning 1356 View 'test.t2' references invalid table(s) or column(s) or function(s)
|
||||
Warning 1356 View 'test.t3' references invalid table(s) or column(s) or function(s)
|
||||
Warning 1356 View 'test.v2' references invalid table(s) or column(s) or function(s)
|
||||
Warning 1356 View 'test.v3' references invalid table(s) or column(s) or function(s)
|
||||
select index_name from information_schema.statistics where table_schema='test';
|
||||
index_name
|
||||
f1_key
|
||||
select constraint_name from information_schema.table_constraints
|
||||
where table_schema='test';
|
||||
constraint_name
|
||||
drop view t2;
|
||||
drop view t3;
|
||||
drop view v2;
|
||||
drop view v3;
|
||||
drop table t4;
|
||||
select * from information_schema.table_names;
|
||||
ERROR 42S02: Unknown table 'table_names' in information_schema
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue