bk commit into 5.1 tree (aelkin:1.2347)

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.1 repository of elkin. When elkin does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-12 18:04:19+02:00, aelkin@stripped
+2 -0
  Merge aelkin@stripped:/home/bk/mysql-5.1-rpl
  into 
dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug24190_many_field_in_rec_is_0
  MERGE: 1.2303.35.1

  storage/federated/ha_federated.cc@stripped, 2006-11-12 18:04:14+02:00,
aelkin@stripped +0 -0
    Auto merged
    MERGE: 1.83.1.1

  storage/innobase/handler/ha_innodb.cc@stripped, 2006-11-12 18:04:14+02:00,
aelkin@stripped +0 -0
    Auto merged
    MERGE: 1.306.2.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	aelkin
# Host:	dsl-hkibras-fe30f900-107.dhcp.inet.fi
# Root:	/home/elkin/MySQL/TEAM/FIXES/5.1/bug24190_many_field_in_rec_is_0/RESYNC

--- 1.309/storage/innobase/handler/ha_innodb.cc	2006-11-12 18:04:26 +02:00
+++ 1.310/storage/innobase/handler/ha_innodb.cc	2006-11-12 18:04:26 +02:00
@@ -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(
 /*====================*/

--- 1.84/storage/federated/ha_federated.cc	2006-11-12 18:04:26 +02:00
+++ 1.85/storage/federated/ha_federated.cc	2006-11-12 18:04:26 +02:00
@@ -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)
 {