mirror of
https://github.com/MariaDB/server.git
synced 2025-01-15 19:42:28 +01:00
042448aa33
fix for binlog+autocommit+tclog
comments, style fixes
libmysqld/libmysqld.rc:
Change mode to -rw-rw-r--
libmysqld/resource.h:
Change mode to -rw-rw-r--
configure.in:
check for getpagesize
include/my_global.h:
typo ?
include/my_pthread.h:
bug in thread_safe_decrement_and_test()
mysql-test/r/bdb.result:
results updated
mysql-test/r/innodb.result:
results updated
mysql-test/r/mix_innodb_myisam_binlog.result:
results updated
mysql-test/r/rpl_relayrotate.result:
results updated
sql/ha_berkeley.cc:
style fixes
sql/ha_innodb.cc:
fixes to follow innodb coding style
sql/handler.cc:
more comments. XA COMMIT ONE PHASE fix.
sql/handler.h:
my_xid -> ulonglong. comments
sql/item_func.cc:
DO RELEASE_LOCK("...") is no cache_stmt
sql/log.cc:
comments, better error messages
sql/log_event.cc:
even in autocommit mode we may need to cache_stmt
xid is ulonglong
sql/log_event.h:
more comments.
sql/mysql_priv.h:
query_id is ulonglong
sql/mysqld.cc:
default value for --log-tc changed
sql/share/errmsg.txt:
better error messages
sql/sql_class.h:
cleanup, comments
sql/sql_delete.cc:
deleting from temporary tables is not always transactional
sql/sql_insert.cc:
insert into temporary table is not always transactional
sql/sql_load.cc:
load data into temp table is not always transactional
sql/sql_parse.cc:
comments. bad merge fixed. xa_state_names[]
sql/sql_table.cc:
create/drop temp table is not always transactional
sql/sql_update.cc:
update temp table is not always transactional
125 lines
3.1 KiB
Text
125 lines
3.1 KiB
Text
//Microsoft Developer Studio generated resource script.
|
|
//
|
|
#include "resource.h"
|
|
|
|
#define APSTUDIO_READONLY_SYMBOLS
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// Generated from the TEXTINCLUDE 2 resource.
|
|
//
|
|
#include "afxres.h"
|
|
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
#undef APSTUDIO_READONLY_SYMBOLS
|
|
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
// English (U.S.) resources
|
|
|
|
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
|
|
#ifdef _WIN32
|
|
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
|
#pragma code_page(1252)
|
|
#endif //_WIN32
|
|
|
|
|
|
#ifdef APSTUDIO_INVOKED
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// TEXTINCLUDE
|
|
//
|
|
|
|
1 TEXTINCLUDE DISCARDABLE
|
|
BEGIN
|
|
"resource.h\0"
|
|
END
|
|
|
|
2 TEXTINCLUDE DISCARDABLE
|
|
BEGIN
|
|
"#include ""afxres.h""\r\n"
|
|
"\0"
|
|
END
|
|
|
|
3 TEXTINCLUDE DISCARDABLE
|
|
BEGIN
|
|
"\r\n"
|
|
"\0"
|
|
END
|
|
|
|
#endif // APSTUDIO_INVOKED
|
|
|
|
|
|
#ifndef _MAC
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// Version
|
|
//
|
|
|
|
VS_VERSION_INFO VERSIONINFO
|
|
FILEVERSION 4,0,20,0
|
|
PRODUCTVERSION 4,0,20,0
|
|
FILEFLAGSMASK 0x3fL
|
|
#ifdef _DEBUG
|
|
FILEFLAGS 0x9L
|
|
#else
|
|
FILEFLAGS 0x8L
|
|
#endif
|
|
FILEOS 0x40004L
|
|
FILETYPE 0x2L
|
|
FILESUBTYPE 0x0L
|
|
BEGIN
|
|
BLOCK "StringFileInfo"
|
|
BEGIN
|
|
BLOCK "040904b0"
|
|
BEGIN
|
|
#ifdef _DEBUG
|
|
VALUE "Comments", "Embedded Server\0"
|
|
VALUE "CompanyName", "MySQL AB\0"
|
|
VALUE "FileDescription", "Embedded Server\0"
|
|
VALUE "FileVersion", "4.0.20\0"
|
|
VALUE "InternalName", "Embedded Server\0"
|
|
VALUE "LegalCopyright", "Copyright © 2004\0"
|
|
VALUE "LegalTrademarks", "MySQL and MySQL AB\0"
|
|
VALUE "OriginalFilename", "libmysqld.dll debug\0"
|
|
VALUE "PrivateBuild", "libmysqld.dll debug \0"
|
|
VALUE "ProductName", "libmysqld.dll debug\0"
|
|
VALUE "ProductVersion", "4.0.20\0"
|
|
VALUE "SpecialBuild", "\0"
|
|
#else
|
|
VALUE "Comments", "Embedded Server\0"
|
|
VALUE "CompanyName", "MySQL AB\0"
|
|
VALUE "FileDescription", "Embedded Server\0"
|
|
VALUE "FileVersion", "4.0.20\0"
|
|
VALUE "InternalName", "Embedded Server\0"
|
|
VALUE "LegalCopyright", "Copyright © 2004\0"
|
|
VALUE "LegalTrademarks", "MySQL and MySQL AB\0"
|
|
VALUE "OriginalFilename", "libmysqld.dll release\0"
|
|
VALUE "PrivateBuild", "libmysqld.dll release \0"
|
|
VALUE "ProductName", "libmysqld.dll release\0"
|
|
VALUE "ProductVersion", "4.0.20\0"
|
|
VALUE "SpecialBuild", "\0"
|
|
#endif
|
|
END
|
|
END
|
|
BLOCK "VarFileInfo"
|
|
BEGIN
|
|
VALUE "Translation", 0x409, 1200
|
|
END
|
|
END
|
|
|
|
#endif // !_MAC
|
|
|
|
#endif // English (U.S.) resources
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
#ifndef APSTUDIO_INVOKED
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// Generated from the TEXTINCLUDE 3 resource.
|
|
//
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
#endif // not APSTUDIO_INVOKED
|
|
|