Suppress a warning for print format type

mroonga · Mar 21, 2015 · 6314c5f · 6314c5f
1 parent b9f6956
commit 6314c5f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/ha_mroonga.cpp b/ha_mroonga.cpp
@@ -9521,7 +9521,8 @@ int ha_mroonga::generic_store_bulk_variable_size_string(Field *field,
   String value;
   field->val_str(NULL, &value);
   grn_obj_reinit(ctx, buf, GRN_DB_SHORT_TEXT, 0);
-  DBUG_PRINT("info", ("mroonga: length=%zu", value.length()));
+  DBUG_PRINT("info", ("mroonga: length=%" MRN_FORMAT_STRING_LENGTH,
+                      value.length()));
   DBUG_PRINT("info", ("mroonga: value=%s", value.c_ptr_safe()));
   GRN_TEXT_SET(ctx, buf, value.ptr(), value.length());
   DBUG_RETURN(error);

diff --git a/mrn_mysql_compat.h b/mrn_mysql_compat.h
@@ -216,4 +216,10 @@
 #  define MRN_HAVE_SPATIAL
 #endif
 
+#if MYSQL_VERSION_ID >= 50706 && !defined(MRN_MARIADB_P)
+#  define MRN_FORMAT_STRING_LENGTH "u"
+#else
+#  define MRN_FORMAT_STRING_LENGTH "zu"
+#endif
+
 #endif /* MRN_MYSQL_COMPAT_H_ */