← 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-10-06 05:57:49 UTC
  • Revision ID: brian@tangent.org-20081006055749-svg700gciuqi0zu1
Remove all of uchar.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_show.cc
451
451
 
452
452
  for (; name < end ; name++)
453
453
  {
454
 
    uchar chr= (uchar) *name;
 
454
    unsigned char chr= (unsigned char) *name;
455
455
    length= my_mbcharlen(system_charset_info, chr);
456
456
    if (length == 1 && !system_charset_info->ident_map[chr])
457
457
      return name;
500
500
 
501
501
  for (name_end= name+length ; name < name_end ; name+= length)
502
502
  {
503
 
    uchar chr= (uchar) *name;
 
503
    unsigned char chr= (unsigned char) *name;
504
504
    length= my_mbcharlen(system_charset_info, chr);
505
505
    /*
506
506
      my_mbcharlen can return 0 on a wrong multibyte
511
511
    */
512
512
    if (!length)
513
513
      length= 1;
514
 
    if (length == 1 && chr == (uchar) quote_char)
 
514
    if (length == 1 && chr == (unsigned char) quote_char)
515
515
      packet->append(&quote_char, 1, system_charset_info);
516
516
    packet->append(name, length, system_charset_info);
517
517
  }
1353
1353
    goto err;
1354
1354
  }
1355
1355
  while (list->name)
1356
 
    res|= insert_dynamic(&all_status_vars, (uchar*)list++);
1357
 
  res|= insert_dynamic(&all_status_vars, (uchar*)list); // appending NULL-element
 
1356
    res|= insert_dynamic(&all_status_vars, (unsigned char*)list++);
 
1357
  res|= insert_dynamic(&all_status_vars, (unsigned char*)list); // appending NULL-element
1358
1358
  all_status_vars.elements--; // but next insert_dynamic should overwite it
1359
1359
  if (status_vars_inited)
1360
1360
    sort_dynamic(&all_status_vars, show_var_cmp);
1759
1759
      return 1;
1760
1760
 
1761
1761
    /* Lookup value is database name */
1762
 
    if (!cs->coll->strnncollsp(cs, (uchar *) field_name1, strlen(field_name1),
1763
 
                               (uchar *) item_field->field_name,
 
1762
    if (!cs->coll->strnncollsp(cs, (unsigned char *) field_name1, strlen(field_name1),
 
1763
                               (unsigned char *) item_field->field_name,
1764
1764
                               strlen(item_field->field_name), 0))
1765
1765
    {
1766
1766
      thd->make_lex_string(&lookup_field_vals->db_value, tmp_str->ptr(),
1767
1767
                           tmp_str->length(), false);
1768
1768
    }
1769
1769
    /* Lookup value is table name */
1770
 
    else if (!cs->coll->strnncollsp(cs, (uchar *) field_name2,
 
1770
    else if (!cs->coll->strnncollsp(cs, (unsigned char *) field_name2,
1771
1771
                                    strlen(field_name2),
1772
 
                                    (uchar *) item_field->field_name,
 
1772
                                    (unsigned char *) item_field->field_name,
1773
1773
                                    strlen(item_field->field_name), 0))
1774
1774
    {
1775
1775
      thd->make_lex_string(&lookup_field_vals->table_value, tmp_str->ptr(),
1854
1854
    const char *field_name2= schema_table->idx_field2 >= 0 ?
1855
1855
      field_info[schema_table->idx_field2].field_name : "";
1856
1856
    if (table->table != item_field->field->table ||
1857
 
        (cs->coll->strnncollsp(cs, (uchar *) field_name1, strlen(field_name1),
1858
 
                               (uchar *) item_field->field_name,
 
1857
        (cs->coll->strnncollsp(cs, (unsigned char *) field_name1, strlen(field_name1),
 
1858
                               (unsigned char *) item_field->field_name,
1859
1859
                               strlen(item_field->field_name), 0) &&
1860
 
         cs->coll->strnncollsp(cs, (uchar *) field_name2, strlen(field_name2),
1861
 
                               (uchar *) item_field->field_name,
 
1860
         cs->coll->strnncollsp(cs, (unsigned char *) field_name2, strlen(field_name2),
 
1861
                               (unsigned char *) item_field->field_name,
1862
1862
                               strlen(item_field->field_name), 0)))
1863
1863
      return 0;
1864
1864
  }
3116
3116
    if (!show_table->read_set)
3117
3117
    {
3118
3118
      /* to satisfy 'field->val_str' ASSERTs */
3119
 
      uchar *bitmaps;
 
3119
      unsigned char *bitmaps;
3120
3120
      uint bitmap_size= show_table_share->column_bitmap_size;
3121
 
      if (!(bitmaps= (uchar*) alloc_root(thd->mem_root, bitmap_size)))
 
3121
      if (!(bitmaps= (unsigned char*) alloc_root(thd->mem_root, bitmap_size)))
3122
3122
        return(0);
3123
3123
      bitmap_init(&show_table->def_read_set,
3124
3124
                  (my_bitmap_map*) bitmaps, show_table_share->fields, false);
3130
3130
 
3131
3131
  for (; (field= *ptr) ; ptr++)
3132
3132
  {
3133
 
    uchar *pos;
 
3133
    unsigned char *pos;
3134
3134
    char tmp[MAX_FIELD_WIDTH];
3135
3135
    String type(tmp,sizeof(tmp), system_charset_info);
3136
3136
    char *end;
3158
3158
      table->field[5]->store(type.ptr(), type.length(), cs);
3159
3159
      table->field[5]->set_notnull();
3160
3160
    }
3161
 
    pos=(uchar*) ((field->flags & NOT_NULL_FLAG) ?  "NO" : "YES");
 
3161
    pos=(unsigned char*) ((field->flags & NOT_NULL_FLAG) ?  "NO" : "YES");
3162
3162
    table->field[6]->store((const char*) pos,
3163
3163
                           strlen((const char*) pos), cs);
3164
3164
    store_column_type(table, field, cs, 7);
3165
3165
 
3166
 
    pos=(uchar*) ((field->flags & PRI_KEY_FLAG) ? "PRI" :
 
3166
    pos=(unsigned char*) ((field->flags & PRI_KEY_FLAG) ? "PRI" :
3167
3167
                 (field->flags & UNIQUE_KEY_FLAG) ? "UNI" :
3168
3168
                 (field->flags & MULTIPLE_KEY_FLAG) ? "MUL":"");
3169
3169
    table->field[15]->store((const char*) pos,
3181
3181
    {
3182
3182
      enum column_format_type column_format= (enum column_format_type)
3183
3183
        ((field->flags >> COLUMN_FORMAT_FLAGS) & COLUMN_FORMAT_MASK);
3184
 
      pos=(uchar*)"Default";
 
3184
      pos=(unsigned char*)"Default";
3185
3185
      table->field[19]->store((const char*) pos,
3186
3186
                              strlen((const char*) pos), cs);
3187
 
      pos=(uchar*)(column_format == COLUMN_FORMAT_TYPE_DEFAULT ? "Default" :
 
3187
      pos=(unsigned char*)(column_format == COLUMN_FORMAT_TYPE_DEFAULT ? "Default" :
3188
3188
                   column_format == COLUMN_FORMAT_TYPE_FIXED ? "Fixed" :
3189
3189
                                                             "Dynamic");
3190
3190
      table->field[20]->store((const char*) pos,