Bug #20316320 - DEBUG BUILD ON WINDOWS SHOULD REPLACE /OB0 WITH /OB1 TO SPEED UP TEST RUNS

Replace /Ob0 which CMake automatically adds for debug builds, with /Ob1

This caused linking error due to some functions in my_time.c which
were declared inline there but not in my_time.h. This makes little
sense, so I removed the inline.

Added new CMake option WIN_DEBUG_NO_INLINE which is default OFF.
If this is turned ON, inlining will again be disabled as before.

Author: bjornmu

cmake/os/Windows.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -64,6 +64,8 @@ IF(WITH_MSCRT_DEBUG)
   ADD_DEFINITIONS(-D_CRTDBG_MAP_ALLOC)
 ENDIF()
 
+OPTION(WIN_DEBUG_NO_INLINE "Disable inlining for debug builds on Windows" OFF)
+
 IF(MSVC)
   # Enable debug info also in Release build,
   # and create PDB to be able to analyze crashes.
@@ -86,6 +88,13 @@ IF(MSVC)
   #     information for use with the debugger. The symbolic debugging
   #     information includes the names and types of variables, as well as
   #     functions and line numbers. No .pdb file is produced by the compiler.
+  # - Enable explicit inline:
+  #     /Ob1
+  #     Expands explicitly inlined functions. By default /Ob0 is used,
+  #     meaning no inlining. But this impacts test execution time.
+  #     Allowing inline reduces test time using the debug server by
+  #     30% or so. If you do want to keep inlining off, set the
+  #     cmake flag WIN_DEBUG_NO_INLINE.
   FOREACH(lang C CXX)
     SET(CMAKE_${lang}_FLAGS_RELEASE "${CMAKE_${lang}_FLAGS_RELEASE} /Z7")
   ENDFOREACH()
@@ -96,6 +105,9 @@ IF(MSVC)
    CMAKE_CXX_FLAGS_DEBUG    CMAKE_CXX_FLAGS_DEBUG_INIT)
    STRING(REPLACE "/MD"  "/MT" "${flag}" "${${flag}}")
    STRING(REPLACE "/Zi"  "/Z7" "${flag}" "${${flag}}")
+   IF (NOT WIN_DEBUG_NO_INLINE)
+     STRING(REPLACE "/Ob0"  "/Ob1" "${flag}" "${${flag}}")
+   ENDIF()
    SET("${flag}" "${${flag}} /EHsc")
   ENDFOREACH()
 

sql-common/my_time.c

@@ -65,8 +65,8 @@ uint calc_days_in_year(uint year)
    @param tm[OUT]    The value to set.
    @param time_type  Timestasmp type
 */
-inline void set_zero_time(MYSQL_TIME *tm,
-                          enum enum_mysql_timestamp_type time_type)
+void set_zero_time(MYSQL_TIME *tm,
+                   enum enum_mysql_timestamp_type time_type)
 {
   memset(tm, 0, sizeof(*tm));
   tm->time_type= time_type;
@@ -77,7 +77,7 @@ inline void set_zero_time(MYSQL_TIME *tm,
   Set hour, minute and second of a MYSQL_TIME variable to maximum time value.
   Unlike set_max_time(), does not touch the other structure members.
 */
-inline void set_max_hhmmss(MYSQL_TIME *tm)
+void set_max_hhmmss(MYSQL_TIME *tm)
 {
   tm->hour= TIME_MAX_HOUR;
   tm->minute= TIME_MAX_MINUTE;
@@ -153,7 +153,7 @@ my_bool check_date(const MYSQL_TIME *ltime, my_bool not_zero_date,
   @retval  TRUE   if the value is fatally bad.
   @retval  FALSE  if the value is Ok.
 */
-inline my_bool check_time_mmssff_range(const MYSQL_TIME *ltime)
+my_bool check_time_mmssff_range(const MYSQL_TIME *ltime)
 {
   return ltime->minute >= 60 || ltime->second >= 60 ||
          ltime->second_part > 999999;
@@ -172,7 +172,7 @@ inline my_bool check_time_mmssff_range(const MYSQL_TIME *ltime)
   @retval        FALSE if value is Ok.
   @retval        TRUE if value is out of range. 
 */
-inline my_bool check_time_range_quick(const MYSQL_TIME *ltime)
+my_bool check_time_range_quick(const MYSQL_TIME *ltime)
 {
   longlong hour= (longlong) ltime->hour + 24LL * ltime->day;
   /* The input value should not be fatally bad */