← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/show.cc

  • Committer: Toru Maesaka
  • Date: 2008-12-14 08:26:38 UTC
  • mto: (670.1.24 devel)
  • mto: This revision was merged to the branch mainline in revision 676.
  • Revision ID: dev@torum.net-20081214082638-c8uje8oiwk4s2dh0
First pass of replacing MySQL's strxmov with libc alternatives

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/show.cc
2875
2875
    if (share->db_create_options & HA_OPTION_CHECKSUM)
2876
2876
      ptr= strcpy(ptr," checksum=1")+11;
2877
2877
    if (share->page_checksum != HA_CHOICE_UNDEF)
2878
 
      ptr= strxmov(ptr, " page_checksum=",
2879
 
                   ha_choice_values[(uint) share->page_checksum], NULL);
 
2878
      ptr+= sprintf(ptr, " page_checksum=%s",
 
2879
                    ha_choice_values[(uint) share->page_checksum]);
2880
2880
    if (share->db_create_options & HA_OPTION_DELAY_KEY_WRITE)
2881
2881
      ptr= strcpy(ptr," delay_key_write=1")+18;
2882
2882
    if (share->row_type != ROW_TYPE_DEFAULT)
2883
 
      ptr=strxmov(ptr, " row_format=",
2884
 
                  ha_row_type[(uint) share->row_type],
2885
 
                  NULL);
 
2883
      ptr+= sprintf(ptr, " row_format=%s", ha_row_type[(uint)share->row_type]);
2886
2884
    if (share->block_size)
2887
2885
    {
2888
2886
      ptr= strcpy(ptr, " block_size=")+12;
2891
2889
 
2892
2890
    if (share->transactional != HA_CHOICE_UNDEF)
2893
2891
    {
2894
 
      ptr= strxmov(ptr, " TRANSACTIONAL=",
2895
 
                   (share->transactional == HA_CHOICE_YES ? "1" : "0"),
2896
 
                   NULL);
 
2892
      ptr+= sprintf(ptr, " TRANSACTIONAL=%s",
 
2893
                    (share->transactional == HA_CHOICE_YES ? "1" : "0"));
2897
2894
    }
2898
2895
    if (share->transactional != HA_CHOICE_UNDEF)
2899
 
      ptr= strxmov(ptr, " transactional=",
2900
 
                   ha_choice_values[(uint) share->transactional], NULL);
 
2896
      ptr+= sprintf(ptr, " transactional=%s",
 
2897
                    ha_choice_values[(uint) share->transactional]);
2901
2898
    table->field[19]->store(option_buff+1,
2902
2899
                            (ptr == option_buff ? 0 :
2903
2900
                             (uint) (ptr-option_buff)-1), cs);