Merge branch 'master' into releases/tokudb-7.5

mysql-test/suite/tokudb/r/information-schema-global-status.result

@@ -65,6 +65,7 @@ TOKUDB_CHECKPOINT_LONG_BEGIN_COUNT
 TOKUDB_CHECKPOINT_LONG_BEGIN_TIME
 TOKUDB_CHECKPOINT_PERIOD
 TOKUDB_CHECKPOINT_TAKEN
+TOKUDB_CURSOR_SKIP_DELETED_LEAF_ENTRY
 TOKUDB_DB_CLOSES
 TOKUDB_DB_OPENS
 TOKUDB_DB_OPEN_CURRENT

storage/tokudb/CMakeLists.txt

@@ -46,18 +46,34 @@ include(CheckCXXCompilerFlag)
 
 macro(set_cflags_if_supported)
   foreach(flag ${ARGN})
-    check_c_compiler_flag(${flag} HAVE_C_${flag})
-    if (HAVE_C_${flag})
+    string(REGEX REPLACE "-" "_" temp_flag ${flag})
+    check_c_compiler_flag(${flag} HAVE_C_${temp_flag})
+    if (HAVE_C_${temp_flag})
       set(CMAKE_C_FLAGS "${flag} ${CMAKE_C_FLAGS}")
     endif ()
-    check_cxx_compiler_flag(${flag} HAVE_CXX_${flag})
-    if (HAVE_CXX_${flag})
+    check_cxx_compiler_flag(${flag} HAVE_CXX_${temp_flag})
+    if (HAVE_CXX_${temp_flag})
       set(CMAKE_CXX_FLAGS "${flag} ${CMAKE_CXX_FLAGS}")
     endif ()
   endforeach(flag)
 endmacro(set_cflags_if_supported)
 
+macro(append_cflags_if_supported)
+  foreach(flag ${ARGN})
+    string(REGEX REPLACE "-" "_" temp_flag ${flag})
+    check_c_compiler_flag(${flag} HAVE_C_${temp_flag})
+    if (HAVE_C_${temp_flag})
+      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}")
+    endif ()
+    check_cxx_compiler_flag(${flag} HAVE_CXX_${temp_flag})
+    if (HAVE_CXX_${temp_flag})
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+    endif ()
+  endforeach(flag)
+endmacro(append_cflags_if_supported)
+
 set_cflags_if_supported(-Wno-missing-field-initializers)
+append_cflags_if_supported(-Wno-vla)
 
 ADD_SUBDIRECTORY(ft-index)