bzr commit into mysql-5.0-bugteam branch (vvaintroub:2708) Bug#40280

[Vladislav Vaintroub]

#At file:///G:/bzr/mysql-5.0-bugteam/

 2708 Vladislav Vaintroub	2008-10-23
       Bug#40280: Message compiler(mc.exe) needed to compile MySQL on windows.
      
      Visual Studio 2008 Express edition does not include message compiler mc.exe
      It is not possible to build MySQL server if only VC2008 Express is installed,
      because we use mc.exe to generate event log messages.
      
      This patch removes the mc.exe dependency. Generated files message.h, 
      message.rc and MSG00001.bin  are checked into source code repository.
      Instructions on how to add or change messages are added to messages.mc
added:
  sql/MSG00001.bin
  sql/message.h
  sql/message.rc
modified:
  sql/CMakeLists.txt
  sql/Makefile.am
  sql/message.mc

=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2008-02-19 11:37:39 +0000
+++ b/sql/CMakeLists.txt	2008-10-23 13:28:53 +0000
@@ -28,10 +28,8 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/
                     ${CMAKE_SOURCE_DIR}/bdb/build_win32
                     ${CMAKE_SOURCE_DIR}/bdb/dbinc)
 
-SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/sql/message.rc 
-							${CMAKE_SOURCE_DIR}/sql/message.h 
-							${CMAKE_SOURCE_DIR}/sql/sql_yacc.h 
-							${CMAKE_SOURCE_DIR}/sql/sql_yacc.cc
+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/lex_hash.h 
                             ${PROJECT_SOURCE_DIR}/include/mysqld_error.h
@@ -120,13 +118,6 @@ ADD_CUSTOM_COMMAND(
 	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
 # About "mysqlclient_notls", see note in "client/CMakeLists.txt"
 ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
@@ -141,7 +132,7 @@ ADD_DEPENDENCIES(mysqld${MYSQLD_EXE_SUFF
 
 # 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)

=== added file 'sql/MSG00001.bin'
Binary files c:\users\vvaint~1\appdata\local\temp\bzr-diff-old-ph9kbu and
c:\users\vvaint~1\appdata\local\temp\bzr-diff-new-oggc6j differ

=== modified file 'sql/Makefile.am'
--- a/sql/Makefile.am	2007-06-28 09:13:18 +0000
+++ b/sql/Makefile.am	2008-10-23 13:28:53 +0000
@@ -118,7 +118,8 @@ DEFS =			-DMYSQL_SERVER \
 
 BUILT_SOURCES =		sql_yacc.cc sql_yacc.h lex_hash.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
 DISTCLEANFILES =        lex_hash.h sql_yacc.output
 

=== 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-09-01 08:32:12 +0000
+++ b/sql/message.mc	2008-10-23 13:28:53 +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