← Back to branch summary

~hartmut-php/drizzle/drizzle-codegen

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Hartmut Holzgraefe
  • Date: 2009-02-21 11:38:51 UTC
  • mfrom: (884.1.12 drizzle)
  • Revision ID: hartmut@mysql.com-20090221113851-p2n577trxbr8ip7v
merge from lp:drizzle

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,
839
839
    if (sql_field->charset->state & MY_CS_BINSORT)
840
840
      sql_field->pack_flag|=FIELDFLAG_BINARY;
841
841
    sql_field->length=8;                        // Unireg field length
842
 
    sql_field->unireg_check=Field::BLOB_FIELD;
843
842
    (*blob_columns)++;
844
843
    break;
845
844
  case DRIZZLE_TYPE_VARCHAR:
852
851
      FIELDFLAG_INTERVAL;
853
852
    if (sql_field->charset->state & MY_CS_BINSORT)
854
853
      sql_field->pack_flag|=FIELDFLAG_BINARY;
855
 
    sql_field->unireg_check=Field::INTERVAL_FIELD;
856
854
    if (check_duplicates_in_interval("ENUM",sql_field->field_name,
857
855
                                 sql_field->interval,
858
856
                                     sql_field->charset, &dup_val_count))
862
860
  case DRIZZLE_TYPE_TIME:
863
861
  case DRIZZLE_TYPE_DATETIME:
864
862
  case DRIZZLE_TYPE_NULL:
865
 
    sql_field->pack_flag=f_settype((uint) sql_field->sql_type);
 
863
    sql_field->pack_flag=f_settype((uint32_t) sql_field->sql_type);
866
864
    break;
867
865
  case DRIZZLE_TYPE_NEWDECIMAL:
868
866
    sql_field->pack_flag=(FIELDFLAG_NUMBER |
892
890
    sql_field->pack_flag=(FIELDFLAG_NUMBER |
893
891
                          (sql_field->flags & UNSIGNED_FLAG ? 0 :
894
892
                           FIELDFLAG_DECIMAL) |
895
 
                          f_settype((uint) sql_field->sql_type) |
 
893
                          f_settype((uint32_t) sql_field->sql_type) |
896
894
                          (sql_field->decimals << FIELDFLAG_DEC_SHIFT));
897
895
    break;
898
896
  }
1382
1380
    {
1383
1381
      my_error(ER_WRONG_STRING_LENGTH, MYF(0),
1384
1382
               key->key_create_info.comment.str,"INDEX COMMENT",
1385
 
               (uint) INDEX_COMMENT_MAXLEN);
 
1383
               (uint32_t) INDEX_COMMENT_MAXLEN);
1386
1384
      return(-1);
1387
1385
    }
1388
1386
 
3324
3322
      return(true);
3325
3323
    /* Allocate result buffers. */
3326
3324
    if (! (ha_alter_info->index_drop_buffer=
3327
 
           (uint*) session->alloc(sizeof(uint) * table->s->keys)) ||
 
3325
           (uint*) session->alloc(sizeof(uint32_t) * table->s->keys)) ||
3328
3326
        ! (ha_alter_info->index_add_buffer=
3329
 
           (uint*) session->alloc(sizeof(uint) *
 
3327
           (uint*) session->alloc(sizeof(uint32_t) *
3330
3328
                              tmp_alter_info.key_list.elements)))
3331
3329
      return(true);
3332
3330
  }
3444
3442
 
3445
3443
      /* Check that NULL behavior is same for old and new fields */
3446
3444
      if ((new_field->flags & NOT_NULL_FLAG) !=
3447
 
          (uint) (field->flags & NOT_NULL_FLAG))
 
3445
          (uint32_t) (field->flags & NOT_NULL_FLAG))
3448
3446
      {
3449
3447
        *table_changes= IS_EQUAL_NO;
3450
3448
        *alter_flags|= HA_ALTER_COLUMN_NULLABLE;