← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/sql_show.cc

  • Committer: Brian Aker
  • Date: 2008-07-22 18:31:32 UTC
  • Revision ID: brian@tangent.org-20080722183132-ne2ntl7g7mdf2eez
uint32 -> uin32_t

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/sql_show.cc
1196
1196
    else
1197
1197
      protocol->store(command_name[thd_info->command].str, system_charset_info);
1198
1198
    if (thd_info->start_time)
1199
 
      protocol->store((uint32) (now - thd_info->start_time));
 
1199
      protocol->store((uint32_t) (now - thd_info->start_time));
1200
1200
    else
1201
1201
      protocol->store_null();
1202
1202
    protocol->store(thd_info->state_info, system_charset_info);
1260
1260
        table->field[4]->store(command_name[tmp->command].str,
1261
1261
                               command_name[tmp->command].length, cs);
1262
1262
      /* MYSQL_TIME */
1263
 
      table->field[5]->store((uint32)(tmp->start_time ?
 
1263
      table->field[5]->store((uint32_t)(tmp->start_time ?
1264
1264
                                      now - tmp->start_time : 0), true);
1265
1265
      /* STATE */
1266
1266
      val= (char*) (tmp->net.reading_or_writing ?
1578
1578
          end= strmov(buff, *(bool*) value ? "ON" : "OFF");
1579
1579
          break;
1580
1580
        case SHOW_INT:
1581
 
          end= int10_to_str((long) *(uint32*) value, buff, 10);
 
1581
          end= int10_to_str((long) *(uint32_t*) value, buff, 10);
1582
1582
          break;
1583
1583
        case SHOW_HAVE:
1584
1584
        {
1619
1619
        restore_record(table, s->default_values);
1620
1620
        table->field[0]->store(name_buffer, strlen(name_buffer),
1621
1621
                               system_charset_info);
1622
 
        table->field[1]->store(pos, (uint32) (end - pos), system_charset_info);
 
1622
        table->field[1]->store(pos, (uint32_t) (end - pos), system_charset_info);
1623
1623
        table->field[1]->set_notnull();
1624
1624
 
1625
1625
        pthread_mutex_unlock(&LOCK_global_system_variables);
3008
3008
      field->real_type() == MYSQL_TYPE_VARCHAR ||  // For varbinary type
3009
3009
      field->real_type() == MYSQL_TYPE_STRING)     // For binary type
3010
3010
  {
3011
 
    uint32 octet_max_length= field->max_display_length();
3012
 
    if (is_blob && octet_max_length != (uint32) 4294967295U)
 
3011
    uint32_t octet_max_length= field->max_display_length();
 
3012
    if (is_blob && octet_max_length != (uint32_t) 4294967295U)
3013
3013
      octet_max_length /= field->charset()->mbmaxlen;
3014
3014
    int64_t char_max_len= is_blob ? 
3015
3015
      (int64_t) octet_max_length / field->charset()->mbminlen :