Fix compiler error if compiler does not support c99 style

initializers.

Author: Jan Lindström

mysql-test/suite/innodb/t/innodb_skip_innodb_is_tables.test

@@ -1,3 +1,4 @@
+--source include/not_embedded.inc
 
 select * from information_schema.innodb_trx;
 select * from information_schema.innodb_locks;

storage/innobase/CMakeLists.txt

@@ -210,6 +210,8 @@ IF(HAVE_IB_ATOMIC_PTHREAD_T_GCC)
   ADD_DEFINITIONS(-DHAVE_IB_ATOMIC_PTHREAD_T_GCC=1)
 ENDIF()
 
+CHECK_C_SOURCE_COMPILES("struct t1{ int a; char *b; }; struct t1 c= { .a=1, .b=0 }; main() { }" HAVE_C99_INITIALIZERS)
+
 ENDIF(NOT MSVC)
 
 CHECK_FUNCTION_EXISTS(asprintf  HAVE_ASPRINTF)

storage/innobase/handler/i_s.h

@@ -85,10 +85,13 @@ do {									\
 	}								\
 } while (0)
 
-#if !defined __STRICT_ANSI__ && defined __GNUC__ && (__GNUC__) > 2 &&	\
-	!defined __INTEL_COMPILER && !defined __clang__
+#if !defined __STRICT_ANSI__ && defined __GNUC__ && (__GNUC__) > 2 && !defined __INTEL_COMPILER && !defined __clang__
+#ifdef HAVE_C99_INITIALIZERS
 #define STRUCT_FLD(name, value)	.name = value
 #else
+#define STRUCT_FLD(name, value)	name: value
+#endif /* HAVE_C99_INITIALIZERS */
+#else
 #define STRUCT_FLD(name, value)	value
 #endif
 

storage/xtradb/CMakeLists.txt

@@ -219,6 +219,8 @@ IF(HAVE_IB_ATOMIC_PTHREAD_T_GCC)
   ADD_DEFINITIONS(-DHAVE_IB_ATOMIC_PTHREAD_T_GCC=1)
 ENDIF()
 
+CHECK_C_SOURCE_COMPILES("struct t1{ int a; char *b; }; struct t1 c= { .a=1, .b=0 }; main() { }" HAVE_C99_INITIALIZERS)
+
 ENDIF(NOT MSVC)
 
 CHECK_FUNCTION_EXISTS(asprintf  HAVE_ASPRINTF)

storage/xtradb/handler/i_s.h

@@ -89,10 +89,13 @@ do {									\
 	}								\
 } while (0)
 
-#if !defined __STRICT_ANSI__ && defined __GNUC__ && (__GNUC__) > 2 &&	\
-	!defined __INTEL_COMPILER && !defined __clang__
+#if !defined __STRICT_ANSI__ && defined __GNUC__ && (__GNUC__) > 2 && !defined __INTEL_COMPILER && !defined __clang__
+#ifdef HAVE_C99_INITIALIZERS
 #define STRUCT_FLD(name, value)	.name = value
 #else
+#define STRUCT_FLD(name, value)	name: value
+#endif /* HAVE_C99_INITIALIZERS */
+#else
 #define STRUCT_FLD(name, value)	value
 #endif