bzr commit into mysql-5.0-bugteam branch (vvaintroub:2709)

[Vladislav Vaintroub]

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

 2709 Vladislav Vaintroub	2008-10-22
      test - remove MC dependency
added:
  sql/MSG00001.bin
  sql/message.h
  sql/message.rc
modified:
  sql/CMakeLists.txt
  sql/Makefile.am

=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2008-02-19 11:37:39 +0000
+++ b/sql/CMakeLists.txt	2008-10-22 20:14:43 +0000
@@ -28,8 +28,7 @@ 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 
+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
@@ -120,13 +119,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 +133,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-klvnlp and
c:\users\vvaint~1\appdata\local\temp\bzr-diff-new-c1cm5y differ

=== modified file 'sql/Makefile.am'
--- a/sql/Makefile.am	2007-06-28 09:13:18 +0000
+++ b/sql/Makefile.am	2008-10-22 20:14:43 +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-22 20:14:43 +0000
@@ -0,0 +1,47 @@
+//
+//  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
+

=== added file 'sql/message.rc'
--- a/sql/message.rc	1970-01-01 00:00:00 +0000
+++ b/sql/message.rc	2008-10-22 20:14:43 +0000
@@ -0,0 +1,2 @@
+LANGUAGE 0x9,0x1
+1 11 MSG00001.bin