← 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-09 21:43:24 UTC
  • mfrom: (279.1.4 codestyle)
  • Revision ID: brian@tangent.org-20080809214324-jy2c15bx49naddsf
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_show.cc
1503
1503
  null_lex_str.str= 0;                          // For sys_var->value_ptr()
1504
1504
  null_lex_str.length= 0;
1505
1505
 
1506
 
  prefix_end=strnmov(name_buffer, prefix, sizeof(name_buffer)-1);
 
1506
  prefix_end=stpncpy(name_buffer, prefix, sizeof(name_buffer)-1);
1507
1507
  if (*prefix)
1508
1508
    *prefix_end++= '_';
1509
1509
  len=name_buffer + sizeof(name_buffer) - prefix_end;
1510
1510
 
1511
1511
  for (; variables->name; variables++)
1512
1512
  {
1513
 
    strnmov(prefix_end, variables->name, len);
 
1513
    stpncpy(prefix_end, variables->name, len);
1514
1514
    name_buffer[sizeof(name_buffer)-1]=0;       /* Safety */
1515
1515
    if (ucase_names)
1516
1516
      make_upper(name_buffer);
1575
1575
          end= int64_t10_to_str((int64_t) *(ha_rows*) value, buff, 10);
1576
1576
          break;
1577
1577
        case SHOW_BOOL:
1578
 
          end= strmov(buff, *(bool*) value ? "ON" : "OFF");
 
1578
          end= stpcpy(buff, *(bool*) value ? "ON" : "OFF");
1579
1579
          break;
1580
1580
        case SHOW_MY_BOOL:
1581
 
          end= strmov(buff, *(bool*) value ? "ON" : "OFF");
 
1581
          end= stpcpy(buff, *(bool*) value ? "ON" : "OFF");
1582
1582
          break;
1583
1583
        case SHOW_INT:
1584
1584
          end= int10_to_str((long) *(uint32_t*) value, buff, 10);
2842
2842
    ptr=option_buff;
2843
2843
    if (share->min_rows)
2844
2844
    {
2845
 
      ptr=strmov(ptr," min_rows=");
 
2845
      ptr=stpcpy(ptr," min_rows=");
2846
2846
      ptr=int64_t10_to_str(share->min_rows,ptr,10);
2847
2847
    }
2848
2848
    if (share->max_rows)
2849
2849
    {
2850
 
      ptr=strmov(ptr," max_rows=");
 
2850
      ptr=stpcpy(ptr," max_rows=");
2851
2851
      ptr=int64_t10_to_str(share->max_rows,ptr,10);
2852
2852
    }
2853
2853
    if (share->avg_row_length)
2854
2854
    {
2855
 
      ptr=strmov(ptr," avg_row_length=");
 
2855
      ptr=stpcpy(ptr," avg_row_length=");
2856
2856
      ptr=int64_t10_to_str(share->avg_row_length,ptr,10);
2857
2857
    }
2858
2858
    if (share->db_create_options & HA_OPTION_PACK_KEYS)
2859
 
      ptr=strmov(ptr," pack_keys=1");
 
2859
      ptr=stpcpy(ptr," pack_keys=1");
2860
2860
    if (share->db_create_options & HA_OPTION_NO_PACK_KEYS)
2861
 
      ptr=strmov(ptr," pack_keys=0");
 
2861
      ptr=stpcpy(ptr," pack_keys=0");
2862
2862
    /* We use CHECKSUM, instead of TABLE_CHECKSUM, for backward compability */
2863
2863
    if (share->db_create_options & HA_OPTION_CHECKSUM)
2864
 
      ptr=strmov(ptr," checksum=1");
 
2864
      ptr=stpcpy(ptr," checksum=1");
2865
2865
    if (share->page_checksum != HA_CHOICE_UNDEF)
2866
2866
      ptr= strxmov(ptr, " page_checksum=",
2867
2867
                   ha_choice_values[(uint) share->page_checksum], NullS);
2868
2868
    if (share->db_create_options & HA_OPTION_DELAY_KEY_WRITE)
2869
 
      ptr=strmov(ptr," delay_key_write=1");
 
2869
      ptr=stpcpy(ptr," delay_key_write=1");
2870
2870
    if (share->row_type != ROW_TYPE_DEFAULT)
2871
2871
      ptr=strxmov(ptr, " row_format=", 
2872
2872
                  ha_row_type[(uint) share->row_type],
2873
2873
                  NullS);
2874
2874
    if (share->block_size)
2875
2875
    {
2876
 
      ptr= strmov(ptr, " block_size=");
 
2876
      ptr= stpcpy(ptr, " block_size=");
2877
2877
      ptr= int64_t10_to_str(share->block_size, ptr, 10);
2878
2878
    }
2879
2879