← Back to branch summary

~stewart/drizzle/use-catalog-for-path

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Lee Bieber
  • Date: 2011-03-29 22:31:41 UTC
  • mfrom: (2257.1.3 build)
  • Revision ID: kalebral@gmail.com-20110329223141-yxc22h3l2he58sk0
Merge Andrew - 743842: Build failure using GCC 4.6
Merge Stewart - 738022: CachedDirectory silently fails to add entries if stat() fails
Merge Olaf - Common fwd: add copyright, add more declaration

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
760
760
  uint32_t fieldnr= 0;
761
761
  ulong reclength, string_total_length;
762
762
  bool  using_unique_constraint= false;
763
 
  bool  use_packed_rows= true;
764
763
  bool  not_all_columns= !(select_options & TMP_TABLE_ALL_COLUMNS);
765
764
  unsigned char *pos, *group_buff;
766
765
  unsigned char *null_flags;
1055
1054
  reclength+=null_pack_length;
1056
1055
  if (!reclength)
1057
1056
    reclength=1;                                // Dummy select
1058
 
  /* Use packed rows if there is blobs or a lot of space to gain */
1059
 
  if (blob_count || ((string_total_length >= STRING_TOTAL_LENGTH_TO_PACK_ROWS) && (reclength / string_total_length <= RATIO_TO_PACK_ROWS || (string_total_length / string_count) >= AVG_STRING_LENGTH_TO_PACK_ROWS)))
1060
 
    use_packed_rows= 1;
1061
1057
 
1062
1058
  table->getMutableShare()->setRecordLength(reclength);
1063
1059
  {