merge fix for Bug40280 from 5.0 (8fe1cce5) · Commits · Software / OSDI20 Artifacts / mariadb

sql/CMakeLists.txt

+2 −12

Original line number	Diff line number	Diff line
		@@ -27,9 +27,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
		${CMAKE_SOURCE_DIR}/zlib
		)

		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
		@@ -135,14 +133,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)
		@@ -165,7 +155,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)

0 → 100644

+184 B

File added.

No diff preview for this file type.

+4 −2

Original line number	Diff line number	Diff line
		@@ -146,8 +146,10 @@ 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 \
		udf_example.c udf_example.def
		nt_servc.cc nt_servc.h \
		message.mc message.h message.rc MSG00001.bin \
		CMakeLists.txt

		CLEANFILES = lex_hash.h sql_yacc.output link_sources
		DISTCLEANFILES = $(EXTRA_PROGRAMS)
		MAINTAINERCLEANFILES = $(BUILT_MAINT_SRC)

0 → 100644

+55 −0

Original line number	Diff line number	Diff line
		/*
		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

+8 −0

Original line number	Diff line number	Diff line
		;/*
		; 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