diff options
| -rw-r--r-- | Docs/manual.texi | 2 | ||||
| -rw-r--r-- | innobase/btr/btr0cur.c | 2 | ||||
| -rw-r--r-- | innobase/include/univ.i | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi index 14e9e6576c2..11140681ceb 100644 --- a/Docs/manual.texi +++ b/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 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 |