3 files changed, 102 insertions, 0 deletions

diff --git a/databases/libdrizzle-redux/files/patch-libdrizzle_binlog.cc b/databases/libdrizzle-redux/files/patch-libdrizzle_binlog.cc
new file mode 100644
index 000000000000..269818bb76a4
--- /dev/null
+++ b/databases/libdrizzle-redux/files/patch-libdrizzle_binlog.cc
@@ -0,0 +1,20 @@
+--- libdrizzle/binlog.cc.orig	2018-08-27 19:29:31 UTC
++++ libdrizzle/binlog.cc
+@@ -316,7 +316,7 @@ drizzle_return_t drizzle_state_binlog_read(drizzle_st 
+     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 @@ drizzle_return_t drizzle_state_binlog_read(drizzle_st 
+         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;
+         }
diff --git a/databases/libdrizzle-redux/files/patch-libdrizzle_field.cc b/databases/libdrizzle-redux/files/patch-libdrizzle_field.cc
new file mode 100644
index 000000000000..5a885a3b4368
--- /dev/null
+++ b/databases/libdrizzle-redux/files/patch-libdrizzle_field.cc
@@ -0,0 +1,20 @@
+--- libdrizzle/field.cc.orig	2018-08-27 19:29:52 UTC
++++ libdrizzle/field.cc
+@@ -239,7 +239,7 @@ drizzle_return_t drizzle_state_field_read(drizzle_st *
+     }
+ 
+     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 @@ drizzle_return_t drizzle_state_field_read(drizzle_st *
+   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);
+ 
diff --git a/databases/libdrizzle-redux/files/patch-libdrizzle_statement__param.cc b/databases/libdrizzle-redux/files/patch-libdrizzle_statement__param.cc
new file mode 100644
index 000000000000..c388cd373a5d
--- /dev/null
+++ b/databases/libdrizzle-redux/files/patch-libdrizzle_statement__param.cc
@@ -0,0 +1,62 @@
+--- libdrizzle/statement_param.cc.orig	2018-08-27 19:24:50 UTC
++++ libdrizzle/statement_param.cc
+@@ -599,11 +599,11 @@ char *long_to_string(drizzle_bind_st *param, uint32_t 
+   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 *longlong_to_string(drizzle_bind_st *param, uint6
+   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 @@ char *time_to_string(drizzle_bind_st *param, drizzle_d
+   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 @@ char *timestamp_to_string(drizzle_bind_st *param, driz
+   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);