branches/zip: Remove warnings for BUILD/compile-... --warning-mode=pedantic.

ha_innobase::write_row(): The printf format %p expects const void*.

STRUCT_FLD: Do not use the GCC extension when __STRICT_ANSI__ is defined.

row_merge_read_clustered_index(): Compound initializers must not contain
variables.  Assign to struct fields instead.

handler/ha_innodb.cc

@@ -3434,7 +3434,7 @@ ha_innobase::write_row(
 	if (prebuilt->trx != trx) {
 	  sql_print_error("The transaction object for the table handle is at "
 			  "%p, but for the current thread it is at %p",
-			  prebuilt->trx, trx);
+			  (const void*) prebuilt->trx, (const void*) trx);
 
 		fputs("InnoDB: Dump of 200 bytes around prebuilt: ", stderr);
 		ut_print_buf(stderr, ((const byte*)prebuilt) - 100, 200);

handler/i_s.cc

@@ -32,7 +32,7 @@ static const char plugin_author[] = "Innobase Oy";
 		DBUG_RETURN(1);	\
 	}
 
-#if defined(__GNUC__) && (__GNUC__) > 2 && !defined(__INTEL_COMPILER)
+#if !defined __STRICT_ANSI__ && defined __GNUC__ && (__GNUC__) > 2 && !defined __INTEL_COMPILER
 #define STRUCT_FLD(name, value)	name: value
 #else
 #define STRUCT_FLD(name, value)	value

row/row0merge.c

@@ -1200,8 +1200,10 @@ row_merge_read_clustered_index(
 
 			if (buf->n_tuples) {
 				if (dict_index_is_unique(index)) {
-					row_merge_dup_t	dup
-						= { buf->index, table, 0 };
+					row_merge_dup_t	dup;
+					dup.index = buf->index;
+					dup.table = table;
+					dup.n_dup = 0;
 
 					row_merge_buf_sort(buf, &dup);