Skip to content

Commit 9958e72

Browse files
committed
WL#7909: Server side JSON functions
Post-push fix: Newer versions of clang emit warnings in boost code. Silence them.
1 parent 56ed3de commit 9958e72

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

libmysqld/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ ADD_COMPILE_FLAGS(
111111
COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
112112
)
113113

114-
# Boost Geometry source has unused local typedefs.
114+
# Boost source has unused local typedefs.
115115
MY_CHECK_CXX_COMPILER_FLAG("-Wno-unused-local-typedefs" HAVE_NO_UNUSED_TYPEDEFS)
116116
IF(HAVE_NO_UNUSED_TYPEDEFS)
117117
ADD_COMPILE_FLAGS(
@@ -120,6 +120,7 @@ IF(HAVE_NO_UNUSED_TYPEDEFS)
120120
../sql/item_geofunc_relchecks.cc
121121
../sql/item_geofunc_relchecks_bgwrap.cc
122122
../sql/item_geofunc_setops.cc
123+
../sql/item_json_func.cc
123124
COMPILE_FLAGS "-Wno-unused-local-typedefs"
124125
)
125126
ENDIF()

sql/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ ADD_COMPILE_FLAGS(
295295
COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
296296
)
297297

298-
# Boost Geometry source has unused local typedefs.
298+
# Boost source has unused local typedefs.
299299
MY_CHECK_CXX_COMPILER_FLAG("-Wno-unused-local-typedefs" HAVE_NO_UNUSED_TYPEDEFS)
300300
IF(HAVE_NO_UNUSED_TYPEDEFS)
301301
ADD_COMPILE_FLAGS(
@@ -304,6 +304,7 @@ IF(HAVE_NO_UNUSED_TYPEDEFS)
304304
item_geofunc_relchecks.cc
305305
item_geofunc_relchecks_bgwrap.cc
306306
item_geofunc_setops.cc
307+
item_json_func.cc
307308
COMPILE_FLAGS "-Wno-unused-local-typedefs"
308309
)
309310
ENDIF()

0 commit comments

Comments
 (0)