Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
585f5b28
Commit
585f5b28
authored
18 years ago
by
knielsen@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-5.1-new
into mysql.com:/usr/local/mysql/tmp5.1
parents
996f4a3c
c9c276d9
Changes
17
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
1149 additions
and
79 deletions
+1149
-79
VC++Files/mysql.sln
VC++Files/mysql.sln
+92
-10
VC++Files/mysqlbinlog/mysqlbinlog.vcproj
VC++Files/mysqlbinlog/mysqlbinlog.vcproj
+135
-0
VC++Files/mysqldemb/mysqldemb.vcproj
VC++Files/mysqldemb/mysqldemb.vcproj
+3
-3
VC++Files/mysys/mysys.vcproj
VC++Files/mysys/mysys.vcproj
+87
-0
VC++Files/sql/mysqld.vcproj
VC++Files/sql/mysqld.vcproj
+229
-3
VC++Files/storage/archive/archive.vcproj
VC++Files/storage/archive/archive.vcproj
+257
-0
VC++Files/storage/example/example.vcproj
VC++Files/storage/example/example.vcproj
+257
-0
include/config-win.h
include/config-win.h
+3
-0
scripts/make_win_src_distribution.sh
scripts/make_win_src_distribution.sh
+1
-1
sql/log.cc
sql/log.cc
+13
-13
sql/log_event.cc
sql/log_event.cc
+1
-1
sql/mysql_priv.h
sql/mysql_priv.h
+2
-2
sql/sql_delete.cc
sql/sql_delete.cc
+8
-8
sql/sql_parse.cc
sql/sql_parse.cc
+31
-16
sql/table.cc
sql/table.cc
+2
-2
storage/archive/azio.c
storage/archive/azio.c
+10
-2
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
+18
-18
No files found.
VC++Files/mysql.sln
View file @
585f5b28
This diff is collapsed.
Click to expand it.
VC++Files/mysqlbinlog/mysqlbinlog.vcproj
View file @
585f5b28
...
@@ -229,6 +229,141 @@
...
@@ -229,6 +229,141 @@
PreprocessorDefinitions=
""
/>
PreprocessorDefinitions=
""
/>
</FileConfiguration>
</FileConfiguration>
</File>
</File>
<File
RelativePath=
"..\mysys\my_new.cpp"
>
<FileConfiguration
Name=
"Debug|Win32"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"0"
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=
"..\mysys\my_bit.c"
>
<FileConfiguration
Name=
"Debug|Win32"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"0"
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=
"..\mysys\my_bitmap.c"
>
<FileConfiguration
Name=
"Debug|Win32"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"0"
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=
"..\mysys\my_vle.c"
>
<FileConfiguration
Name=
"Debug|Win32"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"0"
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=
"..\mysys\base64.c"
>
<FileConfiguration
Name=
"Debug|Win32"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"0"
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
<File
RelativePath=
"..\client\mysqlbinlog.cpp"
>
RelativePath=
"..\client\mysqlbinlog.cpp"
>
<FileConfiguration
<FileConfiguration
...
...
This diff is collapsed.
Click to expand it.
VC++Files/mysqldemb/mysqldemb.vcproj
View file @
585f5b28
...
@@ -75,7 +75,7 @@
...
@@ -75,7 +75,7 @@
Optimization=
"2"
Optimization=
"2"
InlineFunctionExpansion=
"1"
InlineFunctionExpansion=
"1"
AdditionalIncludeDirectories=
"../include,../regex,../libmysqld,../sql,../zlib"
AdditionalIncludeDirectories=
"../include,../regex,../libmysqld,../sql,../zlib"
PreprocessorDefinitions=
"WIN32;_LIB;SIGNAL_WITH_VIO_CLOSE;EMBEDDED_LIBRARY;USE_TLS;__WIN__;USE_SYMDIR;MYSQL_SERVER;LICENSE=Commercial;HAVE_DLOPEN;HAVE_INNOBASE_DB;DBUG_OFF;NDEBUG;_WINDOWS;_CONSOLE;WITH_INNOBASE_STORAGE_ENGINE"
PreprocessorDefinitions=
"WIN32;_LIB;SIGNAL_WITH_VIO_CLOSE;EMBEDDED_LIBRARY;USE_TLS;__WIN__;USE_SYMDIR;MYSQL_SERVER;LICENSE=Commercial;HAVE_DLOPEN;HAVE_INNOBASE_DB;DBUG_OFF;NDEBUG;_WINDOWS;_CONSOLE;WITH_INNOBASE_STORAGE_ENGINE
;HAVE_ROW_BASED_REPLICATION
"
StringPooling=
"TRUE"
StringPooling=
"TRUE"
RuntimeLibrary=
"0"
RuntimeLibrary=
"0"
EnableFunctionLevelLinking=
"TRUE"
EnableFunctionLevelLinking=
"TRUE"
...
@@ -125,7 +125,7 @@
...
@@ -125,7 +125,7 @@
Name=
"VCCLCompilerTool"
Name=
"VCCLCompilerTool"
Optimization=
"0"
Optimization=
"0"
AdditionalIncludeDirectories=
"../zlib,../include,../regex,../libmysqld,../sql,../storage/bdb/build_win32"
AdditionalIncludeDirectories=
"../zlib,../include,../regex,../libmysqld,../sql,../storage/bdb/build_win32"
PreprocessorDefinitions=
"WIN32;_DEBUG;_LIB;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;MYSQL_SERVER;HAVE_INNOBASE_DB;USE_TLS;__WIN__;WITH_INNOBASE_STORAGE_ENGINE"
PreprocessorDefinitions=
"WIN32;_DEBUG;_LIB;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;MYSQL_SERVER;HAVE_INNOBASE_DB;USE_TLS;__WIN__;WITH_INNOBASE_STORAGE_ENGINE
;HAVE_ROW_BASED_REPLICATION
"
BasicRuntimeChecks=
"3"
BasicRuntimeChecks=
"3"
RuntimeLibrary=
"1"
RuntimeLibrary=
"1"
PrecompiledHeaderFile=
".\Debug/mysqldemb.pch"
PrecompiledHeaderFile=
".\Debug/mysqldemb.pch"
...
@@ -176,7 +176,7 @@
...
@@ -176,7 +176,7 @@
Optimization=
"2"
Optimization=
"2"
InlineFunctionExpansion=
"1"
InlineFunctionExpansion=
"1"
AdditionalIncludeDirectories=
"../include,../regex,../libmysqld,../sql,../storage/bdb/build_win32,../zlib"
AdditionalIncludeDirectories=
"../include,../regex,../libmysqld,../sql,../storage/bdb/build_win32,../zlib"
PreprocessorDefinitions=
"WIN32;NDEBUG;_LIB;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;MYSQL_SERVER;HAVE_INNOBASE_DB;DBUG_OFF;USE_TLS;__WIN__;WITH_INNOBASE_STORAGE_ENGINE"
PreprocessorDefinitions=
"WIN32;NDEBUG;_LIB;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;MYSQL_SERVER;HAVE_INNOBASE_DB;DBUG_OFF;USE_TLS;__WIN__;WITH_INNOBASE_STORAGE_ENGINE
;HAVE_ROW_BASED_REPLICATION
"
StringPooling=
"TRUE"
StringPooling=
"TRUE"
RuntimeLibrary=
"0"
RuntimeLibrary=
"0"
EnableFunctionLevelLinking=
"TRUE"
EnableFunctionLevelLinking=
"TRUE"
...
...
This diff is collapsed.
Click to expand it.
VC++Files/mysys/mysys.vcproj
View file @
585f5b28
...
@@ -305,6 +305,50 @@
...
@@ -305,6 +305,50 @@
PreprocessorDefinitions=
""
/>
PreprocessorDefinitions=
""
/>
</FileConfiguration>
</FileConfiguration>
</File>
</File>
<File
RelativePath=
"base64.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=
""
BrowseInformation=
"1"
/>
</FileConfiguration>
<FileConfiguration
Name=
"TLS|Win32"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"2"
AdditionalIncludeDirectories=
""
PreprocessorDefinitions=
""
/>
</FileConfiguration>
</File>
<File
<File
RelativePath=
"charset-def.c"
>
RelativePath=
"charset-def.c"
>
<FileConfiguration
<FileConfiguration
...
@@ -4267,6 +4311,49 @@
...
@@ -4267,6 +4311,49 @@
PreprocessorDefinitions=
""
/>
PreprocessorDefinitions=
""
/>
</FileConfiguration>
</FileConfiguration>
</File>
</File>
<File
RelativePath=
"my_vle.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
<File
RelativePath=
"mysys_priv.h"
>
RelativePath=
"mysys_priv.h"
>
</File>
</File>
...
...
This diff is collapsed.
Click to expand it.
VC++Files/sql/mysqld.vcproj
View file @
585f5b28
...
@@ -87,7 +87,7 @@
...
@@ -87,7 +87,7 @@
InlineFunctionExpansion=
"1"
InlineFunctionExpansion=
"1"
OptimizeForProcessor=
"2"
OptimizeForProcessor=
"2"
AdditionalIncludeDirectories=
"../storage/bdb/build_win32,../include,../regex,../extra/yassl/include,../zlib"
AdditionalIncludeDirectories=
"../storage/bdb/build_win32,../include,../regex,../extra/yassl/include,../zlib"
PreprocessorDefinitions=
"NDEBUG;DBUG_OFF;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN;WITH_INNOBASE_STORAGE_ENGINE;WITH_BERKELEY_STORAGE_ENGINE;WITH_ARCHIVE_STORAGE_ENGINE;WITH_BLACKHOLE_STORAGE_ENGINE;WITH_EXAMPLE_STORAGE_ENGINE;WITH_FEDERATED_STORAGE_ENGINE;WITH_PARTITION_STORAGE_ENGINE"
PreprocessorDefinitions=
"NDEBUG;DBUG_OFF;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN;WITH_INNOBASE_STORAGE_ENGINE;WITH_BERKELEY_STORAGE_ENGINE;WITH_ARCHIVE_STORAGE_ENGINE;WITH_BLACKHOLE_STORAGE_ENGINE;WITH_EXAMPLE_STORAGE_ENGINE;WITH_FEDERATED_STORAGE_ENGINE;WITH_PARTITION_STORAGE_ENGINE
;HAVE_ROW_BASED_REPLICATION
"
StringPooling=
"TRUE"
StringPooling=
"TRUE"
RuntimeLibrary=
"0"
RuntimeLibrary=
"0"
EnableFunctionLevelLinking=
"TRUE"
EnableFunctionLevelLinking=
"TRUE"
...
@@ -148,7 +148,7 @@
...
@@ -148,7 +148,7 @@
InlineFunctionExpansion=
"1"
InlineFunctionExpansion=
"1"
OptimizeForProcessor=
"2"
OptimizeForProcessor=
"2"
AdditionalIncludeDirectories=
"../storage/bdb/build_win32,../include,../regex,../extra/yassl/include,../zlib"
AdditionalIncludeDirectories=
"../storage/bdb/build_win32,../include,../regex,../extra/yassl/include,../zlib"
PreprocessorDefinitions=
"NDEBUG;__NT__;DBUG_OFF;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN;WITH_INNOBASE_STORAGE_ENGINE;WITH_BERKELEY_STORAGE_ENGINE;WITH_ARCHIVE_STORAGE_ENGINE;WITH_BLACKHOLE_STORAGE_ENGINE;WITH_EXAMPLE_STORAGE_ENGINE;WITH_FEDERATED_STORAGE_ENGINE;WITH_PARTITION_STORAGE_ENGINE"
PreprocessorDefinitions=
"NDEBUG;__NT__;DBUG_OFF;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN;WITH_INNOBASE_STORAGE_ENGINE;WITH_BERKELEY_STORAGE_ENGINE;WITH_ARCHIVE_STORAGE_ENGINE;WITH_BLACKHOLE_STORAGE_ENGINE;WITH_EXAMPLE_STORAGE_ENGINE;WITH_FEDERATED_STORAGE_ENGINE;WITH_PARTITION_STORAGE_ENGINE
;HAVE_ROW_BASED_REPLICATION
"
StringPooling=
"TRUE"
StringPooling=
"TRUE"
RuntimeLibrary=
"0"
RuntimeLibrary=
"0"
EnableFunctionLevelLinking=
"TRUE"
EnableFunctionLevelLinking=
"TRUE"
...
@@ -336,7 +336,7 @@
...
@@ -336,7 +336,7 @@
Optimization=
"0"
Optimization=
"0"
OptimizeForProcessor=
"2"
OptimizeForProcessor=
"2"
AdditionalIncludeDirectories=
"../storage/bdb/build_win32,../include,../regex,../extra/yassl/include,../zlib"
AdditionalIncludeDirectories=
"../storage/bdb/build_win32,../include,../regex,../extra/yassl/include,../zlib"
PreprocessorDefinitions=
"_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN;WITH_INNOBASE_STORAGE_ENGINE;WITH_BERKELEY_STORAGE_ENGINE;WITH_ARCHIVE_STORAGE_ENGINE;WITH_BLACKHOLE_STORAGE_ENGINE;WITH_EXAMPLE_STORAGE_ENGINE;WITH_FEDERATED_STORAGE_ENGINE;WITH_PARTITION_STORAGE_ENGINE"
PreprocessorDefinitions=
"_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN;WITH_INNOBASE_STORAGE_ENGINE;WITH_BERKELEY_STORAGE_ENGINE;WITH_ARCHIVE_STORAGE_ENGINE;WITH_BLACKHOLE_STORAGE_ENGINE;WITH_EXAMPLE_STORAGE_ENGINE;WITH_FEDERATED_STORAGE_ENGINE;WITH_PARTITION_STORAGE_ENGINE
;HAVE_ROW_BASED_REPLICATION
"
RuntimeLibrary=
"1"
RuntimeLibrary=
"1"
PrecompiledHeaderFile=
".\debug/mysqld.pch"
PrecompiledHeaderFile=
".\debug/mysqld.pch"
AssemblerListingLocation=
".\debug/"
AssemblerListingLocation=
".\debug/"
...
@@ -3242,6 +3242,82 @@
...
@@ -3242,6 +3242,82 @@
PreprocessorDefinitions=
""
/>
PreprocessorDefinitions=
""
/>
</FileConfiguration>
</FileConfiguration>
</File>
</File>
<File
RelativePath=
"item_xmlfunc.cpp"
>
<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"
OptimizeForProcessor=
"1"
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
<File
RelativePath=
"key.cpp"
>
RelativePath=
"key.cpp"
>
<FileConfiguration
<FileConfiguration
...
@@ -4907,6 +4983,81 @@
...
@@ -4907,6 +4983,81 @@
PreprocessorDefinitions=
""
/>
PreprocessorDefinitions=
""
/>
</FileConfiguration>
</FileConfiguration>
</File>
</File>
<File
RelativePath=
"rpl_tblmap.cpp"
>
<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
<File
RelativePath=
"set_var.cpp"
>
RelativePath=
"set_var.cpp"
>
<FileConfiguration
<FileConfiguration
...
@@ -8306,6 +8457,81 @@
...
@@ -8306,6 +8457,81 @@
PreprocessorDefinitions=
""
/>
PreprocessorDefinitions=
""
/>
</FileConfiguration>
</FileConfiguration>
</File>
</File>
<File
RelativePath=
"sql_binlog.cpp"
>
<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
<File
RelativePath=
"sql_yacc.cpp"
>
RelativePath=
"sql_yacc.cpp"
>
<FileConfiguration
<FileConfiguration
...
...
This diff is collapsed.
Click to expand it.
VC++Files/storage/archive/archive.vcproj
0 → 100644
View file @
585f5b28
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType=
"Visual C++"
Version=
"7.10"
Name=
"archive"
ProjectGUID=
"{4471CADD-737B-4ad7-A108-2FBAA1C4B03B}"
SccProjectName=
""
SccLocalPath=
""
>
<Platforms>
<Platform
Name=
"Win32"
/>
</Platforms>
<Configurations>
<Configuration
Name=
"Release|Win32"
OutputDirectory=
".\release"
IntermediateDirectory=
".\release"
ConfigurationType=
"4"
UseOfMFC=
"0"
ATLMinimizesCRunTimeLibraryUsage=
"FALSE"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"2"
InlineFunctionExpansion=
"1"
OptimizeForProcessor=
"2"
AdditionalIncludeDirectories=
"../../zlib,../../include"
PreprocessorDefinitions=
"DBUG_OFF;_WINDOWS;NDEBUG"
StringPooling=
"TRUE"
RuntimeLibrary=
"0"
EnableFunctionLevelLinking=
"TRUE"
PrecompiledHeaderFile=
".\release/archive.pch"
AssemblerListingLocation=
".\release/"
ObjectFile=
".\release/"
ProgramDataBaseFileName=
".\release/"
WarningLevel=
"3"
SuppressStartupBanner=
"TRUE"
CompileAs=
"0"
/>
<Tool
Name=
"VCCustomBuildTool"
/>
<Tool
Name=
"VCLibrarianTool"
OutputFile=
"..\lib_release\archive.lib"
SuppressStartupBanner=
"TRUE"
/>
<Tool
Name=
"VCMIDLTool"
/>
<Tool
Name=
"VCPostBuildEventTool"
/>
<Tool
Name=
"VCPreBuildEventTool"
/>
<Tool
Name=
"VCPreLinkEventTool"
/>
<Tool
Name=
"VCResourceCompilerTool"
Culture=
"1033"
/>
<Tool
Name=
"VCWebServiceProxyGeneratorTool"
/>
<Tool
Name=
"VCXMLDataGeneratorTool"
/>
<Tool
Name=
"VCManagedWrapperGeneratorTool"
/>
<Tool
Name=
"VCAuxiliaryManagedWrapperGeneratorTool"
/>
</Configuration>
<Configuration
Name=
"TLS_DEBUG|Win32"
OutputDirectory=
".\archive___Win32_TLS_DEBUG"
IntermediateDirectory=
".\archive___Win32_TLS_DEBUG"
ConfigurationType=
"4"
UseOfMFC=
"0"
ATLMinimizesCRunTimeLibraryUsage=
"FALSE"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"0"
OptimizeForProcessor=
"2"
AdditionalIncludeDirectories=
"../../zlib,../../include"
PreprocessorDefinitions=
"_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_TLS"
StringPooling=
"TRUE"
RuntimeLibrary=
"1"
PrecompiledHeaderFile=
".\archive___Win32_TLS_DEBUG/archive.pch"
AssemblerListingLocation=
".\archive___Win32_TLS_DEBUG/"
ObjectFile=
".\archive___Win32_TLS_DEBUG/"
ProgramDataBaseFileName=
".\archive___Win32_TLS_DEBUG/"
WarningLevel=
"3"
SuppressStartupBanner=
"TRUE"
DebugInformationFormat=
"1"
CompileAs=
"0"
/>
<Tool
Name=
"VCCustomBuildTool"
/>
<Tool
Name=
"VCLibrarianTool"
OutputFile=
"..\lib_debug\archive_tls.lib"
SuppressStartupBanner=
"TRUE"
/>
<Tool
Name=
"VCMIDLTool"
/>
<Tool
Name=
"VCPostBuildEventTool"
/>
<Tool
Name=
"VCPreBuildEventTool"
/>
<Tool
Name=
"VCPreLinkEventTool"
/>
<Tool
Name=
"VCResourceCompilerTool"
Culture=
"1033"
/>
<Tool
Name=
"VCWebServiceProxyGeneratorTool"
/>
<Tool
Name=
"VCXMLDataGeneratorTool"
/>
<Tool
Name=
"VCManagedWrapperGeneratorTool"
/>
<Tool
Name=
"VCAuxiliaryManagedWrapperGeneratorTool"
/>
</Configuration>
<Configuration
Name=
"TLS|Win32"
OutputDirectory=
".\archive___Win32_TLS"
IntermediateDirectory=
".\archive___Win32_TLS"
ConfigurationType=
"4"
UseOfMFC=
"0"
ATLMinimizesCRunTimeLibraryUsage=
"FALSE"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"2"
InlineFunctionExpansion=
"1"
OptimizeForProcessor=
"2"
AdditionalIncludeDirectories=
"../../zlib,../../include"
PreprocessorDefinitions=
"DBUG_OFF;_WINDOWS;NDEBUG;USE_TLS"
StringPooling=
"TRUE"
RuntimeLibrary=
"0"
EnableFunctionLevelLinking=
"TRUE"
PrecompiledHeaderFile=
".\archive___Win32_TLS/archive.pch"
AssemblerListingLocation=
".\archive___Win32_TLS/"
ObjectFile=
".\archive___Win32_TLS/"
ProgramDataBaseFileName=
".\archive___Win32_TLS/"
WarningLevel=
"3"
SuppressStartupBanner=
"TRUE"
CompileAs=
"0"
/>
<Tool
Name=
"VCCustomBuildTool"
/>
<Tool
Name=
"VCLibrarianTool"
OutputFile=
"..\lib_release\archive_tls.lib"
SuppressStartupBanner=
"TRUE"
/>
<Tool
Name=
"VCMIDLTool"
/>
<Tool
Name=
"VCPostBuildEventTool"
/>
<Tool
Name=
"VCPreBuildEventTool"
/>
<Tool
Name=
"VCPreLinkEventTool"
/>
<Tool
Name=
"VCResourceCompilerTool"
Culture=
"1033"
/>
<Tool
Name=
"VCWebServiceProxyGeneratorTool"
/>
<Tool
Name=
"VCXMLDataGeneratorTool"
/>
<Tool
Name=
"VCManagedWrapperGeneratorTool"
/>
<Tool
Name=
"VCAuxiliaryManagedWrapperGeneratorTool"
/>
</Configuration>
<Configuration
Name=
"Debug|Win32"
OutputDirectory=
".\debug"
IntermediateDirectory=
".\debug"
ConfigurationType=
"4"
UseOfMFC=
"0"
ATLMinimizesCRunTimeLibraryUsage=
"FALSE"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"0"
OptimizeForProcessor=
"2"
AdditionalIncludeDirectories=
"../../zlib,../../include"
PreprocessorDefinitions=
"_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS"
StringPooling=
"TRUE"
RuntimeLibrary=
"1"
PrecompiledHeaderFile=
".\debug/archive.pch"
AssemblerListingLocation=
".\debug/"
ObjectFile=
".\debug/"
ProgramDataBaseFileName=
".\debug/"
WarningLevel=
"3"
SuppressStartupBanner=
"TRUE"
DebugInformationFormat=
"1"
CompileAs=
"0"
/>
<Tool
Name=
"VCCustomBuildTool"
/>
<Tool
Name=
"VCLibrarianTool"
OutputFile=
"..\lib_debug\archive.lib"
SuppressStartupBanner=
"TRUE"
/>
<Tool
Name=
"VCMIDLTool"
/>
<Tool
Name=
"VCPostBuildEventTool"
/>
<Tool
Name=
"VCPreBuildEventTool"
/>
<Tool
Name=
"VCPreLinkEventTool"
/>
<Tool
Name=
"VCResourceCompilerTool"
Culture=
"1033"
/>
<Tool
Name=
"VCWebServiceProxyGeneratorTool"
/>
<Tool
Name=
"VCXMLDataGeneratorTool"
/>
<Tool
Name=
"VCManagedWrapperGeneratorTool"
/>
<Tool
Name=
"VCAuxiliaryManagedWrapperGeneratorTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<File
RelativePath=
"azlib.h"
>
</File>
<File
RelativePath=
"azio.c"
>
<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>
<FileConfiguration
Name=
"Debug|Win32"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"0"
AdditionalIncludeDirectories=
""
PreprocessorDefinitions=
""
/>
</FileConfiguration>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
This diff is collapsed.
Click to expand it.
VC++Files/storage/example/example.vcproj
0 → 100644
View file @
585f5b28
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType=
"Visual C++"
Version=
"7.10"
Name=
"example"
ProjectGUID=
"{6B6812DB-636E-465d-B53D-5012F237E539}"
SccProjectName=
""
SccLocalPath=
""
>
<Platforms>
<Platform
Name=
"Win32"
/>
</Platforms>
<Configurations>
<Configuration
Name=
"Release|Win32"
OutputDirectory=
".\release"
IntermediateDirectory=
".\release"
ConfigurationType=
"4"
UseOfMFC=
"0"
ATLMinimizesCRunTimeLibraryUsage=
"FALSE"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"2"
InlineFunctionExpansion=
"1"
OptimizeForProcessor=
"2"
AdditionalIncludeDirectories=
"../../include,../../regex,../../sql"
PreprocessorDefinitions=
"DBUG_OFF;_WINDOWS;NDEBUG"
StringPooling=
"TRUE"
RuntimeLibrary=
"0"
EnableFunctionLevelLinking=
"TRUE"
PrecompiledHeaderFile=
".\release/example.pch"
AssemblerListingLocation=
".\release/"
ObjectFile=
".\release/"
ProgramDataBaseFileName=
".\release/"
WarningLevel=
"3"
SuppressStartupBanner=
"TRUE"
CompileAs=
"0"
/>
<Tool
Name=
"VCCustomBuildTool"
/>
<Tool
Name=
"VCLibrarianTool"
OutputFile=
"..\lib_release\example.lib"
SuppressStartupBanner=
"TRUE"
/>
<Tool
Name=
"VCMIDLTool"
/>
<Tool
Name=
"VCPostBuildEventTool"
/>
<Tool
Name=
"VCPreBuildEventTool"
/>
<Tool
Name=
"VCPreLinkEventTool"
/>
<Tool
Name=
"VCResourceCompilerTool"
Culture=
"1033"
/>
<Tool
Name=
"VCWebServiceProxyGeneratorTool"
/>
<Tool
Name=
"VCXMLDataGeneratorTool"
/>
<Tool
Name=
"VCManagedWrapperGeneratorTool"
/>
<Tool
Name=
"VCAuxiliaryManagedWrapperGeneratorTool"
/>
</Configuration>
<Configuration
Name=
"TLS_DEBUG|Win32"
OutputDirectory=
".\example___Win32_TLS_DEBUG"
IntermediateDirectory=
".\example___Win32_TLS_DEBUG"
ConfigurationType=
"4"
UseOfMFC=
"0"
ATLMinimizesCRunTimeLibraryUsage=
"FALSE"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"0"
OptimizeForProcessor=
"2"
AdditionalIncludeDirectories=
"../../include,../../regex,../../sql"
PreprocessorDefinitions=
"_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_TLS"
StringPooling=
"TRUE"
RuntimeLibrary=
"1"
PrecompiledHeaderFile=
".\example___Win32_TLS_DEBUG/example.pch"
AssemblerListingLocation=
".\example___Win32_TLS_DEBUG/"
ObjectFile=
".\example___Win32_TLS_DEBUG/"
ProgramDataBaseFileName=
".\example___Win32_TLS_DEBUG/"
WarningLevel=
"3"
SuppressStartupBanner=
"TRUE"
DebugInformationFormat=
"1"
CompileAs=
"0"
/>
<Tool
Name=
"VCCustomBuildTool"
/>
<Tool
Name=
"VCLibrarianTool"
OutputFile=
"..\lib_debug\example_tls.lib"
SuppressStartupBanner=
"TRUE"
/>
<Tool
Name=
"VCMIDLTool"
/>
<Tool
Name=
"VCPostBuildEventTool"
/>
<Tool
Name=
"VCPreBuildEventTool"
/>
<Tool
Name=
"VCPreLinkEventTool"
/>
<Tool
Name=
"VCResourceCompilerTool"
Culture=
"1033"
/>
<Tool
Name=
"VCWebServiceProxyGeneratorTool"
/>
<Tool
Name=
"VCXMLDataGeneratorTool"
/>
<Tool
Name=
"VCManagedWrapperGeneratorTool"
/>
<Tool
Name=
"VCAuxiliaryManagedWrapperGeneratorTool"
/>
</Configuration>
<Configuration
Name=
"TLS|Win32"
OutputDirectory=
".\example___Win32_TLS"
IntermediateDirectory=
".\example___Win32_TLS"
ConfigurationType=
"4"
UseOfMFC=
"0"
ATLMinimizesCRunTimeLibraryUsage=
"FALSE"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"2"
InlineFunctionExpansion=
"1"
OptimizeForProcessor=
"2"
AdditionalIncludeDirectories=
"../../include,../../regex,../../sql"
PreprocessorDefinitions=
"DBUG_OFF;_WINDOWS;NDEBUG;USE_TLS"
StringPooling=
"TRUE"
RuntimeLibrary=
"0"
EnableFunctionLevelLinking=
"TRUE"
PrecompiledHeaderFile=
".\example___Win32_TLS/example.pch"
AssemblerListingLocation=
".\example___Win32_TLS/"
ObjectFile=
".\example___Win32_TLS/"
ProgramDataBaseFileName=
".\example___Win32_TLS/"
WarningLevel=
"3"
SuppressStartupBanner=
"TRUE"
CompileAs=
"0"
/>
<Tool
Name=
"VCCustomBuildTool"
/>
<Tool
Name=
"VCLibrarianTool"
OutputFile=
"..\lib_release\example_tls.lib"
SuppressStartupBanner=
"TRUE"
/>
<Tool
Name=
"VCMIDLTool"
/>
<Tool
Name=
"VCPostBuildEventTool"
/>
<Tool
Name=
"VCPreBuildEventTool"
/>
<Tool
Name=
"VCPreLinkEventTool"
/>
<Tool
Name=
"VCResourceCompilerTool"
Culture=
"1033"
/>
<Tool
Name=
"VCWebServiceProxyGeneratorTool"
/>
<Tool
Name=
"VCXMLDataGeneratorTool"
/>
<Tool
Name=
"VCManagedWrapperGeneratorTool"
/>
<Tool
Name=
"VCAuxiliaryManagedWrapperGeneratorTool"
/>
</Configuration>
<Configuration
Name=
"Debug|Win32"
OutputDirectory=
".\debug"
IntermediateDirectory=
".\debug"
ConfigurationType=
"4"
UseOfMFC=
"0"
ATLMinimizesCRunTimeLibraryUsage=
"FALSE"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"0"
OptimizeForProcessor=
"2"
AdditionalIncludeDirectories=
"../../include,../../regex,../../sql"
PreprocessorDefinitions=
"_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS"
StringPooling=
"TRUE"
RuntimeLibrary=
"1"
PrecompiledHeaderFile=
".\debug/example.pch"
AssemblerListingLocation=
".\debug/"
ObjectFile=
".\debug/"
ProgramDataBaseFileName=
".\debug/"
WarningLevel=
"3"
SuppressStartupBanner=
"TRUE"
DebugInformationFormat=
"1"
CompileAs=
"0"
/>
<Tool
Name=
"VCCustomBuildTool"
/>
<Tool
Name=
"VCLibrarianTool"
OutputFile=
"..\lib_debug\example.lib"
SuppressStartupBanner=
"TRUE"
/>
<Tool
Name=
"VCMIDLTool"
/>
<Tool
Name=
"VCPostBuildEventTool"
/>
<Tool
Name=
"VCPreBuildEventTool"
/>
<Tool
Name=
"VCPreLinkEventTool"
/>
<Tool
Name=
"VCResourceCompilerTool"
Culture=
"1033"
/>
<Tool
Name=
"VCWebServiceProxyGeneratorTool"
/>
<Tool
Name=
"VCXMLDataGeneratorTool"
/>
<Tool
Name=
"VCManagedWrapperGeneratorTool"
/>
<Tool
Name=
"VCAuxiliaryManagedWrapperGeneratorTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<File
RelativePath=
"ha_example.h"
>
</File>
<File
RelativePath=
"ha_example.cpp"
>
<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>
<FileConfiguration
Name=
"Debug|Win32"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"0"
AdditionalIncludeDirectories=
""
PreprocessorDefinitions=
""
/>
</FileConfiguration>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
This diff is collapsed.
Click to expand it.
include/config-win.h
View file @
585f5b28
...
@@ -353,6 +353,9 @@ inline double ulonglong2double(ulonglong value)
...
@@ -353,6 +353,9 @@ inline double ulonglong2double(ulonglong value)
#define HAVE_VIO_READ_BUFF
#define HAVE_VIO_READ_BUFF
#define HAVE_STRNLEN
#define HAVE_STRNLEN
#define strcasecmp stricmp
#define strncasecmp strnicmp
#ifndef __NT__
#ifndef __NT__
#undef FILE_SHARE_DELETE
#undef FILE_SHARE_DELETE
#define FILE_SHARE_DELETE 0
/* Not implemented on Win 98/ME */
#define FILE_SHARE_DELETE 0
/* Not implemented on Win 98/ME */
...
...
This diff is collapsed.
Click to expand it.
scripts/make_win_src_distribution.sh
View file @
585f5b28
...
@@ -249,7 +249,7 @@ copy_dir_dirs() {
...
@@ -249,7 +249,7 @@ copy_dir_dirs() {
# Input directories to be copied
# Input directories to be copied
#
#
for
i
in
client dbug extra storage/heap include
\
for
i
in
client dbug extra storage/heap include
storage/archive
\
libmysql libmysqld storage/myisam
\
libmysql libmysqld storage/myisam
\
storage/myisammrg mysys regex sql strings sql-common sql/examples
\
storage/myisammrg mysys regex sql strings sql-common sql/examples
\
tools vio zlib
tools vio zlib
...
...
This diff is collapsed.
Click to expand it.
sql/log.cc
View file @
585f5b28
...
@@ -112,7 +112,7 @@ handlerton binlog_hton = {
...
@@ -112,7 +112,7 @@ handlerton binlog_hton = {
SYNOPSIS
SYNOPSIS
open_log_table()
open_log_table()
log_type type of the log table to open:
LOG_GENERAL or
LOG_SLOW
log_type type of the log table to open:
QUERY_LOG_GENERAL or QUERY_
LOG_SLOW
DESCRIPTION
DESCRIPTION
...
@@ -135,7 +135,7 @@ bool Log_to_csv_event_handler::open_log_table(uint log_type)
...
@@ -135,7 +135,7 @@ bool Log_to_csv_event_handler::open_log_table(uint log_type)
DBUG_ENTER
(
"open_log_table"
);
DBUG_ENTER
(
"open_log_table"
);
switch
(
log_type
)
{
switch
(
log_type
)
{
case
LOG_GENERAL
:
case
QUERY_
LOG_GENERAL
:
log_thd
=
general_log_thd
;
log_thd
=
general_log_thd
;
table
=
&
general_log
;
table
=
&
general_log
;
/* clean up table before reuse/initial usage */
/* clean up table before reuse/initial usage */
...
@@ -143,7 +143,7 @@ bool Log_to_csv_event_handler::open_log_table(uint log_type)
...
@@ -143,7 +143,7 @@ bool Log_to_csv_event_handler::open_log_table(uint log_type)
table
->
alias
=
table
->
table_name
=
(
char
*
)
"general_log"
;
table
->
alias
=
table
->
table_name
=
(
char
*
)
"general_log"
;
table
->
table_name_length
=
11
;
table
->
table_name_length
=
11
;
break
;
break
;
case
LOG_SLOW
:
case
QUERY_
LOG_SLOW
:
log_thd
=
slow_log_thd
;
log_thd
=
slow_log_thd
;
table
=
&
slow_log
;
table
=
&
slow_log
;
bzero
((
char
*
)
table
,
sizeof
(
TABLE_LIST
));
bzero
((
char
*
)
table
,
sizeof
(
TABLE_LIST
));
...
@@ -245,7 +245,7 @@ Log_to_csv_event_handler::~Log_to_csv_event_handler()
...
@@ -245,7 +245,7 @@ Log_to_csv_event_handler::~Log_to_csv_event_handler()
SYNOPSIS
SYNOPSIS
reopen_log_table()
reopen_log_table()
log_type type of the log table to open:
LOG_GENERAL or
LOG_SLOW
log_type type of the log table to open:
QUERY_LOG_GENERAL or QUERY_
LOG_SLOW
DESCRIPTION
DESCRIPTION
...
@@ -272,8 +272,8 @@ bool Log_to_csv_event_handler::reopen_log_table(uint log_type)
...
@@ -272,8 +272,8 @@ bool Log_to_csv_event_handler::reopen_log_table(uint log_type)
void
Log_to_csv_event_handler
::
cleanup
()
void
Log_to_csv_event_handler
::
cleanup
()
{
{
close_log_table
(
LOG_GENERAL
,
FALSE
);
close_log_table
(
QUERY_
LOG_GENERAL
,
FALSE
);
close_log_table
(
LOG_SLOW
,
FALSE
);
close_log_table
(
QUERY_
LOG_SLOW
,
FALSE
);
logger
.
is_log_tables_initialized
=
FALSE
;
logger
.
is_log_tables_initialized
=
FALSE
;
}
}
...
@@ -871,21 +871,21 @@ bool Log_to_csv_event_handler::flush(THD *thd, TABLE_LIST *close_slow_log,
...
@@ -871,21 +871,21 @@ bool Log_to_csv_event_handler::flush(THD *thd, TABLE_LIST *close_slow_log,
TABLE_LIST
*
close_general_log
)
TABLE_LIST
*
close_general_log
)
{
{
VOID
(
pthread_mutex_lock
(
&
LOCK_open
));
VOID
(
pthread_mutex_lock
(
&
LOCK_open
));
close_log_table
(
LOG_GENERAL
,
TRUE
);
close_log_table
(
QUERY_
LOG_GENERAL
,
TRUE
);
close_log_table
(
LOG_SLOW
,
TRUE
);
close_log_table
(
QUERY_
LOG_SLOW
,
TRUE
);
close_general_log
->
next_local
=
close_slow_log
;
close_general_log
->
next_local
=
close_slow_log
;
query_cache_invalidate3
(
thd
,
close_general_log
,
0
);
query_cache_invalidate3
(
thd
,
close_general_log
,
0
);
unlock_table_name
(
thd
,
close_slow_log
);
unlock_table_name
(
thd
,
close_slow_log
);
unlock_table_name
(
thd
,
close_general_log
);
unlock_table_name
(
thd
,
close_general_log
);
VOID
(
pthread_mutex_unlock
(
&
LOCK_open
));
VOID
(
pthread_mutex_unlock
(
&
LOCK_open
));
return
reopen_log_table
(
LOG_SLOW
)
||
reopen_log_table
(
LOG_GENERAL
);
return
reopen_log_table
(
QUERY_LOG_SLOW
)
||
reopen_log_table
(
QUERY_
LOG_GENERAL
);
}
}
/* the parameters are unused for the log tables */
/* the parameters are unused for the log tables */
bool
Log_to_csv_event_handler
::
init
()
bool
Log_to_csv_event_handler
::
init
()
{
{
/* we always open log tables. even if the logging is disabled */
/* we always open log tables. even if the logging is disabled */
return
(
open_log_table
(
LOG_GENERAL
)
||
open_log_table
(
LOG_SLOW
));
return
(
open_log_table
(
QUERY_LOG_GENERAL
)
||
open_log_table
(
QUERY_
LOG_SLOW
));
}
}
int
LOGGER
::
set_handlers
(
enum
enum_printer
error_log_printer
,
int
LOGGER
::
set_handlers
(
enum
enum_printer
error_log_printer
,
...
@@ -923,7 +923,7 @@ int LOGGER::set_handlers(enum enum_printer error_log_printer,
...
@@ -923,7 +923,7 @@ int LOGGER::set_handlers(enum enum_printer error_log_printer,
SYNOPSIS
SYNOPSIS
close_log_table()
close_log_table()
log_type type of the log table to close:
LOG_GENERAL or
LOG_SLOW
log_type type of the log table to close:
QUERY_LOG_GENERAL or QUERY_
LOG_SLOW
lock_in_use Set to TRUE if the caller owns LOCK_open. FALSE otherwise.
lock_in_use Set to TRUE if the caller owns LOCK_open. FALSE otherwise.
DESCRIPTION
DESCRIPTION
...
@@ -943,11 +943,11 @@ void Log_to_csv_event_handler::
...
@@ -943,11 +943,11 @@ void Log_to_csv_event_handler::
return
;
/* do nothing */
return
;
/* do nothing */
switch
(
log_type
)
{
switch
(
log_type
)
{
case
LOG_GENERAL
:
case
QUERY_
LOG_GENERAL
:
log_thd
=
general_log_thd
;
log_thd
=
general_log_thd
;
table
=
&
general_log
;
table
=
&
general_log
;
break
;
break
;
case
LOG_SLOW
:
case
QUERY_
LOG_SLOW
:
log_thd
=
slow_log_thd
;
log_thd
=
slow_log_thd
;
table
=
&
slow_log
;
table
=
&
slow_log
;
break
;
break
;
...
...
This diff is collapsed.
Click to expand it.
sql/log_event.cc
View file @
585f5b28
...
@@ -6172,7 +6172,7 @@ char const *Write_rows_log_event::do_prepare_row(THD *thd, TABLE *table,
...
@@ -6172,7 +6172,7 @@ char const *Write_rows_log_event::do_prepare_row(THD *thd, TABLE *table,
*/
*/
DBUG_ASSERT
(
table
->
s
->
fields
>=
m_width
);
DBUG_ASSERT
(
table
->
s
->
fields
>=
m_width
);
DBUG_ASSERT
(
ptr
);
DBUG_ASSERT
(
ptr
);
ptr
=
unpack_row
(
table
,
(
char
*
)
table
->
record
[
0
],
ptr
,
&
m_cols
);
ptr
=
unpack_row
(
table
,
(
byte
*
)
table
->
record
[
0
],
ptr
,
&
m_cols
);
return
ptr
;
return
ptr
;
}
}
...
...
This diff is collapsed.
Click to expand it.
sql/mysql_priv.h
View file @
585f5b28
...
@@ -1189,8 +1189,8 @@ void sql_print_warning(const char *format, ...);
...
@@ -1189,8 +1189,8 @@ void sql_print_warning(const char *format, ...);
void
sql_print_information
(
const
char
*
format
,
...);
void
sql_print_information
(
const
char
*
format
,
...);
/* type of the log table */
/* type of the log table */
#define LOG_SLOW 1
#define
QUERY_
LOG_SLOW 1
#define LOG_GENERAL 2
#define
QUERY_
LOG_GENERAL 2
int
error_log_print
(
enum
loglevel
level
,
const
char
*
format
,
int
error_log_print
(
enum
loglevel
level
,
const
char
*
format
,
va_list
args
);
va_list
args
);
...
...
This diff is collapsed.
Click to expand it.
sql/sql_delete.cc
View file @
585f5b28
...
@@ -920,8 +920,8 @@ bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok)
...
@@ -920,8 +920,8 @@ bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok)
{
{
lock_logger
=
1
;
lock_logger
=
1
;
logger
.
lock
();
logger
.
lock
();
logger
.
close_log_table
(
LOG_GENERAL
,
FALSE
);
logger
.
close_log_table
(
QUERY_
LOG_GENERAL
,
FALSE
);
closed_log_tables
=
closed_log_tables
|
LOG_GENERAL
;
closed_log_tables
=
closed_log_tables
|
QUERY_
LOG_GENERAL
;
}
}
else
else
if
(
!
my_strcasecmp
(
system_charset_info
,
table_list
->
table_name
,
if
(
!
my_strcasecmp
(
system_charset_info
,
table_list
->
table_name
,
...
@@ -929,8 +929,8 @@ bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok)
...
@@ -929,8 +929,8 @@ bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok)
{
{
lock_logger
=
1
;
lock_logger
=
1
;
logger
.
lock
();
logger
.
lock
();
logger
.
close_log_table
(
LOG_SLOW
,
FALSE
);
logger
.
close_log_table
(
QUERY_
LOG_SLOW
,
FALSE
);
closed_log_tables
=
closed_log_tables
|
LOG_SLOW
;
closed_log_tables
=
closed_log_tables
|
QUERY_
LOG_SLOW
;
}
}
}
}
...
@@ -963,11 +963,11 @@ bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok)
...
@@ -963,11 +963,11 @@ bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok)
unlock_table_name
(
thd
,
table_list
);
unlock_table_name
(
thd
,
table_list
);
VOID
(
pthread_mutex_unlock
(
&
LOCK_open
));
VOID
(
pthread_mutex_unlock
(
&
LOCK_open
));
if
(
closed_log_tables
&
LOG_SLOW
)
if
(
closed_log_tables
&
QUERY_
LOG_SLOW
)
logger
.
reopen_log_table
(
LOG_SLOW
);
logger
.
reopen_log_table
(
QUERY_
LOG_SLOW
);
if
(
closed_log_tables
&
LOG_GENERAL
)
if
(
closed_log_tables
&
QUERY_
LOG_GENERAL
)
logger
.
reopen_log_table
(
LOG_GENERAL
);
logger
.
reopen_log_table
(
QUERY_
LOG_GENERAL
);
if
(
lock_logger
)
if
(
lock_logger
)
logger
.
unlock
();
logger
.
unlock
();
}
}
...
...
This diff is collapsed.
Click to expand it.
sql/sql_parse.cc
View file @
585f5b28
...
@@ -74,22 +74,37 @@ static bool append_file_to_dir(THD *thd, const char **filename_ptr,
...
@@ -74,22 +74,37 @@ static bool append_file_to_dir(THD *thd, const char **filename_ptr,
const
char
*
any_db
=
"*any*"
;
// Special symbol for check_access
const
char
*
any_db
=
"*any*"
;
// Special symbol for check_access
LEX_STRING
command_name
[]
=
{
LEX_STRING
command_name
[]
=
{
STRING_WITH_LEN
(
"Sleep"
),
STRING_WITH_LEN
(
"Quit"
),
(
char
*
)
STRING_WITH_LEN
(
"Sleep"
),
STRING_WITH_LEN
(
"Init DB"
),
STRING_WITH_LEN
(
"Query"
),
(
char
*
)
STRING_WITH_LEN
(
"Quit"
),
STRING_WITH_LEN
(
"Field List"
),
STRING_WITH_LEN
(
"Create DB"
),
(
char
*
)
STRING_WITH_LEN
(
"Init DB"
),
STRING_WITH_LEN
(
"Drop DB"
),
STRING_WITH_LEN
(
"Refresh"
),
(
char
*
)
STRING_WITH_LEN
(
"Query"
),
STRING_WITH_LEN
(
"Shutdown"
),
STRING_WITH_LEN
(
"Statistics"
),
(
char
*
)
STRING_WITH_LEN
(
"Field List"
),
STRING_WITH_LEN
(
"Processlist"
),
STRING_WITH_LEN
(
"Connect"
),
(
char
*
)
STRING_WITH_LEN
(
"Create DB"
),
STRING_WITH_LEN
(
"Kill"
),
STRING_WITH_LEN
(
"Debug"
),
(
char
*
)
STRING_WITH_LEN
(
"Drop DB"
),
STRING_WITH_LEN
(
"Ping"
),
STRING_WITH_LEN
(
"Time"
),
(
char
*
)
STRING_WITH_LEN
(
"Refresh"
),
STRING_WITH_LEN
(
"Delayed insert"
),
STRING_WITH_LEN
(
"Change user"
),
(
char
*
)
STRING_WITH_LEN
(
"Shutdown"
),
STRING_WITH_LEN
(
"Binlog Dump"
),
STRING_WITH_LEN
(
"Table Dump"
),
(
char
*
)
STRING_WITH_LEN
(
"Statistics"
),
STRING_WITH_LEN
(
"Connect Out"
),
STRING_WITH_LEN
(
"Register Slave"
),
(
char
*
)
STRING_WITH_LEN
(
"Processlist"
),
STRING_WITH_LEN
(
"Prepare"
),
STRING_WITH_LEN
(
"Execute"
),
(
char
*
)
STRING_WITH_LEN
(
"Connect"
),
STRING_WITH_LEN
(
"Long Data"
),
STRING_WITH_LEN
(
"Close stmt"
),
(
char
*
)
STRING_WITH_LEN
(
"Kill"
),
STRING_WITH_LEN
(
"Reset stmt"
),
STRING_WITH_LEN
(
"Set option"
),
(
char
*
)
STRING_WITH_LEN
(
"Debug"
),
STRING_WITH_LEN
(
"Fetch"
),
STRING_WITH_LEN
(
"Daemon"
),
(
char
*
)
STRING_WITH_LEN
(
"Ping"
),
STRING_WITH_LEN
(
"Error"
)
// Last command number
(
char
*
)
STRING_WITH_LEN
(
"Time"
),
(
char
*
)
STRING_WITH_LEN
(
"Delayed insert"
),
(
char
*
)
STRING_WITH_LEN
(
"Change user"
),
(
char
*
)
STRING_WITH_LEN
(
"Binlog Dump"
),
(
char
*
)
STRING_WITH_LEN
(
"Table Dump"
),
(
char
*
)
STRING_WITH_LEN
(
"Connect Out"
),
(
char
*
)
STRING_WITH_LEN
(
"Register Slave"
),
(
char
*
)
STRING_WITH_LEN
(
"Prepare"
),
(
char
*
)
STRING_WITH_LEN
(
"Execute"
),
(
char
*
)
STRING_WITH_LEN
(
"Long Data"
),
(
char
*
)
STRING_WITH_LEN
(
"Close stmt"
),
(
char
*
)
STRING_WITH_LEN
(
"Reset stmt"
),
(
char
*
)
STRING_WITH_LEN
(
"Set option"
),
(
char
*
)
STRING_WITH_LEN
(
"Fetch"
),
(
char
*
)
STRING_WITH_LEN
(
"Daemon"
),
(
char
*
)
STRING_WITH_LEN
(
"Error"
)
// Last command number
};
};
const
char
*
xa_state_names
[]
=
{
const
char
*
xa_state_names
[]
=
{
...
...
This diff is collapsed.
Click to expand it.
sql/table.cc
View file @
585f5b28
...
@@ -326,11 +326,11 @@ int open_table_def(THD *thd, TABLE_SHARE *share, uint db_flags)
...
@@ -326,11 +326,11 @@ int open_table_def(THD *thd, TABLE_SHARE *share, uint db_flags)
{
{
if
(
!
my_strcasecmp
(
system_charset_info
,
share
->
table_name
.
str
,
if
(
!
my_strcasecmp
(
system_charset_info
,
share
->
table_name
.
str
,
"general_log"
))
"general_log"
))
share
->
log_table
=
LOG_GENERAL
;
share
->
log_table
=
QUERY_
LOG_GENERAL
;
else
else
if
(
!
my_strcasecmp
(
system_charset_info
,
share
->
table_name
.
str
,
if
(
!
my_strcasecmp
(
system_charset_info
,
share
->
table_name
.
str
,
"slow_log"
))
"slow_log"
))
share
->
log_table
=
LOG_SLOW
;
share
->
log_table
=
QUERY_
LOG_SLOW
;
}
}
}
}
error_given
=
1
;
error_given
=
1
;
...
...
This diff is collapsed.
Click to expand it.
storage/archive/azio.c
View file @
585f5b28
...
@@ -114,8 +114,16 @@ int az_open (azio_stream *s, const char *path, int Flags, File fd)
...
@@ -114,8 +114,16 @@ int az_open (azio_stream *s, const char *path, int Flags, File fd)
char
buffer
[
10
];
char
buffer
[
10
];
/* Write a very simple .gz header:
/* Write a very simple .gz header:
*/
*/
snprintf
(
buffer
,
10
,
"%c%c%c%c%c%c%c%c%c%c"
,
gz_magic
[
0
],
gz_magic
[
1
],
buffer
[
0
]
=
gz_magic
[
0
];
Z_DEFLATED
,
0
/*flags*/
,
0
,
0
,
0
,
0
/*time*/
,
0
/*xflags*/
,
0x03
);
buffer
[
1
]
=
gz_magic
[
1
];
buffer
[
2
]
=
Z_DEFLATED
;
buffer
[
3
]
=
0
/*flags*/
;
buffer
[
4
]
=
0
;
buffer
[
5
]
=
0
;
buffer
[
6
]
=
0
;
buffer
[
7
]
=
0
/*time*/
;
buffer
[
8
]
=
0
/*xflags*/
;
buffer
[
9
]
=
0x03
;
s
->
start
=
10L
;
s
->
start
=
10L
;
my_write
(
s
->
file
,
buffer
,
s
->
start
,
MYF
(
0
));
my_write
(
s
->
file
,
buffer
,
s
->
start
,
MYF
(
0
));
/* We use 10L instead of ftell(s->file) to because ftell causes an
/* We use 10L instead of ftell(s->file) to because ftell causes an
...
...
This diff is collapsed.
Click to expand it.
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
View file @
585f5b28
...
@@ -1353,23 +1353,23 @@ NdbEventBuffer::copy_data(const SubTableData * const sdata,
...
@@ -1353,23 +1353,23 @@ NdbEventBuffer::copy_data(const SubTableData * const sdata,
static
struct
Ev_t
{
static
struct
Ev_t
{
enum
{
enum
{
INS
=
NdbDictionary
::
Event
::
_TE_INSERT
,
enum_
INS
=
NdbDictionary
::
Event
::
_TE_INSERT
,
DEL
=
NdbDictionary
::
Event
::
_TE_DELETE
,
enum_
DEL
=
NdbDictionary
::
Event
::
_TE_DELETE
,
UPD
=
NdbDictionary
::
Event
::
_TE_UPDATE
,
enum_
UPD
=
NdbDictionary
::
Event
::
_TE_UPDATE
,
NUL
=
NdbDictionary
::
Event
::
_TE_NUL
,
enum_
NUL
=
NdbDictionary
::
Event
::
_TE_NUL
,
ERR
=
255
enum_
ERR
=
255
};
};
int
t1
,
t2
,
t3
;
int
t1
,
t2
,
t3
;
}
ev_t
[]
=
{
}
ev_t
[]
=
{
{
Ev_t
::
INS
,
Ev_t
::
INS
,
Ev_t
::
ERR
},
{
Ev_t
::
enum_INS
,
Ev_t
::
enum_INS
,
Ev_t
::
enum_
ERR
},
{
Ev_t
::
INS
,
Ev_t
::
DEL
,
Ev_t
::
NUL
},
//ok
{
Ev_t
::
enum_INS
,
Ev_t
::
enum_DEL
,
Ev_t
::
enum_
NUL
},
//ok
{
Ev_t
::
INS
,
Ev_t
::
UPD
,
Ev_t
::
INS
},
//ok
{
Ev_t
::
enum_INS
,
Ev_t
::
enum_UPD
,
Ev_t
::
enum_
INS
},
//ok
{
Ev_t
::
DEL
,
Ev_t
::
INS
,
Ev_t
::
UPD
},
//ok
{
Ev_t
::
enum_DEL
,
Ev_t
::
enum_INS
,
Ev_t
::
enum_
UPD
},
//ok
{
Ev_t
::
DEL
,
Ev_t
::
DEL
,
Ev_t
::
ERR
},
{
Ev_t
::
enum_DEL
,
Ev_t
::
enum_DEL
,
Ev_t
::
enum_
ERR
},
{
Ev_t
::
DEL
,
Ev_t
::
UPD
,
Ev_t
::
ERR
},
{
Ev_t
::
enum_DEL
,
Ev_t
::
enum_UPD
,
Ev_t
::
enum_
ERR
},
{
Ev_t
::
UPD
,
Ev_t
::
INS
,
Ev_t
::
ERR
},
{
Ev_t
::
enum_UPD
,
Ev_t
::
enum_INS
,
Ev_t
::
enum_
ERR
},
{
Ev_t
::
UPD
,
Ev_t
::
DEL
,
Ev_t
::
DEL
},
//ok
{
Ev_t
::
enum_UPD
,
Ev_t
::
enum_DEL
,
Ev_t
::
enum_
DEL
},
//ok
{
Ev_t
::
UPD
,
Ev_t
::
UPD
,
Ev_t
::
UPD
}
//ok
{
Ev_t
::
enum_UPD
,
Ev_t
::
enum_UPD
,
Ev_t
::
enum_
UPD
}
//ok
};
};
/*
/*
...
@@ -1424,7 +1424,7 @@ NdbEventBuffer::merge_data(const SubTableData * const sdata,
...
@@ -1424,7 +1424,7 @@ NdbEventBuffer::merge_data(const SubTableData * const sdata,
int
t1
=
data
->
sdata
->
operation
;
int
t1
=
data
->
sdata
->
operation
;
int
t2
=
sdata
->
operation
;
int
t2
=
sdata
->
operation
;
if
(
t1
==
Ev_t
::
NUL
)
if
(
t1
==
Ev_t
::
enum_
NUL
)
DBUG_RETURN_EVENT
(
copy_data
(
sdata
,
ptr2
,
data
));
DBUG_RETURN_EVENT
(
copy_data
(
sdata
,
ptr2
,
data
));
Ev_t
*
tp
=
0
;
Ev_t
*
tp
=
0
;
...
@@ -1435,7 +1435,7 @@ NdbEventBuffer::merge_data(const SubTableData * const sdata,
...
@@ -1435,7 +1435,7 @@ NdbEventBuffer::merge_data(const SubTableData * const sdata,
break
;
break
;
}
}
}
}
assert
(
tp
!=
0
&&
tp
->
t3
!=
Ev_t
::
ERR
);
assert
(
tp
!=
0
&&
tp
->
t3
!=
Ev_t
::
enum_
ERR
);
// save old data
// save old data
EventBufData
olddata
=
*
data
;
EventBufData
olddata
=
*
data
;
...
@@ -1477,7 +1477,7 @@ NdbEventBuffer::merge_data(const SubTableData * const sdata,
...
@@ -1477,7 +1477,7 @@ NdbEventBuffer::merge_data(const SubTableData * const sdata,
}
}
// merge after values, new version overrides
// merge after values, new version overrides
if
(
tp
->
t3
!=
Ev_t
::
DEL
)
if
(
tp
->
t3
!=
Ev_t
::
enum_
DEL
)
{
{
AttributeHeader
ah
;
AttributeHeader
ah
;
Uint32
i
=
ptr
[
0
].
sz
;
Uint32
i
=
ptr
[
0
].
sz
;
...
@@ -1526,7 +1526,7 @@ NdbEventBuffer::merge_data(const SubTableData * const sdata,
...
@@ -1526,7 +1526,7 @@ NdbEventBuffer::merge_data(const SubTableData * const sdata,
}
}
// merge before values, old version overrides
// merge before values, old version overrides
if
(
tp
->
t3
!=
Ev_t
::
INS
)
if
(
tp
->
t3
!=
Ev_t
::
enum_
INS
)
{
{
AttributeHeader
ah
;
AttributeHeader
ah
;
Uint32
k
=
0
;
Uint32
k
=
0
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment