Fixed wrong printf() string in InnoDB

Removed some compiler warnings regarding 'static' from InnoDB

Docs/manual.texi

@@ -46937,7 +46937,7 @@ Don't write slave-timeout reconnects to the error log.
 @item
 Fixed bug with slave net read timeouting
 @item
-Fixed a core-dump bug with @code{MERGE] tables and @code{MAX()} function.
+Fixed a core-dump bug with @code{MERGE} tables and @code{MAX()} function.
 @item
 Fixed bug in @code{ALTER TABLE} with BDB tables.
 @item

innobase/btr/btr0cur.c

@@ -808,7 +808,7 @@ btr_cur_optimistic_insert(
 
 	if (!dtuple_check_typed_no_assert(entry)) {
 		fprintf(stderr,
-"InnoDB: Error in a tuple to insert into table %lu index %lu\n",
+"InnoDB: Error in a tuple to insert into table %s index %s\n",
 					index->table_name, index->name);
 	}
 	

innobase/include/univ.i

@@ -116,7 +116,7 @@ memory is read outside the allocated blocks. */
 #define UNIV_INLINE  extern inline
 #else
 /* extern inline doesn't work with gcc 3.0.2 */
-#define UNIV_INLINE  static inline
+#define UNIV_INLINE  inline
 #endif
 #endif