← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Brian Aker
  • Date: 2009-02-21 00:18:15 UTC
  • Revision ID: brian@tangent.org-20090221001815-x20e8h71e984lvs1
Completion (?) of uint conversion.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
153
153
 
154
154
  if (from[0] == '#' && !strncmp(from, MYSQL50_TABLE_NAME_PREFIX,
155
155
                                 MYSQL50_TABLE_NAME_PREFIX_LENGTH))
156
 
    return((uint) (strncpy(to, from+MYSQL50_TABLE_NAME_PREFIX_LENGTH,
 
156
    return((uint32_t) (strncpy(to, from+MYSQL50_TABLE_NAME_PREFIX_LENGTH,
157
157
                           to_length-1) -
158
158
                           (from + MYSQL50_TABLE_NAME_PREFIX_LENGTH)));
159
159
  length= strconvert(system_charset_info, from,
860
860
  case DRIZZLE_TYPE_TIME:
861
861
  case DRIZZLE_TYPE_DATETIME:
862
862
  case DRIZZLE_TYPE_NULL:
863
 
    sql_field->pack_flag=f_settype((uint) sql_field->sql_type);
 
863
    sql_field->pack_flag=f_settype((uint32_t) sql_field->sql_type);
864
864
    break;
865
865
  case DRIZZLE_TYPE_NEWDECIMAL:
866
866
    sql_field->pack_flag=(FIELDFLAG_NUMBER |
890
890
    sql_field->pack_flag=(FIELDFLAG_NUMBER |
891
891
                          (sql_field->flags & UNSIGNED_FLAG ? 0 :
892
892
                           FIELDFLAG_DECIMAL) |
893
 
                          f_settype((uint) sql_field->sql_type) |
 
893
                          f_settype((uint32_t) sql_field->sql_type) |
894
894
                          (sql_field->decimals << FIELDFLAG_DEC_SHIFT));
895
895
    break;
896
896
  }
1380
1380
    {
1381
1381
      my_error(ER_WRONG_STRING_LENGTH, MYF(0),
1382
1382
               key->key_create_info.comment.str,"INDEX COMMENT",
1383
 
               (uint) INDEX_COMMENT_MAXLEN);
 
1383
               (uint32_t) INDEX_COMMENT_MAXLEN);
1384
1384
      return(-1);
1385
1385
    }
1386
1386
 
3322
3322
      return(true);
3323
3323
    /* Allocate result buffers. */
3324
3324
    if (! (ha_alter_info->index_drop_buffer=
3325
 
           (uint*) session->alloc(sizeof(uint) * table->s->keys)) ||
 
3325
           (uint*) session->alloc(sizeof(uint32_t) * table->s->keys)) ||
3326
3326
        ! (ha_alter_info->index_add_buffer=
3327
 
           (uint*) session->alloc(sizeof(uint) *
 
3327
           (uint*) session->alloc(sizeof(uint32_t) *
3328
3328
                              tmp_alter_info.key_list.elements)))
3329
3329
      return(true);
3330
3330
  }
3442
3442
 
3443
3443
      /* Check that NULL behavior is same for old and new fields */
3444
3444
      if ((new_field->flags & NOT_NULL_FLAG) !=
3445
 
          (uint) (field->flags & NOT_NULL_FLAG))
 
3445
          (uint32_t) (field->flags & NOT_NULL_FLAG))
3446
3446
      {
3447
3447
        *table_changes= IS_EQUAL_NO;
3448
3448
        *alter_flags|= HA_ALTER_COLUMN_NULLABLE;