Skip to content

Commit 2158b35

Browse files
proper use of deps for GenError
1 parent 768d627 commit 2158b35

File tree

4 files changed

+15
-7
lines changed

4 files changed

+15
-7
lines changed

dbcon/execplan/clientrotator.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ using namespace logging;
4747

4848
#include "clientrotator.h"
4949

50-
//#include "idb_mysql.h"
51-
5250
/** Debug macro */
5351
#ifdef INFINIDB_DEBUG
5452
#define IDEBUG(x) \

dbcon/mysql/idb_mysql.h

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,17 @@
1414
along with this program; if not, write to the Free Software
1515
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
1616
MA 02110-1301, USA. */
17-
// One include file to deal with all the MySQL pollution of the
18-
// global namespace
19-
//
20-
// Don't include ANY mysql headers anywhere except here!
17+
18+
/* One include file to deal with all the MySQL pollution of the
19+
global namespace
20+
21+
Don't include ANY mysql headers anywhere except here!
22+
23+
WARN: if any cmake build target uses this include file,
24+
GenError from server must be added to the target dependencies
25+
to generate mysqld_error.h used below
26+
*/
27+
2128
#pragma once
2229

2330
#ifdef TEST_MCSCONFIG_H

utils/regr/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ columnstore_link(regr PRIVATE loggingcpp messageqcpp)
2525

2626
set(regr_mysql_LIB_SRCS regrmysql.cpp modamysql.cpp)
2727

28+
# Do anyone use it?
2829
columnstore_mysql_plugin_library(regr_mysql SHARED ${regr_mysql_LIB_SRCS})
29-
add_dependencies(regr_mysql external_boost)
30+
add_dependencies(regr_mysql external_boost GenError) # for "idb_mysql.h" that uses generated mysqld_error.h
3031

3132
set_target_properties(regr_mysql PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../../)

utils/udfsdk/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@ columnstore_link(udfsdk PRIVATE loggingcpp messageqcpp)
1717
add_definitions(-DMYSQL_DYNAMIC_PLUGIN)
1818
set(udf_mysql_LIB_SRCS udfmysql.cpp)
1919
columnstore_mysql_plugin_library(udf_mysql SHARED ${udf_mysql_LIB_SRCS})
20+
21+
add_dependencies(udf_mysql GenError) # for "idb_mysql.h" that uses generated mysqld_error.h

0 commit comments

Comments
 (0)