← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Stewart Smith
  • Date: 2009-02-19 02:29:43 UTC
  • mto: This revision was merged to the branch mainline in revision 892.
  • Revision ID: stewart@flamingspork.com-20090219022943-kuv4crbeae4monx3
remove is_null_field_first from TABLE_SHARE. Is unused with modern FRM

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
293
293
  // share->db_create_options FAIL
294
294
  // share->db_options_in_use FAIL
295
295
  share->mysql_version= DRIZZLE_VERSION_ID; // TODO: remove
296
 
  share->null_field_first= 0;
297
296
 
298
297
  drizzle::Table::TableOptions table_options;
299
298
 
331
330
    share->table_charset= default_charset_info;
332
331
  }
333
332
 
334
 
  share->null_field_first= 1;
335
 
 
336
333
  share->db_record_offset= 1;
337
334
 
338
335
  share->blob_ptr_size= portable_sizeof_char_ptr; // more bonghits.
988
985
    goto err;
989
986
 
990
987
  record= share->default_values-1;              /* Fieldstart = 1 */
991
 
  if (share->null_field_first)
992
 
  {
993
 
    null_flags= null_pos= (unsigned char*) record+1;
994
 
    null_bit_pos= (db_create_options & HA_OPTION_PACK_RECORD) ? 0 : 1;
995
 
    /*
996
 
      null_bytes below is only correct under the condition that
997
 
      there are no bit fields.  Correct values is set below after the
998
 
      table struct is initialized
999
 
    */
1000
 
    share->null_bytes= (share->null_fields + null_bit_pos + 7) / 8;
1001
 
  }
 
988
 
 
989
  null_flags= null_pos= (unsigned char*) record+1;
 
990
  null_bit_pos= (db_create_options & HA_OPTION_PACK_RECORD) ? 0 : 1;
 
991
  /*
 
992
    null_bytes below is only correct under the condition that
 
993
    there are no bit fields.  Correct values is set below after the
 
994
    table struct is initialized
 
995
  */
 
996
  share->null_bytes= (share->null_fields + null_bit_pos + 7) / 8;
1002
997
 
1003
998
  use_hash= share->fields >= MAX_FIELDS_BEFORE_HASH;
1004
999
  if (use_hash)
1771
1766
  outparam->field= field_ptr;
1772
1767
 
1773
1768
  record= (unsigned char*) outparam->record[0]-1;       /* Fieldstart = 1 */
1774
 
  if (share->null_field_first)
1775
 
    outparam->null_flags= (unsigned char*) record+1;
1776
 
  else
1777
 
    outparam->null_flags= (unsigned char*) (record+ 1+ share->reclength -
1778
 
                                    share->null_bytes);
 
1769
 
 
1770
  outparam->null_flags= (unsigned char*) record+1;
1779
1771
 
1780
1772
  /* Setup copy of fields from share, but use the right alias and record */
1781
1773
  for (i=0 ; i < share->fields; i++, field_ptr++)