← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Andrew Hutchings
  • Date: 2011-03-29 09:33:49 UTC
  • mto: (2257.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 2258.
  • Revision ID: andrew@linuxjedi.co.uk-20110329093349-oz4cgb9f7l1032m3
Fix Drizzle to compile in GCC 4.6 (which fires warnings and therefore errors if a variable is set and not read)

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
  {