Merge lp:~linuxjedi/libdrizzle/5.1-compiler-fixes into lp:libdrizzle

[Andrew Hutchings]

Fixes for clang and mingw compiling

[lp:~linuxjedi/libdrizzle/5.1-compiler-fixes]

120. By Drizzle Continuous Integration on 2013-04-26

Merge lp:~linuxjedi/libdrizzle/5.1-compiler-fixes Build: jenkins-Libdrizzle-94

=== modified file 'libdrizzle/binlog.cc'
--- libdrizzle/binlog.cc	2013-03-25 21:23:36 +0000
+++ libdrizzle/binlog.cc	2013-04-26 20:55:33 +0000
@@ -316,7 +316,7 @@
     if (con->packet_size != binlog_event->length)
     {
         drizzle_set_error(con, "drizzle_state_binlog_read",
-                          "packet size error:%"PRIu32":%"PRIu32, con->packet_size, binlog_event->length);
+                          "packet size error:%" PRIu32 ":%" PRIu32, con->packet_size, binlog_event->length);
         con->binlog->error_fn(DRIZZLE_RETURN_UNEXPECTED_DATA, con, con->binlog->binlog_context);
         return DRIZZLE_RETURN_UNEXPECTED_DATA;
     }
@@ -374,7 +374,7 @@
         event_crc= (uint32_t)crc32(0, binlog_event->raw_data, (binlog_event->raw_length - DRIZZLE_BINLOG_CRC32_LEN));
         if (event_crc != binlog_event->checksum)
         {
-          drizzle_set_error(con, __func__, "CRC doesn't match: 0x%"PRIX32", 0x%"PRIX32, event_crc, binlog_event->checksum);
+          drizzle_set_error(con, __func__, "CRC doesn't match: 0x%" PRIX32 ", 0x%" PRIX32, event_crc, binlog_event->checksum);
           con->binlog->error_fn(DRIZZLE_RETURN_BINLOG_CRC, con, con->binlog->binlog_context);
           return DRIZZLE_RETURN_BINLOG_CRC;
         }
 
=== modified file 'libdrizzle/conn.cc'
--- libdrizzle/conn.cc	2013-03-25 21:44:12 +0000
+++ libdrizzle/conn.cc	2013-04-26 20:55:33 +0000
@@ -1445,7 +1445,7 @@
     return DRIZZLE_RETURN_INVALID_ARGUMENT;
   }
 
-#if HAVE_FCNTL && !defined(SOCK_CLOEXEC) && defined(FD_CLOEXEC)
+#if defined(HAVE_FCNTL) && !defined(SOCK_CLOEXEC) && defined(FD_CLOEXEC)
   {
     int flags;
     do
@@ -1561,7 +1561,7 @@
     drizzle_set_error(con, __func__, "setsockopt(SO_NOSIGPIPE): %s", strerror(errno));
     return DRIZZLE_RETURN_ERRNO;
   }
-#elif HAVE_FCNTL && defined(F_SETNOSIGPIPE)
+#elif defined(HAVE_FCNTL) && defined(F_SETNOSIGPIPE)
   ret= fcntl(con->fd, F_SETNOSIGPIPE, 1);
   
   if (ret == -1)
 
=== modified file 'libdrizzle/field.cc'
--- libdrizzle/field.cc	2013-04-25 13:04:25 +0000
+++ libdrizzle/field.cc	2013-04-26 20:55:33 +0000
@@ -239,7 +239,7 @@
     }
 
     drizzle_log_debug(con,
-                      "field_offset= %"PRIu64", field_size= %zu, field_total= %"PRIu64,
+                      "field_offset= %" PRIu64 ", field_size= %zu, field_total= %" PRIu64,
                       con->result->field_offset, con->result->field_size,
                       con->result->field_total);
 
@@ -295,7 +295,7 @@
   con->packet_size-= con->result->field_size;
 
   drizzle_log_debug(con,
-                    "field_offset= %"PRIu64", field_size= %zu, field_total= %"PRIu64,
+                    "field_offset= %" PRIu64 ", field_size= %zu, field_total= %" PRIu64,
                     con->result->field_offset, con->result->field_size,
                     con->result->field_total);
 
 
=== modified file 'libdrizzle/statement_param.cc'
--- libdrizzle/statement_param.cc	2013-04-25 10:15:18 +0000
+++ libdrizzle/statement_param.cc	2013-04-26 20:55:33 +0000
@@ -599,11 +599,11 @@
   char* buffer= param->data_buffer + 50;
   if (param->options.is_unsigned)
   {
-    snprintf(buffer, 12, "%"PRIu32, val);
+    snprintf(buffer, 12, "%" PRIu32, val);
   }
   else
   {
-    snprintf(buffer, 12, "%"PRId32, (int32_t)val);
+    snprintf(buffer, 12, "%" PRId32, (int32_t)val);
   }
   return buffer;
 }
@@ -614,11 +614,11 @@
   char* buffer= param->data_buffer + 50;
   if (param->options.is_unsigned)
   { 
-    snprintf(buffer, 21, "%"PRIu64, val);
+    snprintf(buffer, 21, "%" PRIu64, val);
   }
   else
   {
-    snprintf(buffer, 21, "%"PRId64, (int64_t)val);
+    snprintf(buffer, 21, "%" PRId64, (int64_t)val);
   }
   return buffer;
 }
@@ -639,7 +639,7 @@
   int used = 0;
     
   /* Values are transferred with days separated from hours, but presented with days folded into hours. */
-  used = snprintf(buffer, buffersize-used, "%s%02u:%02"PRIu8":%02"PRIu8, (time->negative) ? "-" : "", time->hour + 24 * time->day, time->minute, time->second);
+  used = snprintf(buffer, buffersize-used, "%s%02u:%02" PRIu8 ":%02" PRIu8, (time->negative) ? "-" : "", time->hour + 24 * time->day, time->minute, time->second);
 
   /* TODO: the existence (and length) of the decimals should be decided based on the number of fields sent by the server or possibly the column's "decimals" value, not by whether the microseconds are 0 */
   if (time->microsecond || time->show_microseconds)
@@ -657,19 +657,19 @@
   int buffersize = 27;
   int used = 0;
   
-  used += snprintf(buffer, buffersize-used, "%04"PRIu16"-%02"PRIu8"-%02"PRIu32,
+  used += snprintf(buffer, buffersize-used, "%04" PRIu16 "-%02" PRIu8 "-%02" PRIu32,
      timestamp->year, timestamp->month, timestamp->day);
   assert(used < buffersize);
   
   if (param->type == DRIZZLE_COLUMN_TYPE_DATE)
     return buffer;
   
-  used += snprintf(buffer+used, buffersize-used, " %02"PRIu16":%02"PRIu8":%02"PRIu8,
+  used += snprintf(buffer+used, buffersize-used, " %02" PRIu16 ":%02" PRIu8 ":%02" PRIu8,
     timestamp->hour, timestamp->minute, timestamp->second);
 
   if (timestamp->microsecond || timestamp->show_microseconds)
   {
-    used += snprintf(buffer+used, buffersize-used, ".%06"PRIu32, timestamp->microsecond);
+    used += snprintf(buffer+used, buffersize-used, ".%06" PRIu32, timestamp->microsecond);
   }
   
   assert(used < buffersize);
 
=== modified file 'm4/ax_harden_compiler_flags.m4'
--- m4/ax_harden_compiler_flags.m4	2013-01-10 12:04:23 +0000
+++ m4/ax_harden_compiler_flags.m4	2013-04-26 20:55:33 +0000
@@ -102,7 +102,8 @@
          _APPEND_COMPILE_FLAGS_ERROR([-Wthis-test-should-fail])
          _APPEND_COMPILE_FLAGS_ERROR([-std=c99])
 # Anything below this comment please keep sorted.
-         _APPEND_COMPILE_FLAGS_ERROR([--param=ssp-buffer-size=1])
+         AS_IF([test "x$CC_VERSION_VENDOR" != xclang],
+               [_APPEND_COMPILE_FLAGS_ERROR([--param=ssp-buffer-size=1])], [])
 # _APPEND_COMPILE_FLAGS_ERROR([-Wmissing-format-attribute])
           _APPEND_COMPILE_FLAGS_ERROR([-Wno-attributes])
           _APPEND_COMPILE_FLAGS_ERROR([-Waddress])
@@ -187,7 +188,8 @@
          _APPEND_COMPILE_FLAGS_ERROR([-Wunknown-pragmas])
          _APPEND_COMPILE_FLAGS_ERROR([-Wthis-test-should-fail])
 # Anything below this comment please keep sorted.
-         _APPEND_COMPILE_FLAGS_ERROR([--param=ssp-buffer-size=1])
+         AS_IF([test "x$CXX_VERSION_VENDOR" != xclang],
+               [_APPEND_COMPILE_FLAGS_ERROR([--param=ssp-buffer-size=1])], [])
 # _APPEND_COMPILE_FLAGS_ERROR([-Wmissing-format-attribute])
           _APPEND_COMPILE_FLAGS_ERROR([-Wno-attributes])
           _APPEND_COMPILE_FLAGS_ERROR([-Waddress])
 
=== modified file 'tests/unit/include.am'
--- tests/unit/include.am	2013-04-25 10:15:18 +0000
+++ tests/unit/include.am	2013-04-26 20:55:33 +0000
@@ -2,6 +2,9 @@
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
 
+# dummy.cxx is a hack to make MinGW link with C++
+# See http://www.gnu.org/software/automake/manual/html_node/Libtool-Convenience-Libraries.html
+
 noinst_HEADERS+= tests/unit/common.h
 
 tests_unit_binlog_SOURCES= tests/unit/binlog.cc tests/unit/common.c
@@ -20,21 +23,25 @@
 
 tests_unit_escape_SOURCES= tests/unit/escape.c
 tests_unit_escape_LDADD= libdrizzle/libdrizzle.la
+nodist_EXTRA_tests_unit_escape_SOURCES = dummy.cxx
 check_PROGRAMS+= tests/unit/escape
 noinst_PROGRAMS+= tests/unit/escape
 
 tests_unit_insert_id_SOURCES= tests/unit/insert_id.c
 tests_unit_insert_id_LDADD= libdrizzle/libdrizzle.la
+nodist_EXTRA_tests_unit_insert_id_SOURCES = dummy.cxx
 check_PROGRAMS+= tests/unit/insert_id
 noinst_PROGRAMS+= tests/unit/insert_id
 
 tests_unit_query_SOURCES= tests/unit/query.c
 tests_unit_query_LDADD= libdrizzle/libdrizzle.la
+nodist_EXTRA_tests_unit_query_SOURCES = dummy.cxx
 check_PROGRAMS+= tests/unit/query
 noinst_PROGRAMS+= tests/unit/query
 
 tests_unit_column_SOURCES= tests/unit/column.c tests/unit/common.c
 tests_unit_column_LDADD= libdrizzle/libdrizzle.la
+nodist_EXTRA_tests_unit_column_SOURCES = dummy.cxx
 check_PROGRAMS+= tests/unit/column
 noinst_PROGRAMS+= tests/unit/column
 
@@ -50,26 +57,31 @@
 tests_unit_numbers_SOURCES= tests/unit/numbers.c tests/unit/common.c
 tests_unit_numbers_LDADD= libdrizzle/libdrizzle.la
 tests_unit_numbers_LDADD+= -lm
+nodist_EXTRA_tests_unit_numbers_SOURCES = dummy.cxx
 check_PROGRAMS+= tests/unit/numbers
 noinst_PROGRAMS+= tests/unit/numbers
 
 tests_unit_datetypes_SOURCES= tests/unit/datetypes.c tests/unit/common.c
 tests_unit_datetypes_LDADD= libdrizzle/libdrizzle.la
+nodist_EXTRA_tests_unit_datetypes_SOURCES = dummy.cxx
 check_PROGRAMS+= tests/unit/datetypes
 noinst_PROGRAMS+= tests/unit/datetypes
 
 tests_unit_nulls_SOURCES= tests/unit/nulls.c tests/unit/common.c
 tests_unit_nulls_LDADD= libdrizzle/libdrizzle.la
+nodist_EXTRA_tests_unit_nulls_SOURCES = dummy.cxx
 check_PROGRAMS+= tests/unit/nulls
 noinst_PROGRAMS+= tests/unit/nulls
 
 tests_unit_row_SOURCES= tests/unit/row.c
 tests_unit_row_LDADD= libdrizzle/libdrizzle.la
+nodist_EXTRA_tests_unit_row_SOURCES = dummy.cxx
 check_PROGRAMS+= tests/unit/row
 noinst_PROGRAMS+= tests/unit/row
 
 tests_unit_version_SOURCES= tests/unit/version.c
 tests_unit_version_LDADD= libdrizzle/libdrizzle.la
+nodist_EXTRA_tests_unit_version_SOURCES = dummy.cxx
 check_PROGRAMS+= tests/unit/version
 noinst_PROGRAMS+= tests/unit/version
 
@@ -80,6 +92,7 @@
 
 tests_unit_connect_SOURCES= tests/unit/connect.c
 tests_unit_connect_LDADD= libdrizzle/libdrizzle.la
+nodist_EXTRA_tests_unit_connect_SOURCES = dummy.cxx
 check_PROGRAMS+= tests/unit/connect
 noinst_PROGRAMS+= tests/unit/connect
 
@@ -94,21 +107,25 @@
 
 tests_unit_connect_uds_SOURCES= tests/unit/connect_uds.c tests/unit/common.c
 tests_unit_connect_uds_LDADD= libdrizzle/libdrizzle.la
+nodist_EXTRA_tests_unit_connect_uds_SOURCES = dummy.cxx
 check_PROGRAMS+= tests/unit/connect_uds
 noinst_PROGRAMS+= tests/unit/connect_uds
 
 tests_unit_unbuffered_query_SOURCES= tests/unit/unbuffered_query.c
 tests_unit_unbuffered_query_LDADD= libdrizzle/libdrizzle.la
+nodist_EXTRA_tests_unit_unbuffered_query_SOURCES = dummy.cxx
 check_PROGRAMS+= tests/unit/unbuffered_query
 noinst_PROGRAMS+= tests/unit/unbuffered_query
 
 tests_unit_statement_SOURCES= tests/unit/statement.c
 tests_unit_statement_LDADD= libdrizzle/libdrizzle.la
+nodist_EXTRA_tests_unit_statement_SOURCES = dummy.cxx
 check_PROGRAMS+= tests/unit/statement
 noinst_PROGRAMS+= tests/unit/statement
 
 tests_unit_statement_char_SOURCES= tests/unit/statement_char.c
 tests_unit_statement_char_LDADD= libdrizzle/libdrizzle.la
+nodist_EXTRA_tests_unit_statement_char_SOURCES = dummy.cxx
 check_PROGRAMS+= tests/unit/statement_char
 noinst_PROGRAMS+= tests/unit/statement_char