← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_show.cc

  • Committer: Brian Aker
  • Date: 2008-08-05 06:19:05 UTC
  • mfrom: (244.1.1 drizzle-mem-ebay)
  • mto: This revision was merged to the branch mainline in revision 264.
  • Revision ID: brian@tangent.org-20080805061905-1r8krslxae65qh76
Merge from Harrison Fisk of the Ebay + Google Hash engine.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_show.cc
959
959
      end= int64_t10_to_str(table->s->key_block_size, buff, 10);
960
960
      packet->append(buff, (uint) (end - buff));
961
961
    }
 
962
    if (share->block_size)
 
963
    {
 
964
      char *end;
 
965
      packet->append(STRING_WITH_LEN(" BLOCK_SIZE="));
 
966
      end= int64_t10_to_str(share->block_size, buff,10);
 
967
      packet->append(buff, (uint) (end - buff));
 
968
    }
962
969
    table->file->append_create_info(packet);
963
970
    if (share->comment.length)
964
971
    {
2814
2821
  }
2815
2822
  else
2816
2823
  {
2817
 
    char option_buff[350],*ptr;
 
2824
    char option_buff[400],*ptr;
2818
2825
    TABLE *show_table= tables->table;
2819
2826
    TABLE_SHARE *share= show_table->s;
2820
2827
    handler *file= show_table->file;
2868
2875
      ptr=strxmov(ptr, " row_format=", 
2869
2876
                  ha_row_type[(uint) share->row_type],
2870
2877
                  NullS);
 
2878
    if (share->block_size)
 
2879
    {
 
2880
      ptr= strmov(ptr, " block_size=");
 
2881
      ptr= int64_t10_to_str(share->block_size, ptr, 10);
 
2882
    }
 
2883
    
2871
2884
    if (share->transactional != HA_CHOICE_UNDEF)
2872
2885
    {
2873
2886
      ptr= strxmov(ptr, " TRANSACTIONAL=",