Commit b5d6a629 authored by unknown's avatar unknown
Browse files

Merge aelkin@bk-internal.mysql.com:/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


storage/federated/ha_federated.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
parents d4f43011 eb9be6b9

storage/federated/ha_federated.cc

+1 −1
Original line number Diff line number Diff line
@@ -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)

{

storage/innobase/handler/ha_innodb.cc

+1 −1
Original line number Diff line number Diff line
@@ -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(

/*====================*/