2886 Vladislav Vaintroub 2008-10-23 [merge]
Merge fix for Bug40280 from 5.1
added:
sql/MSG00001.bin
sql/message.h
sql/message.rc
modified:
sql/CMakeLists.txt
sql/Makefile.am
sql/message.mc
2885 Georgi Kodinov 2008-10-21 [merge]
merged 5.1-bugteam -> 6.0-bugteam
modified:
sql/event_scheduler.cc
sql/log.cc
sql/sql_class.cc
sql/sql_insert.cc
=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt 2008-09-26 16:30:56 +0000
+++ b/sql/CMakeLists.txt 2008-10-23 16:19:29 +0000
@@ -28,9 +28,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/
${CMAKE_SOURCE_DIR}/sql/backup
)
-SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/sql/message.rc
- ${CMAKE_SOURCE_DIR}/sql/message.h
- ${CMAKE_SOURCE_DIR}/sql/sql_yacc.h
+SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/sql/sql_yacc.h
${CMAKE_SOURCE_DIR}/sql/sql_yacc.cc
${CMAKE_SOURCE_DIR}/include/mysql_version.h
${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc
@@ -137,14 +135,6 @@ ADD_CUSTOM_COMMAND(
--output=sql_yacc.cc sql_yacc.yy
DEPENDS ${PROJECT_SOURCE_DIR}/sql/sql_yacc.yy)
-IF(WIN32)
- # Windows message file
- ADD_CUSTOM_COMMAND(
- OUTPUT ${PROJECT_SOURCE_DIR}/sql/message.h
-# ${PROJECT_SOURCE_DIR}/sql/message.rc
- COMMAND mc ARGS message.mc
- DEPENDS ${PROJECT_SOURCE_DIR}/sql/message.mc)
-ENDIF(WIN32)
# Gen_lex_hash
ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
@@ -167,7 +157,7 @@ ADD_DEPENDENCIES(mysqld GenServerSource)
# Remove the auto-generated files as part of 'Clean Solution'
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_DEPENDENCIES(udf_example strings GenError)
=== added file 'sql/MSG00001.bin'
Binary files c:\users\vvaint~1\appdata\local\temp\bzr-diff-old-ljrmht and c:\users\vvaint~1\appdata\local\temp\bzr-diff-new-jdwk-m differ
=== modified file 'sql/Makefile.am'
--- a/sql/Makefile.am 2008-10-01 12:09:26 +0000
+++ b/sql/Makefile.am 2008-10-23 16:19:29 +0000
@@ -169,9 +169,12 @@ DEFS = -DMYSQL_SERVER \
BUILT_MAINT_SRC = sql_yacc.cc sql_yacc.h
BUILT_SOURCES = $(BUILT_MAINT_SRC) lex_hash.h link_sources
EXTRA_DIST = udf_example.c udf_example.def $(BUILT_MAINT_SRC) \
- nt_servc.cc nt_servc.h message.mc CMakeLists.txt \
+ nt_servc.cc nt_servc.h CMakeLists.txt \
probes.d \
- udf_example.c udf_example.def
+ message.mc message.h message.rc MSG00001.bin \
+ nt_servc.cc nt_servc.h \
+ CMakeLists.txt
+
CLEANFILES = lex_hash.h sql_yacc.output link_sources
DISTCLEANFILES = $(EXTRA_PROGRAMS)
MAINTAINERCLEANFILES = $(BUILT_MAINT_SRC)
=== added file 'sql/message.h'
--- a/sql/message.h 1970-01-01 00:00:00 +0000
+++ b/sql/message.h 2008-10-23 13:28:53 +0000
@@ -0,0 +1,55 @@
+/*
+ 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
+
=== modified file 'sql/message.mc'
--- a/sql/message.mc 2006-03-24 21:50:56 +0000
+++ b/sql/message.mc 2008-10-23 15:59:22 +0000
@@ -1,3 +1,11 @@
+;/*
+; 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
Severity = Error
Facility = Application
=== added file 'sql/message.rc'
--- a/sql/message.rc 1970-01-01 00:00:00 +0000
+++ b/sql/message.rc 2008-10-23 13:28:53 +0000
@@ -0,0 +1,2 @@
+LANGUAGE 0x9,0x1
+1 11 MSG00001.bin
| Thread |
|---|
| • bzr push into mysql-6.0 branch (vvaintroub:2885 to 2886) | Vladislav Vaintroub | 23 Oct |
