From eb9be6b9de1655ec896da2812e96aba63ffcca93 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 10 Nov 2006 17:22:43 +0200 Subject: [PATCH] Bug #24190 many exportable definitions of field_in_record_is_null mysql had several(2) exportable definitions of field_in_record_is_null function. Fixed with adding static. storage/federated/ha_federated.cc: made static storage/innobase/handler/ha_innodb.cc: made static --- storage/federated/ha_federated.cc | 2 +- storage/innobase/handler/ha_innodb.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index 00b2ac87cd4..5e92e299312 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -1534,7 +1534,7 @@ int ha_federated::close(void) 0 otherwise */ -inline uint field_in_record_is_null(TABLE *table, +static inline uint field_in_record_is_null(TABLE *table, Field *field, char *record) { diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 066c0ce48d4..7effed231da 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -2510,7 +2510,7 @@ get_field_offset( /****************************************************************** Checks if a field in a record is SQL NULL. Uses the record format information in table to track the null bit in record. */ -inline +static inline uint field_in_record_is_null( /*====================*/