diff options
| author | monty@mysql.com <> | 2005-10-08 03:37:23 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-10-08 03:37:23 +0300 |
| commit | 17d7ba931d2293f1db89cbd1107a4bc71bc4fcdf (patch) | |
| tree | ac2ca2aacd05cc4eb1bec0b1f8c909b9d64fa2e6 /sql/table.cc | |
| parent | dad1e2048d3ac1477557a2645ccd323143601723 (diff) | |
| parent | f577ebb88fc4f56f440ee3736b54512d528ca0a9 (diff) | |
| download | mariadb-git-17d7ba931d2293f1db89cbd1107a4bc71bc4fcdf.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/sql/table.cc b/sql/table.cc index 0b3423d0750..44c747930c3 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -457,9 +457,11 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat, { outparam->null_flags=null_pos=(uchar*) record+1; null_bit_pos= (db_create_options & HA_OPTION_PACK_RECORD) ? 0 : 1; - /* null_bytes below is only correct under the condition that - there are no bit fields. Correct values is set below after the - table struct is initialized */ + /* + null_bytes below is only correct under the condition that + there are no bit fields. Correct values is set below after the + table struct is initialized + */ share->null_bytes= (share->null_fields + null_bit_pos + 7) / 8; } else @@ -872,8 +874,12 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat, } } - /* the correct null_bytes can now be set, since bitfields have been taken into account */ - share->null_bytes= null_pos - (uchar*) outparam->null_flags + (null_bit_pos + 7) / 8; + /* + the correct null_bytes can now be set, since bitfields have been taken + into account + */ + share->null_bytes= (null_pos - (uchar*) outparam->null_flags + + (null_bit_pos + 7) / 8); share->last_null_bit_pos= null_bit_pos; /* The table struct is now initialized; Open the table */ |