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
d5202ddd
Commit
d5202ddd
authored
Oct 24, 2008
by
Sergey Petrunia
Browse files
Options
Browse Files
Download
Plain Diff
Merge
parents
844797c4
5bc2ad27
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
77 additions
and
13 deletions
+77
-13
mysql-test/r/xa.result
mysql-test/r/xa.result
+1
-0
mysql-test/t/xa.test
mysql-test/t/xa.test
+1
-0
sql/CMakeLists.txt
sql/CMakeLists.txt
+3
-12
sql/MSG00001.bin
sql/MSG00001.bin
+0
-0
sql/Makefile.am
sql/Makefile.am
+2
-1
sql/message.h
sql/message.h
+55
-0
sql/message.mc
sql/message.mc
+8
-0
sql/message.rc
sql/message.rc
+2
-0
zlib/gzio.c
zlib/gzio.c
+5
-0
No files found.
mysql-test/r/xa.result
View file @
d5202ddd
...
@@ -73,4 +73,5 @@ xa end 'a','c';
...
@@ -73,4 +73,5 @@ xa end 'a','c';
ERROR XA102: XA_RBDEADLOCK: Transaction branch was rolled back: deadlock was detected
ERROR XA102: XA_RBDEADLOCK: Transaction branch was rolled back: deadlock was detected
xa rollback 'a','c';
xa rollback 'a','c';
xa start 'a','c';
xa start 'a','c';
drop table t1;
End of 5.0 tests
End of 5.0 tests
mysql-test/t/xa.test
View file @
d5202ddd
...
@@ -116,5 +116,6 @@ xa start 'a','c';
...
@@ -116,5 +116,6 @@ xa start 'a','c';
--
disconnect
con1
--
disconnect
con1
--
disconnect
con3
--
disconnect
con3
--
connection
default
--
connection
default
drop
table
t1
;
--
echo
End
of
5.0
tests
--
echo
End
of
5.0
tests
sql/CMakeLists.txt
View file @
d5202ddd
...
@@ -28,9 +28,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
...
@@ -28,9 +28,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
${
CMAKE_SOURCE_DIR
}
/bdb/build_win32
${
CMAKE_SOURCE_DIR
}
/bdb/build_win32
${
CMAKE_SOURCE_DIR
}
/bdb/dbinc
)
${
CMAKE_SOURCE_DIR
}
/bdb/dbinc
)
SET_SOURCE_FILES_PROPERTIES
(
${
CMAKE_SOURCE_DIR
}
/sql/message.rc
SET_SOURCE_FILES_PROPERTIES
(
${
CMAKE_SOURCE_DIR
}
/sql/sql_yacc.h
${
CMAKE_SOURCE_DIR
}
/sql/message.h
${
CMAKE_SOURCE_DIR
}
/sql/sql_yacc.h
${
CMAKE_SOURCE_DIR
}
/sql/sql_yacc.cc
${
CMAKE_SOURCE_DIR
}
/sql/sql_yacc.cc
${
CMAKE_SOURCE_DIR
}
/include/mysql_version.h
${
CMAKE_SOURCE_DIR
}
/include/mysql_version.h
${
CMAKE_SOURCE_DIR
}
/sql/lex_hash.h
${
CMAKE_SOURCE_DIR
}
/sql/lex_hash.h
...
@@ -120,13 +118,6 @@ ADD_CUSTOM_COMMAND(
...
@@ -120,13 +118,6 @@ ADD_CUSTOM_COMMAND(
DEPENDS
${
PROJECT_SOURCE_DIR
}
/sql/sql_yacc.cc
DEPENDS
${
PROJECT_SOURCE_DIR
}
/sql/sql_yacc.cc
)
)
# Windows message file
ADD_CUSTOM_COMMAND
(
SOURCE
${
PROJECT_SOURCE_DIR
}
/sql/message.mc
OUTPUT message.rc message.h
COMMAND mc ARGS
${
PROJECT_SOURCE_DIR
}
/sql/message.mc
DEPENDS
${
PROJECT_SOURCE_DIR
}
/sql/message.mc
)
# Gen_lex_hash
# Gen_lex_hash
# About "mysqlclient_notls", see note in "client/CMakeLists.txt"
# About "mysqlclient_notls", see note in "client/CMakeLists.txt"
ADD_EXECUTABLE
(
gen_lex_hash gen_lex_hash.cc
)
ADD_EXECUTABLE
(
gen_lex_hash gen_lex_hash.cc
)
...
@@ -141,7 +132,7 @@ ADD_DEPENDENCIES(mysqld${MYSQLD_EXE_SUFFIX} gen_lex_hash)
...
@@ -141,7 +132,7 @@ ADD_DEPENDENCIES(mysqld${MYSQLD_EXE_SUFFIX} gen_lex_hash)
# Remove the auto-generated files as part of 'Clean Solution'
# Remove the auto-generated files as part of 'Clean Solution'
SET_DIRECTORY_PROPERTIES
(
PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
SET_DIRECTORY_PROPERTIES
(
PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
"lex_hash.h;
message.rc;message.h;
sql_yacc.h;sql_yacc.cc"
)
"lex_hash.h;sql_yacc.h;sql_yacc.cc"
)
ADD_LIBRARY
(
udf_example MODULE udf_example.c udf_example.def
)
ADD_LIBRARY
(
udf_example MODULE udf_example.c udf_example.def
)
ADD_DEPENDENCIES
(
udf_example strings
)
ADD_DEPENDENCIES
(
udf_example strings
)
...
...
sql/MSG00001.bin
0 → 100644
View file @
d5202ddd
File added
sql/Makefile.am
View file @
d5202ddd
...
@@ -118,7 +118,8 @@ DEFS = -DMYSQL_SERVER \
...
@@ -118,7 +118,8 @@ DEFS = -DMYSQL_SERVER \
BUILT_SOURCES
=
sql_yacc.cc sql_yacc.h lex_hash.h
BUILT_SOURCES
=
sql_yacc.cc sql_yacc.h lex_hash.h
EXTRA_DIST
=
$(BUILT_SOURCES)
nt_servc.cc nt_servc.h
\
EXTRA_DIST
=
$(BUILT_SOURCES)
nt_servc.cc nt_servc.h
\
message.mc examples/CMakeLists.txt CMakeLists.txt
\
message.mc message.h message.rc MSG00001.bin
\
examples/CMakeLists.txt CMakeLists.txt
\
udf_example.c udf_example.def
udf_example.c udf_example.def
DISTCLEANFILES
=
lex_hash.h sql_yacc.output
DISTCLEANFILES
=
lex_hash.h sql_yacc.output
...
...
sql/message.h
0 → 100644
View file @
d5202ddd
/*
To change or add messages mysqld writes to the Windows error log, run
mc.exe message.mc
and checkin generated messages.h, messages.rc and msg000001.bin under the
source control.
mc.exe can be installed with Windows SDK, some Visual Studio distributions
do not include it.
*/
//
// Values are 32 bit values layed out as follows:
//
// 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
// 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
// +---+-+-+-----------------------+-------------------------------+
// |Sev|C|R| Facility | Code |
// +---+-+-+-----------------------+-------------------------------+
//
// where
//
// Sev - is the severity code
//
// 00 - Success
// 01 - Informational
// 10 - Warning
// 11 - Error
//
// C - is the Customer code flag
//
// R - is a reserved bit
//
// Facility - is the facility code
//
// Code - is the facility's status code
//
//
// Define the facility codes
//
//
// Define the severity codes
//
//
// MessageId: MSG_DEFAULT
//
// MessageText:
//
// %1For more information, see Help and Support Center at http://www.mysql.com.
//
//
//
#define MSG_DEFAULT 0xC0000064L
sql/message.mc
View file @
d5202ddd
;/*
; To change or add messages mysqld writes to the Windows error log, run
; mc.exe message.mc
; and checkin generated messages.h, messages.rc and msg000001.bin under the
; source control.
; mc.exe can be installed with Windows SDK, some Visual Studio distributions
; do not include it.
;*/
MessageId = 100
MessageId = 100
Severity = Error
Severity = Error
Facility = Application
Facility = Application
...
...
sql/message.rc
0 → 100644
View file @
d5202ddd
LANGUAGE 0x9,0x1
1 11 MSG00001.bin
zlib/gzio.c
View file @
d5202ddd
...
@@ -7,6 +7,11 @@
...
@@ -7,6 +7,11 @@
/* @(#) $Id$ */
/* @(#) $Id$ */
/* Need to be included "early" to control other headers */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <stdio.h>
#include <stdio.h>
#include "zutil.h"
#include "zutil.h"
...
...
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