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
This commit is contained in:
commit
b5d6a629c9
@ -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)
|
||||
{
|
||||
|
@ -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(
|
||||
/*====================*/
|
||||
|
Loading…
x
Reference in New Issue
Block a user