Commit 9847a235 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Bug #48042 The description for Event ID ( 100 ) in Source ( MySQL ) cannot be found.

The problem is that message resource  (message.rc) is compiled as part of static library
sql.lib rather than with executable mysqld.exe. resource files do not work in static
libraries.

The fix is to add message.rc to mysqld.exe source files list.
parent 4a1a64ec
...@@ -49,7 +49,7 @@ SET (SQL_SOURCE ...@@ -49,7 +49,7 @@ SET (SQL_SOURCE
hostname.cc init.cc item.cc item_buff.cc item_cmpfunc.cc hostname.cc init.cc item.cc item_buff.cc item_cmpfunc.cc
item_create.cc item_func.cc item_geofunc.cc item_row.cc item_create.cc item_func.cc item_geofunc.cc item_row.cc
item_strfunc.cc item_subselect.cc item_sum.cc item_timefunc.cc item_strfunc.cc item_subselect.cc item_sum.cc item_timefunc.cc
key.cc log.cc lock.cc message.rc key.cc log.cc lock.cc
log_event.cc rpl_record.cc rpl_reporting.cc log_event.cc rpl_record.cc rpl_reporting.cc
log_event_old.cc rpl_record_old.cc log_event_old.cc rpl_record_old.cc
message.h mf_iocache.cc my_decimal.cc ../sql-common/my_time.c message.h mf_iocache.cc my_decimal.cc ../sql-common/my_time.c
...@@ -89,7 +89,7 @@ ADD_LIBRARY(sql ${SQL_SOURCE}) ...@@ -89,7 +89,7 @@ ADD_LIBRARY(sql ${SQL_SOURCE})
IF (NOT EXISTS cmake_dummy.cc) IF (NOT EXISTS cmake_dummy.cc)
FILE (WRITE cmake_dummy.cc "") FILE (WRITE cmake_dummy.cc "")
ENDIF (NOT EXISTS cmake_dummy.cc) ENDIF (NOT EXISTS cmake_dummy.cc)
ADD_EXECUTABLE(mysqld cmake_dummy.cc) ADD_EXECUTABLE(mysqld cmake_dummy.cc message.rc)
SET_TARGET_PROPERTIES(mysqld PROPERTIES OUTPUT_NAME mysqld${MYSQLD_EXE_SUFFIX}) SET_TARGET_PROPERTIES(mysqld PROPERTIES OUTPUT_NAME mysqld${MYSQLD_EXE_SUFFIX})
SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE) SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment