summaryrefslogtreecommitdiff
path: root/innobase
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-07-31 18:02:24 +0300
committerunknown <monty@hundin.mysql.fi>2002-07-31 18:02:24 +0300
commite2cf3f8e4501befbae0f785a422cb832fb3466c2 (patch)
treec4c1be1f69f19302b995e2d27d59d75bb51857cc /innobase
parent3af8f85f8277108b1bbb9474f5d2b61d554e6208 (diff)
downloadmariadb-git-e2cf3f8e4501befbae0f785a422cb832fb3466c2.tar.gz
Fixed wrong printf() string in InnoDB
Removed some compiler warnings regarding 'static' from InnoDB Docs/manual.texi: Fixed wrong manual entry innobase/btr/btr0cur.c: Fixed wrong printf() string innobase/include/univ.i: Removed compiler warnings (static inline produces a lot of warnings and is probably not portable)
Diffstat (limited to 'innobase')
-rw-r--r--innobase/btr/btr0cur.c2
-rw-r--r--innobase/include/univ.i2
2 files changed, 2 insertions, 2 deletions
diff --git a/innobase/btr/btr0cur.c b/innobase/btr/btr0cur.c
index 50f9584e86d..6caf940b34d 100644
--- a/innobase/btr/btr0cur.c
+++ b/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);
}
diff --git a/innobase/include/univ.i b/innobase/include/univ.i
index 4c1ca929aa8..8a9637acfda 100644
--- a/innobase/include/univ.i
+++ b/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