← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/show.cc

Merged from Toru.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/show.cc
1596
1596
          end= int64_t10_to_str((int64_t) *(ha_rows*) value, buff, 10);
1597
1597
          break;
1598
1598
        case SHOW_BOOL:
1599
 
          end= my_stpcpy(buff, *(bool*) value ? "ON" : "OFF");
 
1599
          end+= sprintf(buff,"%s", *(bool*) value ? "ON" : "OFF");
1600
1600
          break;
1601
1601
        case SHOW_MY_BOOL:
1602
 
          end= my_stpcpy(buff, *(bool*) value ? "ON" : "OFF");
 
1602
          end+= sprintf(buff,"%s", *(bool*) value ? "ON" : "OFF");
1603
1603
          break;
1604
1604
        case SHOW_INT:
1605
1605
          end= int10_to_str((long) *(uint32_t*) value, buff, 10);
2851
2851
    ptr=option_buff;
2852
2852
    if (share->min_rows)
2853
2853
    {
2854
 
      ptr=my_stpcpy(ptr," min_rows=");
2855
 
      ptr=int64_t10_to_str(share->min_rows,ptr,10);
 
2854
      ptr= strcpy(ptr," min_rows=")+10;
 
2855
      ptr= int64_t10_to_str(share->min_rows,ptr,10);
2856
2856
    }
2857
2857
    if (share->max_rows)
2858
2858
    {
2859
 
      ptr=my_stpcpy(ptr," max_rows=");
2860
 
      ptr=int64_t10_to_str(share->max_rows,ptr,10);
 
2859
      ptr= strcpy(ptr," max_rows=")+10;
 
2860
      ptr= int64_t10_to_str(share->max_rows,ptr,10);
2861
2861
    }
2862
2862
    if (share->avg_row_length)
2863
2863
    {
2864
 
      ptr=my_stpcpy(ptr," avg_row_length=");
2865
 
      ptr=int64_t10_to_str(share->avg_row_length,ptr,10);
 
2864
      ptr= strcpy(ptr," avg_row_length=")+16;
 
2865
      ptr= int64_t10_to_str(share->avg_row_length,ptr,10);
2866
2866
    }
2867
2867
    if (share->db_create_options & HA_OPTION_PACK_KEYS)
2868
 
      ptr=my_stpcpy(ptr," pack_keys=1");
 
2868
      ptr= strcpy(ptr," pack_keys=1")+12;
2869
2869
    if (share->db_create_options & HA_OPTION_NO_PACK_KEYS)
2870
 
      ptr=my_stpcpy(ptr," pack_keys=0");
 
2870
      ptr= strcpy(ptr," pack_keys=0")+12;
2871
2871
    /* We use CHECKSUM, instead of TABLE_CHECKSUM, for backward compability */
2872
2872
    if (share->db_create_options & HA_OPTION_CHECKSUM)
2873
 
      ptr=my_stpcpy(ptr," checksum=1");
 
2873
      ptr= strcpy(ptr," checksum=1")+11;
2874
2874
    if (share->page_checksum != HA_CHOICE_UNDEF)
2875
2875
      ptr= strxmov(ptr, " page_checksum=",
2876
2876
                   ha_choice_values[(uint) share->page_checksum], NULL);
2877
2877
    if (share->db_create_options & HA_OPTION_DELAY_KEY_WRITE)
2878
 
      ptr=my_stpcpy(ptr," delay_key_write=1");
 
2878
      ptr= strcpy(ptr," delay_key_write=1")+18;
2879
2879
    if (share->row_type != ROW_TYPE_DEFAULT)
2880
2880
      ptr=strxmov(ptr, " row_format=", 
2881
2881
                  ha_row_type[(uint) share->row_type],
2882
2882
                  NULL);
2883
2883
    if (share->block_size)
2884
2884
    {
2885
 
      ptr= my_stpcpy(ptr, " block_size=");
 
2885
      ptr= strcpy(ptr, " block_size=")+12;
2886
2886
      ptr= int64_t10_to_str(share->block_size, ptr, 10);
2887
2887
    }
2888
2888